From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3F574103A9A0 for ; Wed, 25 Mar 2026 02:41:10 +0000 (UTC) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 693F040E2E; Wed, 25 Mar 2026 03:40:34 +0100 (CET) Received: from mail-dy1-f181.google.com (mail-dy1-f181.google.com [74.125.82.181]) by mails.dpdk.org (Postfix) with ESMTP id 8678D40E0F for ; Wed, 25 Mar 2026 03:40:30 +0100 (CET) Received: by mail-dy1-f181.google.com with SMTP id 5a478bee46e88-2c0ecaae7dfso9994584eec.1 for ; Tue, 24 Mar 2026 19:40:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1774406429; x=1775011229; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZyalasysJlPdibjKnXvfd7oiWH3kcw+5X46h8LoA3C4=; b=JRqQS1PsBxCAhwMvQYBepyuDweWKXrJA6AuU2NIMyTOxhRc8aIfYVT5mzLNOgIMws8 AIzLKu8h29paqxeQYQorQKo3uJA8W2PYdUiKUtPFlDxBpubRKbegSSkyVfe8oFkYcOyn K7ca3pqDa7nMYlIENZgh+v0nrw1oSVs44toEXIR1eHpYlPj1CMLq3Swi4MAxvwVACm7G ls5OyLMH1VKh6fX3FntBsTMpZMT6HrU1wfFbuwuf4OK1BQf5Q8SwzIcIdNBR35bqNcaP NavTXErMrrtTxEjbLZX4xt4ruuZHk7Q4mXLAgrr98nyfNU2KvAzvZ2b9wB6XOoplMZlp lfnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774406429; x=1775011229; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ZyalasysJlPdibjKnXvfd7oiWH3kcw+5X46h8LoA3C4=; b=qEc9ajKiXKwkXtymcP7jGke5+ae7mZoDqU0exyFoViewATahw6FTfHcDpjKFYsoXoO OlBz0EfX1fuq/JKCXTGPOtLagNxp1Kd1kC132KAQXpQCm73+rSNUN5nBDGvcvYn+xw51 yZXICI4HTTKouUmfOBNMaCdXMbi1DRSZ1n2K+VxGwKFB/2fDvsrPX+1f+5k5fX29AjNU RsFEEO5x50OHAa84A4BV2BrbRRssPExIbPSXu3gxZZo41pJG8cBloO8cZeoHMrDuy/G7 dE5z0by98hIaqtCG1WA8D8ce+Y5F3o/wECwt0bEn4X9RfcODjeFgk2PLrOC3ZvgLdhbZ o1zg== X-Gm-Message-State: AOJu0YyfvQuFbXAay1X+gI0JflnuOgqkTsO0eG6Zc4T0O8J0C9AuM6M/ E0p/vhWm7mlx13klCXN8rnb+H5A/1aKD9m9EwpW1SfEICJ7ONxv5ERvnVgE4jWxDP2dw6yO3XFQ 4MLgG X-Gm-Gg: ATEYQzxELUI1scS5ykipL/DRlnQmREKPkXYAnkYZeozvXPKWPn2HzceFTekmRrdtFsR 6xXsmlVE62bluaTGBdyhY7MMZx0zgFDRdIMJMLPwiWzpu1ueNm3kz4/e6G0TeM/kFEgTzb3JNxY DSbPsYfk1SpKQJRcTvzZIaXCi0xA53XygLjS/JhbllmtfAqS/HGT8aFqdPU3VERIL61pKmMH38Z k0ZPlj54xqmVsImtqw+k//ByOfg2mBvbJQ2bxz0LppInZTJ0jgGnTGLNPkbJiWGsQQ8ia20iLq0 DR/AS3vyGww7zSOu5oCj6dbMC/cfX9dVrVNoDd1yVo2lQB/t6/2Y8y+12fur3EdHgltWHfwZSMD 8/Gg6usaBjwFXOVByas4bjsFdDLIW86iYub7pGWG9ICHNLt3T0MAij+BbtFvb39EnSX3ggF3hJM rzGULOBq+BP/XfkJQhlYyH0HwBYd+QenEu X-Received: by 2002:a05:7301:1288:b0:2b7:24fc:f638 with SMTP id 5a478bee46e88-2c15d114cc4mr1058410eec.0.1774406429500; Tue, 24 Mar 2026 19:40:29 -0700 (PDT) Received: from phoenix.lan ([104.202.29.139]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2c10b29b447sm17209452eec.16.2026.03.24.19.40.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Mar 2026 19:40:29 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Bruce Richardson Subject: [PATCH v21 08/25] net/pcap: replace stack bounce buffer Date: Tue, 24 Mar 2026 19:37:39 -0700 Message-ID: <20260325024018.1275209-9-stephen@networkplumber.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260325024018.1275209-1-stephen@networkplumber.org> References: <20260106182823.192350-1-stephen@networkplumber.org> <20260325024018.1275209-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Replace the 64K stack-allocated bounce buffer with a per-queue buffer allocated from hugepages via rte_malloc at queue setup. This is necessary because the buffer may be used in a secondary process transmit path where the primary process allocated it. Signed-off-by: Stephen Hemminger Acked-by: Bruce Richardson --- drivers/net/pcap/pcap_ethdev.c | 60 +++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 23 deletions(-) diff --git a/drivers/net/pcap/pcap_ethdev.c b/drivers/net/pcap/pcap_ethdev.c index ebc96fafe5..02d5cb591f 100644 --- a/drivers/net/pcap/pcap_ethdev.c +++ b/drivers/net/pcap/pcap_ethdev.c @@ -91,6 +91,9 @@ struct pcap_tx_queue { struct queue_stat tx_stat; char name[PATH_MAX]; char type[ETH_PCAP_ARG_MAXLEN]; + + /* Temp buffer used for non-linear packets */ + uint8_t *bounce_buf; }; struct pmd_internals { @@ -385,18 +388,17 @@ static uint16_t eth_pcap_tx_dumper(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) { unsigned int i; - struct rte_mbuf *mbuf; struct pmd_process_private *pp; struct pcap_tx_queue *dumper_q = queue; uint16_t num_tx = 0; uint32_t tx_bytes = 0; struct pcap_pkthdr header; pcap_dumper_t *dumper; - unsigned char temp_data[RTE_ETH_PCAP_SNAPLEN]; - size_t len, caplen; + unsigned char *temp_data; pp = rte_eth_devices[dumper_q->port_id].process_private; dumper = pp->tx_dumper[dumper_q->queue_id]; + temp_data = dumper_q->bounce_buf; if (dumper == NULL || nb_pkts == 0) return 0; @@ -404,12 +406,11 @@ eth_pcap_tx_dumper(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) /* writes the nb_pkts packets to the previously opened pcap file * dumper */ for (i = 0; i < nb_pkts; i++) { - mbuf = bufs[i]; - len = caplen = rte_pktmbuf_pkt_len(mbuf); - if (unlikely(!rte_pktmbuf_is_contiguous(mbuf) && - len > sizeof(temp_data))) { - caplen = sizeof(temp_data); - } + struct rte_mbuf *mbuf = bufs[i]; + size_t len, caplen; + + len = rte_pktmbuf_pkt_len(mbuf); + caplen = RTE_MIN(len, RTE_ETH_PCAP_SNAPSHOT_LEN); calculate_timestamp(&header.ts); header.len = len; @@ -449,9 +450,6 @@ eth_tx_drop(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) uint32_t tx_bytes = 0; struct pcap_tx_queue *tx_queue = queue; - if (unlikely(nb_pkts == 0)) - return 0; - for (i = 0; i < nb_pkts; i++) { tx_bytes += bufs[i]->pkt_len; rte_pktmbuf_free(bufs[i]); @@ -460,7 +458,7 @@ eth_tx_drop(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) tx_queue->tx_stat.pkts += nb_pkts; tx_queue->tx_stat.bytes += tx_bytes; - return i; + return nb_pkts; } /* @@ -470,30 +468,30 @@ static uint16_t eth_pcap_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) { unsigned int i; - int ret; - struct rte_mbuf *mbuf; struct pmd_process_private *pp; struct pcap_tx_queue *tx_queue = queue; uint16_t num_tx = 0; uint32_t tx_bytes = 0; pcap_t *pcap; - unsigned char temp_data[RTE_ETH_PCAP_SNAPLEN]; - size_t len; + unsigned char *temp_data; pp = rte_eth_devices[tx_queue->port_id].process_private; pcap = pp->tx_pcap[tx_queue->queue_id]; + temp_data = tx_queue->bounce_buf; if (unlikely(nb_pkts == 0 || pcap == NULL)) return 0; for (i = 0; i < nb_pkts; i++) { - mbuf = bufs[i]; - len = rte_pktmbuf_pkt_len(mbuf); + struct rte_mbuf *mbuf = bufs[i]; + size_t len = rte_pktmbuf_pkt_len(mbuf); + int ret; + if (unlikely(!rte_pktmbuf_is_contiguous(mbuf) && - len > sizeof(temp_data))) { + len > RTE_ETH_PCAP_SNAPSHOT_LEN)) { PMD_LOG(ERR, - "Dropping multi segment PCAP packet. Size (%zd) > max size (%zd).", - len, sizeof(temp_data)); + "Dropping multi segment PCAP packet. Size (%zd) > max size (%u).", + len, RTE_ETH_PCAP_SNAPSHOT_LEN); rte_pktmbuf_free(mbuf); continue; } @@ -966,7 +964,7 @@ static int eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id, uint16_t nb_tx_desc __rte_unused, - unsigned int socket_id __rte_unused, + unsigned int socket_id, const struct rte_eth_txconf *tx_conf __rte_unused) { struct pmd_internals *internals = dev->data->dev_private; @@ -974,11 +972,26 @@ eth_tx_queue_setup(struct rte_eth_dev *dev, pcap_q->port_id = dev->data->port_id; pcap_q->queue_id = tx_queue_id; + pcap_q->bounce_buf = rte_malloc_socket(NULL, RTE_ETH_PCAP_SNAPSHOT_LEN, + RTE_CACHE_LINE_SIZE, socket_id); + if (pcap_q->bounce_buf == NULL) + return -ENOMEM; + dev->data->tx_queues[tx_queue_id] = pcap_q; return 0; } +static void +eth_tx_queue_release(struct rte_eth_dev *dev, uint16_t tx_queue_id) +{ + struct pmd_internals *internals = dev->data->dev_private; + struct pcap_tx_queue *pcap_q = &internals->tx_queue[tx_queue_id]; + + rte_free(pcap_q->bounce_buf); + pcap_q->bounce_buf = NULL; +} + static int eth_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id) { @@ -1019,6 +1032,7 @@ static const struct eth_dev_ops ops = { .dev_infos_get = eth_dev_info, .rx_queue_setup = eth_rx_queue_setup, .tx_queue_setup = eth_tx_queue_setup, + .tx_queue_release = eth_tx_queue_release, .rx_queue_start = eth_rx_queue_start, .tx_queue_start = eth_tx_queue_start, .rx_queue_stop = eth_rx_queue_stop, -- 2.53.0