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 4C0A146BAE for ; Fri, 18 Jul 2025 21:35:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3F2B540E30; Fri, 18 Jul 2025 21:35:30 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 3D69440611 for ; Fri, 18 Jul 2025 21:35:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867328; 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=Ar2n5NIt7VlcGODSHPBUtby7PaA119jMAcG04ym5zCU=; b=crCcsqVj7r/vcHVHGEZnv8o+HZDMOhQuwtslWLE1tcYKQmUn4UVrBNju/pRDV6ta3gb1Jv lRAgy8CM/530xbSGwSncwd3hapDCIz1IUAijMhblQkAmIShnf0bFpArx+PVvBRKKZmQ3br I8i2XO/QNm3+xw9kvYTMnl+EUrVw9MI= Received: from mx-prod-mc-06.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-16-1PUtZs6QOtywCgYyYrImog-1; Fri, 18 Jul 2025 15:35:25 -0400 X-MC-Unique: 1PUtZs6QOtywCgYyYrImog-1 X-Mimecast-MFC-AGG-ID: 1PUtZs6QOtywCgYyYrImog_1752867324 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D52C71800283; Fri, 18 Jul 2025 19:35:24 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B277218003FC; Fri, 18 Jul 2025 19:35:23 +0000 (UTC) From: Kevin Traynor To: Rahul Bhansali Cc: dpdk stable Subject: patch 'net/cnxk: fix descriptor count update on reconfig' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:30:06 +0100 Message-ID: <20250718193247.1008129-72-ktraynor@redhat.com> In-Reply-To: <20250718193247.1008129-1-ktraynor@redhat.com> References: <20250718193247.1008129-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: iYx3tz9ya7t33nTlGhaZZyJ4fwcUkcoU6zcW0uFqYqE_1752867324 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/23/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/0aaff9e61e169216b26e9cdeadab392decc764b0 Thanks. Kevin --- >From 0aaff9e61e169216b26e9cdeadab392decc764b0 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 ea980a6d5e..462a8a33e2 100644 --- a/drivers/net/cnxk/cnxk_ethdev.c +++ b/drivers/net/cnxk/cnxk_ethdev.c @@ -642,4 +642,5 @@ cnxk_nix_rx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t qid, 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; @@ -763,5 +764,5 @@ cnxk_nix_rx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t qid, /* 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; -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:13.543161954 +0100 +++ 0072-net-cnxk-fix-descriptor-count-update-on-reconfig.patch 2025-07-18 20:29:10.972907460 +0100 @@ -1 +1 @@ -From ad23295cb8217390b9f966ad5ee10a4e21f9c20b Mon Sep 17 00:00:00 2001 +From 0aaff9e61e169216b26e9cdeadab392decc764b0 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 ea980a6d5e..462a8a33e2 100644 @@ -23 +24 @@ -@@ -654,4 +654,5 @@ cnxk_nix_rx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t qid, +@@ -642,4 +642,5 @@ cnxk_nix_rx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t qid, @@ -29 +30 @@ -@@ -779,5 +780,5 @@ cnxk_nix_rx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t qid, +@@ -763,5 +764,5 @@ cnxk_nix_rx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t qid,