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 78EAB470E5 for ; Thu, 25 Dec 2025 10:24:09 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9895B402BE; Thu, 25 Dec 2025 10:23:50 +0100 (CET) Received: from PH0PR06CU001.outbound.protection.outlook.com (mail-westus3azon11011024.outbound.protection.outlook.com [40.107.208.24]) by mails.dpdk.org (Postfix) with ESMTP id 5B611402BE for ; Thu, 25 Dec 2025 10:23:49 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AEHCnSTJ1NfIlk2JEznl5IGCvVsqHmepFd8fu83iwo4eHk4+3Bvnf1dA5JPk2PoHgo8k8+/uQgzWyyYfoDCcNmqpVvaTWwlPQiCglg1PxkSXAcsFtPzKuROnnphsw+pCM8rXT+x3BiGjLAc2sYYn+9//FyAtx9M7tJiyadDPRv5WFDUjwIThVoT1FurJjsLPVxQZZrYQv9P+4+RQcsHRarhoVNBMdZ28hDV1XLAfC8a2Lh1CkzNvgfjrs7gua3l6yoSUOwggpzFWf2obESV3OFtFKPnc7WqGq7Q6r3FGcC2HRCyeV3vBukLh1RZw2k8Gqc0CYrA+VctKphAZo2ghhg== 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=bANp1kunX0aD9VF5TIfP70JXCH3CFJX4GExKjwpZ9SI=; b=A4jy8yTMRbbFaE/dq3cVHsgpRrNaen54bvwct2+yB1ZUx0eI96wBBX1HaJUdnU+BW+tuPdmAWiJDSvx7T963Aiqo5WSjKNhre8JWa0jlvYqagAJz8uaeKx3D5Rld6ertVyFUGXOrsAjeDawpBWLIrgxj80hr6zizAm56WSkdWP+iSSwilWFvVeF+/r+rP75eWxvUahV5XGskePkF90yeObssD1ayd/4RjreMFOc34oZ2bvi+fZtMP+AvamR5U4lWLkhTdIg3Cl2A+DS0iqP381LuzdWAAGFwnXmYoUshXo0qxxyszRU3RHovkZ47jC5+JhBZZxC5DpIuoiEUuB0fOA== 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=bANp1kunX0aD9VF5TIfP70JXCH3CFJX4GExKjwpZ9SI=; b=Pb7i1Cf5Gt5CMWR8EjXoMq3cGszPY8IAH4oA31owNAJKAPrXwUSTfvDBQ0o7tb/a+qxrrw4egoYcsKQO0zpgyoiJtLfPBoU1h9j4QQdB1Za1qjbH6N60q/IISk1jePMLmXl228vnE8Z248fGhbW4G/foqeaOSK9ULNBtKs4jKw3jG18ysQN2WeqVk3oR6c5/SL/fCY9iTcTZs6KspRBMfBIwJYbtglNsXDYnHj71s2Tg3oieQL/kq9/bJcSCLen1PSbmQyb2jnFcpigubGVhKxM+1MuiEWCBY5e+LE9rRgnsACJoGsNKal0SdTULTglGENmWMy4w8n56RBeZLPxXVw== Received: from CH0PR03CA0109.namprd03.prod.outlook.com (2603:10b6:610:cd::24) by DM4PR12MB5820.namprd12.prod.outlook.com (2603:10b6:8:64::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9434.7; Thu, 25 Dec 2025 09:23:46 +0000 Received: from CH2PEPF0000013B.namprd02.prod.outlook.com (2603:10b6:610:cd:cafe::14) by CH0PR03CA0109.outlook.office365.com (2603:10b6:610:cd::24) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9456.10 via Frontend Transport; Thu, 25 Dec 2025 09:23:32 +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 CH2PEPF0000013B.mail.protection.outlook.com (10.167.244.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.9 via Frontend Transport; Thu, 25 Dec 2025 09:23:46 +0000 Received: from rnnvmail203.nvidia.com (10.129.68.9) 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.2562.20; Thu, 25 Dec 2025 01:23:35 -0800 Received: from rnnvmail203.nvidia.com (10.129.68.9) by rnnvmail203.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 25 Dec 2025 01:23:35 -0800 Received: from nvidia.com (10.127.8.12) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20 via Frontend Transport; Thu, 25 Dec 2025 01:23:34 -0800 From: Shani Peretz To: Rongwei Liu CC: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix meter mark allocation' has been queued to stable release 23.11.6 Date: Thu, 25 Dec 2025 11:18:18 +0200 Message-ID: <20251225091938.345892-57-shperetz@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251225091938.345892-1-shperetz@nvidia.com> References: <20251221145746.763179-93-shperetz@nvidia.com> <20251225091938.345892-1-shperetz@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH2PEPF0000013B:EE_|DM4PR12MB5820:EE_ X-MS-Office365-Filtering-Correlation-Id: 8b9022fe-77fe-4bf6-d50b-08de43974e0d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|36860700013|1800799024|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?XO8wbdJWKF4nMQbG8U94vQV9UF2q0bDj18P0WIAEbtT8wGjdnB0l5xvm9X68?= =?us-ascii?Q?llLstt+slV5SzcDAl+9oJaw0+6T2AnTaWcw/Li9tIMYVWMTD+vu699+eE+Yr?= =?us-ascii?Q?lp//EftPWTZQEPMFao/7l495ZWyaeXjkOWkS0SNPmn5lg49Auu/7ZGU3vZQS?= =?us-ascii?Q?wIpKvKc+LcXhNj0XF7SjydleNb2VV+lGlkQ+eOuIGVMK2a4L1vEOaS0iBFh/?= =?us-ascii?Q?tSNIn5w1asWEOAbw+toXYcljbYa9lu8dCnXUxAObGeTNCCxL0qYCbrEnNj8q?= =?us-ascii?Q?pQ1u1an10bm0X+7O7llTxFXG5Fk//puocIGFIVMARp0pUWYBR6dENp9YpHs+?= =?us-ascii?Q?CNtNScISuVzAVhC4hyrRplILVfEyj7DNnJN4wMSpET0AG5jL7Ss0iQI+cou+?= =?us-ascii?Q?/0wGIAZzDxwuNECUemHrnH71Deq2FHoEvcI7ZRmBAjdkjPZOHWiIAzRcyQCR?= =?us-ascii?Q?ESRN/WNtuoRhmls7dOFo632aLiPa0Ku6klemrHIP27wyTLIKklHBiPbybOAB?= =?us-ascii?Q?owc4e6IhLUpQzmULaCdMLw6GuSVQYPxluygPIzXRveq6+8DJ3WLMBQwnZq+6?= =?us-ascii?Q?VUMID+4G4PK79wS2bMK80PNL6DM5mrO9qBxehQKpZNR+xUEEKTb3E/6S2qfH?= =?us-ascii?Q?SecKjMNGwMNJ7SeTGbOZWakWw7JebGYp18qPfjwJ2TsVH57MqZAT1Ssruy0n?= =?us-ascii?Q?bCFhI1IVzPfepbl6j1e71z2iMXmQgrd1hoXi/sfjpJbh2o20padlTVyXm6nE?= =?us-ascii?Q?EmiGTtktphrJlzrJzi0JzcGD7hYh1XP24XQHsPKWRHf6NMErf3kcFlExN2uO?= =?us-ascii?Q?9lzjthGEfL+8K+KNlL1JWV7qksJQ+J4IZa/NvH/QjTxnYWLJvA/6mnD+AaoV?= =?us-ascii?Q?Tb8iEgModtru61Z8col7Evt775E+ek04nn5jMoCZMom1+CoML/XMYo6CZugz?= =?us-ascii?Q?YnTkmrRWwGnRUswbpwKcNH42vTuNpc95yGSxaGqi6y+G4IAks4GQ7hPW0x1L?= =?us-ascii?Q?6GiXdk8BhM73DGcdXbFfMlbrz2TOsjv3SPRS+hGVo7fn7IvkNj6IAH0hMbgb?= =?us-ascii?Q?zfmGg5gwd+2t9KLANGJ+mdM/tl1woYtMNikjMn9VKa0mPAHJsX0FDpiZkcNl?= =?us-ascii?Q?3p05cKmvOoqQ8ciK4QIU4TilBSkbBlvgWNqFsK+bX3Hbzgh8m2GRFD3/aYNq?= =?us-ascii?Q?a34lhXdgD/+Wch4F21pj+mQ6EGfond6MvznzB43R9e9c4knZsnFApNV345R2?= =?us-ascii?Q?ndpxqsC4wASVoFIrz4XETfZ7Khxa88aKopaBJ53cDMgZC9fmDhjyHWR4ZNEd?= =?us-ascii?Q?0iwkTLt/BNKy+FniCywjC9yVW1a5fImL9WPyvjJyWJJ13WGMBwDnGaMGSUtB?= =?us-ascii?Q?l7J9W0Fq9868ITY16lXy/qHfRJdy64bj5YpLfqyC2gbKtG0ayKEVth+L1rmj?= =?us-ascii?Q?ES0SvlJTs/cJbA50P898Ng9s/zHRUgEqco5ND7qWml5UzIVwtYDiFdRN9ezN?= =?us-ascii?Q?UqVetVIPpDvuPKUFVHoZaP5pGMgWRycWF1SgA3JH7MCjU/SqB2tcrZDmcXVy?= =?us-ascii?Q?p0m6bGRnYqZgU15mCk1xJ1/4bOisQ024JTbyZz7J?= 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)(36860700013)(1800799024)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Dec 2025 09:23:46.0231 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8b9022fe-77fe-4bf6-d50b-08de43974e0d 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: CH2PEPF0000013B.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5820 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/30/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/shanipr/dpdk-stable This queued commit can be viewed at: https://github.com/shanipr/dpdk-stable/commit/7be56900d8935e1bbd0146b3b4a1e886ddf79e37 Thanks. Shani --- >From 7be56900d8935e1bbd0146b3b4a1e886ddf79e37 Mon Sep 17 00:00:00 2001 From: Rongwei Liu Date: Wed, 5 Nov 2025 14:52:00 +0200 Subject: [PATCH] net/mlx5: fix meter mark allocation [ upstream commit 112facb17b0c0efd90e15501d0830a0f6af7b7c9 ] When failing to allocate a meter HW resource, PMD may use an invalid index to release the job. Fixes: 4359d9d1f76b ("net/mlx5: fix sync meter processing in HWS") Signed-off-by: Rongwei Liu Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow_hw.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index b66ed53141..a1d711caa5 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -1600,6 +1600,8 @@ flow_hw_meter_mark_compile(struct rte_eth_dev *dev, return -1; aso_mtr = flow_hw_meter_mark_alloc(dev, queue, action, job, true); if (!aso_mtr) { + if (queue == MLX5_HW_INV_QUEUE) + queue = CTRL_QUEUE_ID(priv); flow_hw_job_put(priv, job, queue); return -1; } -- 2.43.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-12-25 11:16:39.213386305 +0200 +++ 0057-net-mlx5-fix-meter-mark-allocation.patch 2025-12-25 11:16:35.944788000 +0200 @@ -1 +1 @@ -From 112facb17b0c0efd90e15501d0830a0f6af7b7c9 Mon Sep 17 00:00:00 2001 +From 7be56900d8935e1bbd0146b3b4a1e886ddf79e37 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 112facb17b0c0efd90e15501d0830a0f6af7b7c9 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index ff68483a40..cd11619b26 100644 +index b66ed53141..a1d711caa5 100644 @@ -22,3 +23,3 @@ -@@ -1934,6 +1934,8 @@ flow_hw_meter_mark_compile(struct rte_eth_dev *dev, - aso_mtr = flow_hw_meter_mark_alloc(dev, queue, action, job, - true, error); +@@ -1600,6 +1600,8 @@ flow_hw_meter_mark_compile(struct rte_eth_dev *dev, + return -1; + aso_mtr = flow_hw_meter_mark_alloc(dev, queue, action, job, true);