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 239FE46A63 for ; Thu, 26 Jun 2025 14:04:18 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1CC87400D6; Thu, 26 Jun 2025 14:04:18 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2078.outbound.protection.outlook.com [40.107.94.78]) by mails.dpdk.org (Postfix) with ESMTP id 1ACB1400D6 for ; Thu, 26 Jun 2025 14:04:16 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vt7nOrBo2odIsvmj7h2DmSLWvU8iyNuZLlXZb5U8X0Dh9QQVuEBxo4S9kI/t/HUwRAbEweUuWip5LK5xY+nHSexmaThnShzGH9ZqWe1bYQVF+pNBFaVeYevi3aI0aqDdYjwHHVBqPDo4NSYl9RnQDzxgxg+2YYu9E060BlKNIphZ/V9decJIyr0KPgT9ROdtqqgvrPs/wVRcd4dPBETp2yILRg6PceN/1qL1SDdXYMyGLfmW/PoJPgGEzfmppfAxiycMPGRRRmjKFoguwqSBm6HSFpAujEntN6HP+qtYwTc2Cnc+HfQ4OFlGDpHYrjFyDiKUV04hCXBVyyoqZB9KRw== 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=BGiW+5AVwPuTCZHBkLvLH2jbnL5H9bib7TlFAm7MILM=; b=nbgCp8NkwnAboR5OPAzr7/Swe4+8Q80t3jyGEy15c5pGPus++TVD92RZkXImvMGDHM8zdIiJ+mOSQ60W5IL2HClBvTHssLJKV7d1UrF/xjEX2Nw+F/P+u2pG3mfY8IgkBUoq60gKXq8IJlCL4tx66K9KTh94M6hBgqxISM0XH0RGCDDpnjkXt1MBTbyQL9YvoJxq8Cq5H2o6hS6gmV0VCdVmrEp0kC+iUXqMyIb7ZDR5CjRgCrbNCQyQG5kvJ8+MaMSc+hKRCSNAerZkjbWvvW7SPk5/dqlEctzSNaWA2ZXoAHGpVv28fxQW21rzKlIvMnXuUtNf/FobtaZzfRxGig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=dpdk.org 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=BGiW+5AVwPuTCZHBkLvLH2jbnL5H9bib7TlFAm7MILM=; b=Chv299FxLEGr/AMreKIOhL+hgVew3Ai5I1tsAe3U/rX1Ds55Af6N4tzU4hfsXtIIG3u8l8CCqyHOZR3ZnU7w4qCO7Nw3bHY4F79eKFwYL13z+o4LlRFWeLUaftkZxbMnVDbcq4m1fTIcwljsMHg0YsgDqe4OBFZ/qD8Yzgl/8QOO4yRRoGQzpt4r8NMPi6yfs+TZ2sUcAGHEii3qZ41JOGuBk7+qoC0MtJToNP3HfQfMAIkROncp0PCMSoVCUybjaeRXf27ciEIi4QWBXIpgmevYu7tEAGvcpZu+7vaNZ5w3JRbDI7MVfS+gd2zqd2eo8yx3HYEm2sK5kfDYq3Av8w== Received: from MN0PR04CA0013.namprd04.prod.outlook.com (2603:10b6:208:52d::18) by CY8PR12MB8339.namprd12.prod.outlook.com (2603:10b6:930:7e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8835.29; Thu, 26 Jun 2025 12:04:11 +0000 Received: from MN1PEPF0000F0E3.namprd04.prod.outlook.com (2603:10b6:208:52d:cafe::b8) by MN0PR04CA0013.outlook.office365.com (2603:10b6:208:52d::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8880.17 via Frontend Transport; Thu, 26 Jun 2025 12:04:11 +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 MN1PEPF0000F0E3.mail.protection.outlook.com (10.167.242.41) 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:04:10 +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:03:51 -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:03:49 -0700 From: Xueming Li To: Dariusz Sosnowski CC: Xueming Li , Bing Zhao , "dpdk stable" Subject: patch 'net/mlx5: fix counter service cleanup on init failure' has been queued to stable release 23.11.5 Date: Thu, 26 Jun 2025 20:00:43 +0800 Message-ID: <20250626120145.27369-24-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: MN1PEPF0000F0E3:EE_|CY8PR12MB8339:EE_ X-MS-Office365-Filtering-Correlation-Id: fa694727-5680-4941-1f0f-08ddb4a98fb8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|1800799024|36860700013|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?p8bVot2vyB+I5XYou5Q+sLdI0T1Q6RAp+qDzAAlM6trgm/BoB+zzd9jENsbG?= =?us-ascii?Q?GdBAaEQepU757HOuEnkCqfHjQ4JGoEYNuNBTZzKcDXBll9a4snYWa9TJPmm3?= =?us-ascii?Q?zyS6ywbXWStJ0JTFuHXvqOtGiBywokzZhKtGNRTTqD2y+S98KGcjLRTcRUg7?= =?us-ascii?Q?mvr3hRplpa3/9QTQ+k1agMjMyyy/qhk5s/bDFsOY2W8w2/rDLuDL+b5O0lNY?= =?us-ascii?Q?xXbAKPocP8LQcQAUJOlD9YBxjk7FS0t8ItOikweIPGwElcCyC3nADnomRuFg?= =?us-ascii?Q?e7UUJqHkY05XAWueYGHTI6sEo87GcmCtSbvmPy+HNydztl+A4QEbGqTT3rej?= =?us-ascii?Q?ScDBz4hyw2nC/gsptZ9i5nahedY9KaMbUmH+YDXxPhtE/CsLKdHe/NnXAe4c?= =?us-ascii?Q?hZHvl6ZU5AzxBgMB2AQh+rG5SmCelspoWA20ypkUmIM7U1WevnWZEJoQX5M6?= =?us-ascii?Q?EN1BS0oqdqIHnsyRekPqa8NdyNbOJVqkKFGQ03vetggcg3lX3B8xYSihKHzc?= =?us-ascii?Q?54OwoxpkSu7JFBVQabCHDODI6dQfhniH+GFKLUFCtbsZtvl9BggQZu6URbyf?= =?us-ascii?Q?J5pK+fV9bj0Y4x9nNXOQgBlhrrveZ9WOtHZCTmB9vJgv56LRgdSlG1h677WD?= =?us-ascii?Q?mWtfh03a0xUdqELz9c5ZXPpOw0Wn3cFuPMOEfJGF4K86uGVXwJFyUad96tNX?= =?us-ascii?Q?z5slp4fEj3FIoNMZFvEViLxAUurPPQhtBEWbwX7pRU89LgW+Vly9sthcpzPy?= =?us-ascii?Q?DOt4F7Ec7WXd6VqeIsYBeyaYLHv0EO9Eq2GnceGf713PQ9s2C2RU3xr6+eJr?= =?us-ascii?Q?FKzvRkQVZiahxac3VBn6QziTDSpCDF/uo3wCbtUZ5hyOnsU2OALQmd8Lbf+F?= =?us-ascii?Q?RmIocFHMRKfPIQ91fWmCbmFnFDdqfFWUvpvDeUQgVkls/oGb00fAAiLEgX1M?= =?us-ascii?Q?Zitx/57QY6oXH9C8QOZjKTIBqLRbHGNQe48l4+iSNq5p2cp/JpSgjpNjEXbJ?= =?us-ascii?Q?cKkLADMKxYtOyq6EnnzoNxZ7v5D2B/H5AkPw+5MCdATj/8Cqg11YqD520l/w?= =?us-ascii?Q?PQB0K06DkgDxujtB52lh8QwMQVciw50PPGtf6ExUcGhT0tWjg7t9bLTOaqP0?= =?us-ascii?Q?fz8x8QWX9XcgAZSnaQd7K2QmoxyWMwwo70rt+UFx2hhy41orIewzBh6QTyR9?= =?us-ascii?Q?zraYizspuAReJIMzNZtjFxA/4DwK8E/PKt14gvlF1jEPaEjXdSjqd8YVtqjq?= =?us-ascii?Q?OWtkOPUjwrpBMNsyeb0ZlmEz56KNwsWWHsKuyVPO+oQkRwvEnJiRv8QUENLm?= =?us-ascii?Q?VOVM6Rxe9x581/ziGvYcSwIKGqAsQleoUqJDWmqknQHfcbW69Tp35NwYnORD?= =?us-ascii?Q?Zkk7cfR1lPMKGaeQQAISOJXnMiK58F5wNoXnSeiRDSTHCz1wFxaYst4qMd4y?= =?us-ascii?Q?EwX8Pjx1lzpyLc6Rx85Bi5wQ08ZEGZy6ZTLI29uFVYNyw2vIues/HbM7sbcA?= =?us-ascii?Q?oweSo2wGD1x2WnDhIOPSaHs0D/aNj4fPaPO32Sg2iknKdebSS32sBVQDEg?= =?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)(82310400026)(1800799024)(36860700013)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2025 12:04:10.8220 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fa694727-5680-4941-1f0f-08ddb4a98fb8 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: MN1PEPF0000F0E3.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB8339 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=904d50d76ad3e380603862c36874597bdafb9fb5 Thanks. Xueming Li --- >From 904d50d76ad3e380603862c36874597bdafb9fb5 Mon Sep 17 00:00:00 2001 From: Dariusz Sosnowski Date: Fri, 25 Apr 2025 21:41:05 +0200 Subject: [PATCH] net/mlx5: fix counter service cleanup on init failure Cc: Xueming Li [ upstream commit 4d78ac5f3ef7c1ae3ae194423428c0f96e9994bc ] When initializing the counter pool in mlx5_hws_cnt_pool_create(), the background service thread was started before pool creation completed. If pool creation failed after the thread was started, the error handling path did not clean up the running thread, as it assumed no resources needed cleanup if the pool was not created. This patch moves the creation of the background service thread to the end of the counter pool initialization, ensuring resources are released in the correct order during rollback. It also adds a missing "goto error" in case the service thread initialization fails. Fixes: 4d368e1da3a4 ("net/mlx5: support flow counter action for HWS") Signed-off-by: Dariusz Sosnowski Acked-by: Bing Zhao --- drivers/net/mlx5/mlx5_hws_cnt.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/mlx5/mlx5_hws_cnt.c b/drivers/net/mlx5/mlx5_hws_cnt.c index ca6fd51cc6..7e33568622 100644 --- a/drivers/net/mlx5/mlx5_hws_cnt.c +++ b/drivers/net/mlx5/mlx5_hws_cnt.c @@ -673,12 +673,6 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev, goto error; return cpool; } - /* init cnt service if not. */ - if (priv->sh->cnt_svc == NULL) { - ret = mlx5_hws_cnt_svc_init(priv->sh); - if (ret != 0) - goto error; - } cparam.fetch_sz = HWS_CNT_CACHE_FETCH_DEFAULT; cparam.preload_sz = HWS_CNT_CACHE_PRELOAD_DEFAULT; cparam.q_num = nb_queue; @@ -705,6 +699,12 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev, ret = mlx5_hws_cnt_pool_action_create(priv, cpool); if (ret != 0) goto error; + /* init cnt service if not. */ + if (priv->sh->cnt_svc == NULL) { + ret = mlx5_hws_cnt_svc_init(priv->sh); + if (ret) + goto error; + } priv->sh->cnt_svc->refcnt++; cpool->priv = priv; rte_spinlock_lock(&priv->sh->cpool_lock); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-26 19:59:18.844961283 +0800 +++ 0023-net-mlx5-fix-counter-service-cleanup-on-init-failure.patch 2025-06-26 19:59:17.270418049 +0800 @@ -1 +1 @@ -From 4d78ac5f3ef7c1ae3ae194423428c0f96e9994bc Mon Sep 17 00:00:00 2001 +From 904d50d76ad3e380603862c36874597bdafb9fb5 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 4d78ac5f3ef7c1ae3ae194423428c0f96e9994bc ] @@ -18 +20,0 @@ -Cc: stable@dpdk.org @@ -27 +29 @@ -index fd12bcd7ec..5c7c0041aa 100644 +index ca6fd51cc6..7e33568622 100644 @@ -30,3 +32,3 @@ -@@ -729,12 +729,6 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev, - } - goto success; +@@ -673,12 +673,6 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev, + goto error; + return cpool; @@ -36,2 +38,2 @@ -- ret = mlx5_hws_cnt_svc_init(priv->sh, error); -- if (ret) +- ret = mlx5_hws_cnt_svc_init(priv->sh); +- if (ret != 0) @@ -43,2 +45,3 @@ -@@ -769,6 +763,12 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev, - NULL, "failed to allocate counter actions"); +@@ -705,6 +699,12 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev, + ret = mlx5_hws_cnt_pool_action_create(priv, cpool); + if (ret != 0) @@ -46 +48,0 @@ - } @@ -49 +51 @@ -+ ret = mlx5_hws_cnt_svc_init(priv->sh, error); ++ ret = mlx5_hws_cnt_svc_init(priv->sh);