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 AA2AD468E4 for ; Thu, 12 Jun 2025 23:10:31 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A598E42E0C; Thu, 12 Jun 2025 23:10:31 +0200 (CEST) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mails.dpdk.org (Postfix) with ESMTP id A320242E0C for ; Thu, 12 Jun 2025 23:10:30 +0200 (CEST) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-452f9735424so5175885e9.3 for ; Thu, 12 Jun 2025 14:10:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749762630; x=1750367430; 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=cO0mfMRq0frLnD/vZ64MgyMKmi6DTjNbl8S02bLtLEg=; b=TzT4R2y3xRB7dPQV2+7LD7OReUiTm+Nd+TiRhI0pWbF4kNKgMYiLkwDzxwNc8/AJnm DDilBRfq0u7al7LX8HIx6xcEoALzthkA2nbFtJn6kNSvnvVowyem0ZKHK9/jzUdCnvRR FStXNcuN/dB5b7yET6tBXADQIGSTHC/1pQCQict0bXLx3Zu2a2nOXMg1d0y8jrW7c3mB BRGLIZX8yYJq2gaLd9gWZu6a5+hKuC5PMqIFJIIg9PFGZM4UzdZkhFi9Ij4ug0M37Vnn 7KaLjZ/itD+LKlCSqY+BSBs+3HNYcf8gBTEyrxBau3zEIiT/s7STMupMU6Ak6UzHv9nf G1zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749762630; x=1750367430; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cO0mfMRq0frLnD/vZ64MgyMKmi6DTjNbl8S02bLtLEg=; b=OG186dlPSGT+JuNEQqQIdXcvscGIpDGNX8El2WSoU1ruHJXVvt+2ZLlAQCoAlpdGXT 5elHwe7fDZVPWUy3yoi4enj+egD9/O6nhbDCudaBD3A9MEYChpwW43Uya1rD0eVjsCNY fdzXN7kO8SFxy9xKBiWduNIZHMYv9Rfx3Q6ryshG8eYevjBj+bOwbnepeoEjzauHk9t2 SDK9Dr5ahTPBvH61q7WOymvC1Tk+V76O8tYHe+rgaGPh/2kksBsJr7Y3NtvuByenv0GR tywuoSty8VxkRFC2kusF3av/q5mey84vosQWjt5Gxzfm/8c7KcB0s/UDRIt2WW/B3Ucn D0OQ== X-Gm-Message-State: AOJu0YytEuwVQDzd1P/fxtAF856caaTUjGLQgszQg6yfcAwEankeMA3u APMr/j6doHTsxGGfh+kspiZOQeQCDqW97d8YL9EZSPuplmVZ/U0k5QQqkftTemBU X-Gm-Gg: ASbGncsrWeXsLHzHj/AWqhxwwADC/9lBQoEuAmzJqJwqc1i19+zfOJVjHjeT+CA6j6w LrCOrq1jHoR/EvIHWJt6iBe81PF7Jf4/mPcTO3ffVWz3+Lt+PS6lTXror6vgclJtEnLrKF+FTtG IY3MO7HvHTGSi7oEEgVBI/kcLo6m0g9fuz3ED7VSpLYgLZyjwSdi11D/ZSy6GmPWc+GqWaZCu8W u7V1Aom7cvPTTX3n74thnduT+8gv2j4z05dfNU9+F7eMIAg/YPit3nwj3F+BL+qynOB2cab+xX/ dTYHOGqaNokiYpCPBCPUnfmba+NQ2mhGk/+WHyCS/RAe3D/Hh3jymPgqt2ylnAACl4C8 X-Google-Smtp-Source: AGHT+IE1xhhYfW0IEAeI4qUPn4K2IHYTBG+TlHYgRwAFdZMr7rCd5DcB77RxC9mvkEcZOgvLqDWYtA== X-Received: by 2002:a05:600c:6219:b0:442:f4a3:b5f2 with SMTP id 5b1f17b1804b1-45334a6147fmr5762605e9.6.1749762630014; Thu, 12 Jun 2025 14:10:30 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:f2df:571a:ae4c:bef2]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4532e09c21esm32263875e9.17.2025.06.12.14.10.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 14:10:29 -0700 (PDT) From: luca.boccassi@gmail.com To: Rahul Bhansali Cc: dpdk stable Subject: patch 'net/cnxk: fix descriptor count update on reconfig' has been queued to stable release 22.11.9 Date: Thu, 12 Jun 2025 22:07:08 +0100 Message-ID: <20250612210733.2506558-51-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250612210733.2506558-1-luca.boccassi@gmail.com> References: <20250612210733.2506558-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/14/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/12296df8a2395117d1027c9883691a9ad167fb5a Thanks. Luca Boccassi --- >From 12296df8a2395117d1027c9883691a9ad167fb5a Mon Sep 17 00:00:00 2001 From: Rahul Bhansali Date: Wed, 28 May 2025 17:21:19 +0530 Subject: [PATCH] net/cnxk: fix descriptor count update on reconfig [ upstream commit ad23295cb8217390b9f966ad5ee10a4e21f9c20b ] In Rx queue setup, input descriptors count is updated as per requirement, and stored. But during port reconfig , this descriptor count will change again in rx queue setup. Hence, will need to store the initial input descriptor count. Fixes: a86144cd9ded ("net/cnxk: add Rx queue setup and release") Signed-off-by: Rahul Bhansali --- drivers/net/cnxk/cnxk_ethdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/cnxk/cnxk_ethdev.c b/drivers/net/cnxk/cnxk_ethdev.c index 73f59dede1..f5097c7fae 100644 --- a/drivers/net/cnxk/cnxk_ethdev.c +++ b/drivers/net/cnxk/cnxk_ethdev.c @@ -603,6 +603,7 @@ cnxk_nix_rx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t qid, struct roc_nix *nix = &dev->nix; struct cnxk_eth_rxq_sp *rxq_sp; struct rte_mempool_ops *ops; + uint32_t desc_cnt = nb_desc; const char *platform_ops; struct roc_nix_rq *rq; struct roc_nix_cq *cq; @@ -716,7 +717,7 @@ cnxk_nix_rx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t qid, rxq_sp->qconf.conf.rx = *rx_conf; /* Queue config should reflect global offloads */ rxq_sp->qconf.conf.rx.offloads = dev->rx_offloads; - rxq_sp->qconf.nb_desc = nb_desc; + rxq_sp->qconf.nb_desc = desc_cnt; rxq_sp->qconf.mp = lpb_pool; rxq_sp->tc = 0; rxq_sp->tx_pause = (dev->fc_cfg.mode == RTE_ETH_FC_FULL || -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-12 22:06:25.743822933 +0100 +++ 0051-net-cnxk-fix-descriptor-count-update-on-reconfig.patch 2025-06-12 22:06:23.878044807 +0100 @@ -1 +1 @@ -From ad23295cb8217390b9f966ad5ee10a4e21f9c20b Mon Sep 17 00:00:00 2001 +From 12296df8a2395117d1027c9883691a9ad167fb5a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ad23295cb8217390b9f966ad5ee10a4e21f9c20b ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 85fdb4dc91..fc17841bca 100644 +index 73f59dede1..f5097c7fae 100644 @@ -23 +24 @@ -@@ -653,6 +653,7 @@ cnxk_nix_rx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t qid, +@@ -603,6 +603,7 @@ cnxk_nix_rx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t qid, @@ -31 +32 @@ -@@ -778,7 +779,7 @@ cnxk_nix_rx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t qid, +@@ -716,7 +717,7 @@ cnxk_nix_rx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t qid,