From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 486F348B69 for ; Fri, 21 Nov 2025 12:22:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 447CD402E5; Fri, 21 Nov 2025 12:22:43 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 990D74026F for ; Fri, 21 Nov 2025 12:22:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763724162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YcajwZ2pNjy2vIupknG2Ln/d86rP3HXd+pog7jpIc9g=; b=jN24S+e+eAmNsvOdd+QSCBnKpBMHT/OAygv/rHhvyc+kFwKj49jSGMvw59JhU5wy3RizJ5 vbqtgeExmGx8l1PEwht5CfFgQgS6k94mzmstpctUwrwSHYxUEaQAD8/XqcrqyYwZRMN3Nu LrPwLPHOyGUf595ltsqrHBbo6FXe7wk= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-139-uAIRLF-PM0G5XBF-kaZiWg-1; Fri, 21 Nov 2025 06:22:40 -0500 X-MC-Unique: uAIRLF-PM0G5XBF-kaZiWg-1 X-Mimecast-MFC-AGG-ID: uAIRLF-PM0G5XBF-kaZiWg_1763724160 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E7E2E1800473; Fri, 21 Nov 2025 11:22:39 +0000 (UTC) Received: from rh.redhat.com (unknown [10.42.28.165]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C3FB930044DB; Fri, 21 Nov 2025 11:22:38 +0000 (UTC) From: Kevin Traynor To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/txgbe: reduce memory size of ring descriptors' has been queued to stable release 24.11.4 Date: Fri, 21 Nov 2025 11:20:08 +0000 Message-ID: <20251121112128.485623-24-ktraynor@redhat.com> In-Reply-To: <20251121112128.485623-1-ktraynor@redhat.com> References: <20251121112128.485623-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 9JF09nmLvGUE7WdH69kp1pulTuD2Jl4GKpaK28G8qFE_1763724160 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 24.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/26/25. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/d70a651fa8aa4fffb488a89cb068b5234225ef14 Thanks. Kevin --- >From d70a651fa8aa4fffb488a89cb068b5234225ef14 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Mon, 27 Oct 2025 11:15:26 +0800 Subject: [PATCH] net/txgbe: reduce memory size of ring descriptors [ upstream commit 843c59d1c2cef10a75037ebc73460f2ed28f9839 ] The memory of ring descriptors was allocated in size of the maximum ring size. It seems not friendly to our hardware on some domestic platforms. Change it to allocate in size of the real ring size. Fixes: 226bf98eda87 ("net/txgbe: add Rx and Tx queues setup and release") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/txgbe_rxtx.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/drivers/net/txgbe/txgbe_rxtx.c b/drivers/net/txgbe/txgbe_rxtx.c index 2f4690ec61..e2ac091dfe 100644 --- a/drivers/net/txgbe/txgbe_rxtx.c +++ b/drivers/net/txgbe/txgbe_rxtx.c @@ -2468,11 +2468,7 @@ txgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, return -ENOMEM; - /* - * Allocate TX ring hardware descriptors. A memzone large enough to - * handle the maximum ring size is allocated in order to allow for - * resizing in later calls to the queue setup function. - */ + /* Allocate TX ring hardware descriptors. */ tz = rte_eth_dma_zone_reserve(dev, "tx_ring", queue_idx, - sizeof(struct txgbe_tx_desc) * TXGBE_RING_DESC_MAX, + sizeof(struct txgbe_tx_desc) * nb_desc, TXGBE_ALIGN, socket_id); if (tz == NULL) { @@ -2725,4 +2721,5 @@ txgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, struct txgbe_adapter *adapter = TXGBE_DEV_ADAPTER(dev); uint64_t offloads; + uint32_t size; PMD_INIT_FUNC_TRACE(); @@ -2775,11 +2772,8 @@ txgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, rxq->pkt_type_mask = TXGBE_PTID_MASK; - /* - * Allocate RX ring hardware descriptors. A memzone large enough to - * handle the maximum ring size is allocated in order to allow for - * resizing in later calls to the queue setup function. - */ + /* Allocate RX ring hardware descriptors. */ + size = (nb_desc + RTE_PMD_TXGBE_RX_MAX_BURST) * sizeof(struct txgbe_rx_desc); rz = rte_eth_dma_zone_reserve(dev, "rx_ring", queue_idx, - RX_RING_SZ, TXGBE_ALIGN, socket_id); + size, TXGBE_ALIGN, socket_id); if (rz == NULL) { txgbe_rx_queue_release(rxq); @@ -2791,5 +2785,5 @@ txgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, * Zero init all the descriptors in the ring. */ - memset(rz->addr, 0, RX_RING_SZ); + memset(rz->addr, 0, size); /* -- 2.51.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-11-21 11:05:10.367975227 +0000 +++ 0024-net-txgbe-reduce-memory-size-of-ring-descriptors.patch 2025-11-21 11:05:09.406200926 +0000 @@ -1 +1 @@ -From 843c59d1c2cef10a75037ebc73460f2ed28f9839 Mon Sep 17 00:00:00 2001 +From d70a651fa8aa4fffb488a89cb068b5234225ef14 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 843c59d1c2cef10a75037ebc73460f2ed28f9839 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index c606180741..d77db1efa2 100644 +index 2f4690ec61..e2ac091dfe 100644 @@ -22 +23 @@ -@@ -2522,11 +2522,7 @@ txgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, +@@ -2468,11 +2468,7 @@ txgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, @@ -36 +37 @@ -@@ -2782,4 +2778,5 @@ txgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, +@@ -2725,4 +2721,5 @@ txgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, @@ -42 +43 @@ -@@ -2832,11 +2829,8 @@ txgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, +@@ -2775,11 +2772,8 @@ txgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, @@ -57 +58 @@ -@@ -2848,5 +2842,5 @@ txgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, +@@ -2791,5 +2785,5 @@ txgbe_dev_rx_queue_setup(struct rte_eth_dev *dev,