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 3405D46A63 for ; Thu, 26 Jun 2025 14:07:51 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2D196402A6; Thu, 26 Jun 2025 14:07:51 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2083.outbound.protection.outlook.com [40.107.223.83]) by mails.dpdk.org (Postfix) with ESMTP id 53226400D6 for ; Thu, 26 Jun 2025 14:07:49 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=eenYwCkGHy1uEfxU7BC4nY58UkqIaC4MN0sWgglrnJcOPIS2amZ5eUIbQuezfsYjs3B/VArHaUE+i0qjG8cw9/BthqqH0ODlzrFyeqy3nbhXUGiHXkgANfHowgqvcryW/Oy51be9vzOLSJk+p0L39HqTyw8eyQWesV6PDt6nG9TPA4tH0PUsuYJOpKSPFWpxr0gHxBDLV/FDzp7GsOkEnYYEnOb/pgOWgkRbkeAfwSZBGJsAV4ZxCkYsngMLH5ATVuIXPsfg6M8w5XffkWACP2961QA4S0Q/8WEyfDCWqJPZFqxJnKRamtg8t3EOq+nirvNQKC+KVtuvtsLC4kgBGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tdGe+sdv+LloBGhYCovuYDA9QScg3JyT3JIn2BsQlHU=; b=DNtBYX+aQbPSCWFxuXEtpaIlnlcK+ReGxFl4zyx8e1Cq6Mj7oVPHPvey9BspPo8o75UGfT0nvlcQLLrbc2jaR3WescQJzkbZf49E0Uvhkp0YSeffVpKzC6Hckbnn9rwwxdRQ4+MYd+CuQDiappOWSqEQFI1xJYcwHwJLgM3djqhaOpi2c99Zyhlpii72jxg6QnG8ip4vDzcceY0gvRL0wOZAnFIDemXc62EAp7PiM34WAwfBzuWGkO7FGRhTBylmiMZRMGd+n78bkl/wd9LahH/ognY80USY6fCgYt1+dym520rpjb4MiEO5g+EOZkpvZjh1YhIRrFDfmLhYHnIfkw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=marvell.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tdGe+sdv+LloBGhYCovuYDA9QScg3JyT3JIn2BsQlHU=; b=j/59ZkWDAccG6Gl2YcTAYOcDqK0rG6yIcUQ9n5deo2laph0MhjO/2pf5WHuk1iZoDvbTMJoB+qBIsPOu81hxqbCGyOLS7mvVVVwoCf92EhZ+jia7P0AnDYMDgtO0uNPDhE4yaTH/Cmau0Dhbo3bDnQYFbMq1EFzsnvPv/YpGwVOl8TokhNhavqaxpc+/XDhVKBZTgN2F2flltWe/7MFwB8hhGcITepq/GlPPwfSPgXkkvCbKD746HpmXqde+hdmPo8CaaGrLUFNcdSgWjykZ5hVdiAaUMRL3MvxSlzeoW/sLXV2UvbhZpckfERAmSC4egYjlMHmmbSEkcMERdk+vBA== Received: from YQZPR01CA0097.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:83::29) by IA0PR12MB8895.namprd12.prod.outlook.com (2603:10b6:208:491::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8835.27; Thu, 26 Jun 2025 12:07:45 +0000 Received: from DS2PEPF00003446.namprd04.prod.outlook.com (2603:10b6:c01:83:cafe::66) by YQZPR01CA0097.outlook.office365.com (2603:10b6:c01:83::29) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8880.18 via Frontend Transport; Thu, 26 Jun 2025 12:07:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DS2PEPF00003446.mail.protection.outlook.com (10.167.17.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.14 via Frontend Transport; Thu, 26 Jun 2025 12:07:45 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Thu, 26 Jun 2025 05:07:23 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Thu, 26 Jun 2025 05:07:21 -0700 From: Xueming Li To: Rahul Bhansali CC: Xueming Li , dpdk stable Subject: patch 'net/cnxk: fix descriptor count update on reconfig' has been queued to stable release 23.11.5 Date: Thu, 26 Jun 2025 20:01:20 +0800 Message-ID: <20250626120145.27369-61-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250626120145.27369-1-xuemingl@nvidia.com> References: <20250626120145.27369-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF00003446:EE_|IA0PR12MB8895:EE_ X-MS-Office365-Filtering-Correlation-Id: b595f8f4-034d-43b0-6d6d-08ddb4aa0f92 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|1800799024|36860700013|82310400026|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?9F/LEneY7YZZoW/Y6WGOJNnjpn2nGG/RpR/OJ13Uy+QXK1D+BWNEv1YiCXEB?= =?us-ascii?Q?p3j4fqH1/4dhZHU9qD4nnOGbyfW/ve33ukm0wgfwgFIqyYWj3YrlCS/qG9u7?= =?us-ascii?Q?UpiLiiJFR/YzNlpPrpbYz8C12SioWP4ho4Wn3+nuzIu+9FWkHGUTflwWyyYE?= =?us-ascii?Q?CUfFACPC8lKazRoUdOdOLHmCaPwshyUUnTjssZNTs0hVbZiOciN+FwrblAtc?= =?us-ascii?Q?U8kl+4wiybG8RGfs4hbSG8yysOAIHIvIH7jiJ3ey7NRDtKUB/xLnX3QG5d+X?= =?us-ascii?Q?0py1lDVs0Zw/Qictk+0msryk0ilCdWH/o84Lbc/gCi7x77dXTMGQoR9aRApN?= =?us-ascii?Q?T9hyH9BvjXoGgn5gyFgt+rZ84zmBGNLck9d1liPIYUPag3br8hreTd1vjQFZ?= =?us-ascii?Q?aIjZX2tCkfMAxWp/RK1SyvgWhegcXfa9lolI5wb2tZeqA0Hb04XHXhRq97iW?= =?us-ascii?Q?RjX1Sq9cs/1RV/Mwx/JQAgx1hgAkTASGhRkueZLvH3/4Zcyf927LiTvMZR+9?= =?us-ascii?Q?ZsZYht3LJRZO9FIl26wnBvPwW+4xCWZSZ/ThRcqKm8PL6dWNWJxGH6HMF0pv?= =?us-ascii?Q?3Psuo8L4OtJb44tje2KEQes66dtJO8MXXwFdRMkidbKGvqjLHgi7WffOsCLo?= =?us-ascii?Q?dXcyPqsZajEamaGToU9FtQJnv/RzX8UYRtqTYK94MifUf9gWtu/IfEV227nM?= =?us-ascii?Q?JrBibhLX8ycwQ6JHG/EXbcoZuX4F3dMRohcwt6pqVdpgqNn39gwhLANRzQFW?= =?us-ascii?Q?GajC4SwJfmNHj95MZG2lGeOW1uzTTrSP4lvjwu7gQiHkckNmIsjpUgKG5An4?= =?us-ascii?Q?Xi6eYQWIZzExQl++16vtc8KxlBWCTqyvozr9BfIQV3oebRD3OdG2nl7V7Inx?= =?us-ascii?Q?0aq/+jomrnIq7XnmXMkCFVSU3Ji0aPihpkuAD+w5Rp7o6ieXWqjxofJeAsBP?= =?us-ascii?Q?rrvOFGy1MvGcsvWfCtJbMqTv/9RucDYlgU4WChcVK6TPugu26QZpdqV6oh80?= =?us-ascii?Q?eMWvSFUhwW/lEXTfsHXhc1ieiFjoGvmVoiwbkHZAVOB8vQr/rGRTsMundc0G?= =?us-ascii?Q?Aumk/3Uh4HXJ/1VusfAqEx3kTzEIZ00i/kzbO2yiifSzFru+OUhUvbO/dHaI?= =?us-ascii?Q?LZxwvU4RB4BNKPX9RsGmB0ZB2j5cGwxpCfqQyQ/ksmK25R7eoh2OlWuaNaBC?= =?us-ascii?Q?1wrBu3wWuTMi8DBxHM6GkoaBAkbL8ZYKvm3gAuJAy2TKBcwO8I8rmI2WdH0Q?= =?us-ascii?Q?2ule4ju0yG3wbF1yMOARq4KyzCKf86lqllpbfMDlHtjYPvgpScNOBq2c+JgR?= =?us-ascii?Q?J8GdLYn9vhkP4mJKz83u5utGtK/o05MwV6/PIuLiezeh9GSRNwi6KI7Xoq/G?= =?us-ascii?Q?JERE0zA+ut7VJeAjV4aRfzb+jhGhyXViPIbv8VsAu2o7fgg+e5vZQtiiKQ7v?= =?us-ascii?Q?Ar1e8/JvEiHw540y2g5U44M6Tf37wRpuWy5dSIMzuE4huuBChab9YhkmiyfJ?= =?us-ascii?Q?Z4RlfVPg1S8tSznd9ElgcjLccRKdS+gY2OmO1fK/elDNyPURm7yb7BytLg?= =?us-ascii?Q?=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(376014)(1800799024)(36860700013)(82310400026)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2025 12:07:45.3841 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b595f8f4-034d-43b0-6d6d-08ddb4aa0f92 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF00003446.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8895 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 23.11.5 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/28/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=9e7d0ee5fc5fce17d7d21e6d10ca5e2f61963725 Thanks. Xueming Li --- >From 9e7d0ee5fc5fce17d7d21e6d10ca5e2f61963725 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 Cc: Xueming Li [ 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 f0cf376e7d..bcb4790aa9 100644 --- a/drivers/net/cnxk/cnxk_ethdev.c +++ b/drivers/net/cnxk/cnxk_ethdev.c @@ -626,6 +626,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; @@ -747,7 +748,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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-26 19:59:20.080887032 +0800 +++ 0060-net-cnxk-fix-descriptor-count-update-on-reconfig.patch 2025-06-26 19:59:17.446418041 +0800 @@ -1 +1 @@ -From ad23295cb8217390b9f966ad5ee10a4e21f9c20b Mon Sep 17 00:00:00 2001 +From 9e7d0ee5fc5fce17d7d21e6d10ca5e2f61963725 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit ad23295cb8217390b9f966ad5ee10a4e21f9c20b ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 85fdb4dc91..fc17841bca 100644 +index f0cf376e7d..bcb4790aa9 100644 @@ -23 +25 @@ -@@ -653,6 +653,7 @@ cnxk_nix_rx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t qid, +@@ -626,6 +626,7 @@ cnxk_nix_rx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t qid, @@ -31 +33 @@ -@@ -778,7 +779,7 @@ cnxk_nix_rx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t qid, +@@ -747,7 +748,7 @@ cnxk_nix_rx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t qid,