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 84B3AFD4F04 for ; Tue, 10 Mar 2026 16:15:15 +0000 (UTC) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5960740E3F; Tue, 10 Mar 2026 17:14:13 +0100 (CET) Received: from mail-ot1-f45.google.com (mail-ot1-f45.google.com [209.85.210.45]) by mails.dpdk.org (Postfix) with ESMTP id 3946B40E2B for ; Tue, 10 Mar 2026 17:14:10 +0100 (CET) Received: by mail-ot1-f45.google.com with SMTP id 46e09a7af769-7d4c12ff3d5so12217932a34.2 for ; Tue, 10 Mar 2026 09:14:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1773159249; x=1773764049; 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=S2FtoWgZnKknkg/vHVuI8yJjVomIpitllAADvPxQrGQ=; b=p/ruggx+nlcc8PugiSwzNHdmg0u6erjuK0hDySDhypDi4nXsOYxc26cHU2p84KSy/x XbIpdNFKm55/qPCGpv0vVriyS/ThLyHZ8oGYfX/czP0YnM06mti6fom3azbR6loO/tqg 1rwST+wFv9boCaeP6D8wUfnjnPQwRY0KawkKr+J4w9dauvA3jf1z+g6tqpFypvjrBwUg YjdEvm2aHJRWfa6zJjYGRcrXGM990tkqvvbfd5C87Z+BVy4jKMJtqpPoqx7HsD8FovwQ j7Sr54Fx6wzo+oei5VuPZpGFljRlU8YDzSqmhgl2tO9NfMNec2tVO+oGgIBX8ZpQpoZU YBiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773159249; x=1773764049; 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=S2FtoWgZnKknkg/vHVuI8yJjVomIpitllAADvPxQrGQ=; b=NKW8+7SUxKLQre+IYyl8vNQxqs9+aIo6HxZkVZSW2sHeyoOb5nJI7ApjuYOsikI72N T0waxuiBqHXIf94jVuqRqnaeSFw0QTzRnEZwHjpPvR1J8L1+hMkxG+OKyDypayYuGrve YXByD89B8F1OHsl4FBtTrSkPhB0rJzpARsU/hwXBUrxpeNmRL3W9WC+QJ2Z0o/3Lg+9w hPfX4X+zYpgSzXaCMGzq503PVFjg6hi5k9+XB9gOP4sYy1z6UXl525PvE/IMwCyiwhMk TOPf8wSasN8H/IlUuivdc4ZZbCa25odIXlO9a3EJJT8Shn7De15+k8dHppTe87CxRptd uQLw== X-Gm-Message-State: AOJu0YzcLndd01HnRICWbfGtvxWUzxGPcy7rqLbqI7RXrCAL+rRiXjr0 l2oWtLfM+sbPEn3YxrzeUxgpe3UDhCLakh/llnkkVH58vuewdjUpOyHnjrWNGeCuFMpcIhnDrhu gZw65ydA= X-Gm-Gg: ATEYQzyrhgJDV0fdwYs3WInb7C0PnA9AV41kGQUaUv4W78/t2Y3nUdJgE3v3Pt2uzlG E9bDs9j2gMHNgkfA0aC5SukLMomb2bzLuaAF7FFz/t4Dbd+1e/2ZTPPSHtdWtg8T2CIM05suGiC k0k0NyTC+IW+vJZSmHjJjWescaA7RmKrXFfby0hDrXlYfYUEHkSO6IEMeLUdp7AF+WPoUXGz6eI mvu4bP+UBUgGxF7JCw3avaIdnv/qYHcDkr2JcnJ4FtjiNqfb0T0o8E7u5X123DKA7MSVsD+BGwB MUb65iSGZ75EkqAraiQmeQyL1tic7kVQIpB+p61ga8VE8HOtrW38Qg5sTFzFcUTdkR65GpL9BT/ QQNTH/reTjaKw6+KXPoIU8+Gffj6uHEcJNlD4JEo8CFPTszvRkQzJ2VuzWfx90XiqwJNB6yWVDB GUojU7ZRR1g+B1tqAP2fAmIUExSW0Pij6B X-Received: by 2002:a05:6830:82ce:b0:7d7:4d85:eb05 with SMTP id 46e09a7af769-7d74d85f140mr4234205a34.22.1773159249529; Tue, 10 Mar 2026 09:14:09 -0700 (PDT) Received: from phoenix.lan ([104.202.29.139]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7d738e3f421sm7304004a34.25.2026.03.10.09.14.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 09:14:08 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v20 08/25] net/pcap: replace stack bounce buffer Date: Tue, 10 Mar 2026 09:09:46 -0700 Message-ID: <20260310161356.194553-9-stephen@networkplumber.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260310161356.194553-1-stephen@networkplumber.org> References: <20260106182823.192350-1-stephen@networkplumber.org> <20260310161356.194553-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 --- 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 fedf461be4..72a297d423 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.51.0