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 0923A470E5 for ; Thu, 25 Dec 2025 10:24:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 15FF540670; Thu, 25 Dec 2025 10:23:54 +0100 (CET) Received: from BYAPR05CU005.outbound.protection.outlook.com (mail-westusazon11010019.outbound.protection.outlook.com [52.101.85.19]) by mails.dpdk.org (Postfix) with ESMTP id CB1AB40648 for ; Thu, 25 Dec 2025 10:23:52 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=LFfaJ46jp2x5FMofYgM9x1wSwt/ckD871KOQ1iwrdx2dDUXo9CJc3db1OLBsfmo1ExPc+M4dIBsRA1HXWWQqVTrbAE8P0PUxkHExZrbGgk0x40p5hnPSRLT9tusQcOuf4ksinKcSJdm9GyIoQqUZ0wngMxnezLM0zd62T70zNmyAeK6Vj3fW9SRyq6ECzOSq/7SEhWTTIOyxNGkQwDlMYCEbgdCQyPUqCvJnDFZSGpj3HpNbdcCIfcvYt/8KqDi/WuE5/nSwrAwQs+3IFkou4TszFI1VnOCYxj0YzmB5rHsyCEzFAgk48n6EVBoIcJuI7q1Apr0UbYJV9Ot0UgESqQ== 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=UPdt4ngsbh5EMd9vYqvhyj1rZEt1iZS1iGVWUIbsqms=; b=sScfnPPVQm1FllOPPkc8ERc/ZuiHGUx80/CxYj9FL35qFzFXd0JBbJQIXms6l5lWbTDKf2R2nYDf0y50/80br45vQCXDa9pn7Zm/HQCLdO8TFwzS2zrKVtimOoG0TDzMLO6ghrRbt+cCpAoSYSUNtVKOtWpOAQdIJoRfh0EjAhipop9Eao0jj7KNDYZtka/HGdQHxKiL0vE8YIAjnY1ygiWHGu6z/f9GMSl+dV78GJu/WnYLcU0XXQZ19TfDCtaPggdXwBzWtPsZ89RxzctokN6klBziwjkGdvYXVrBYzQOQJTOrg6wTwMKd+NLYVLFm8d9Q01VzHuKt7JB+zxXkWQ== 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=UPdt4ngsbh5EMd9vYqvhyj1rZEt1iZS1iGVWUIbsqms=; b=j84jSxABO7dqjSSI4V3noTa6qjt/+JsyVVqgVcxHz7Lwiv+vh1E+FTm/oYMyc6nO++3kQxAx5up0Bq5mxqVLTi/wfXV9eNCB9NJtSr9HTc0GfiW3kHqpZmrAwaU0UypA7/btBEoBT4pxgZsEQRJEzSmtdLnn6/XfOiEuXx+zCy2IcF4eJ69thGYp+OxeXLyCkEoB1Vy0bPxu13br74k+Bh2V0q8CW3+jnklg8tf4ZpNtDJKzzf03xm6+84WFr5yp5pJLXE6hObw8l+FNLYRrJ4j8KV8wKGoHqQov6kLUYNkuG+IwzTQSeXKF4cQELzodo3+AGS4umsF2M/+8ZQAb9A== Received: from CH2PR20CA0006.namprd20.prod.outlook.com (2603:10b6:610:58::16) by MW4PR12MB7142.namprd12.prod.outlook.com (2603:10b6:303:220::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.12; Thu, 25 Dec 2025 09:23:47 +0000 Received: from CH2PEPF00000140.namprd02.prod.outlook.com (2603:10b6:610:58:cafe::9d) by CH2PR20CA0006.outlook.office365.com (2603:10b6:610:58::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9456.11 via Frontend Transport; Thu, 25 Dec 2025 09:23:47 +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 CH2PEPF00000140.mail.protection.outlook.com (10.167.244.72) 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:47 +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:37 -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:36 -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:35 -0800 From: Shani Peretz To: Rongwei Liu CC: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix indirect meter index leak' has been queued to stable release 23.11.6 Date: Thu, 25 Dec 2025 11:18:19 +0200 Message-ID: <20251225091938.345892-58-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: CH2PEPF00000140:EE_|MW4PR12MB7142:EE_ X-MS-Office365-Filtering-Correlation-Id: edd8b0c0-967e-4319-b87d-08de43974ec6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|36860700013|1800799024|376014|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?MlrMFuWeAumsYbIWeRG2Jec4j9sTWM2YXc0sD7xQ2uUM77LwEIn7+gePvzI1?= =?us-ascii?Q?ipfv72hZOhecRPPj4CVLm4ZYUj4z/AMg5SA+3NWG3zv04U12eG+burxQbwC2?= =?us-ascii?Q?Gf4rd2jLnAunO+VGONRaQAVztDZVJBaa6owOSjdJE71nhdXAmJz1HdFWAEGm?= =?us-ascii?Q?s9726tN7sOqUfLRDPvkZM3bkI33FI+vdQD/zgtIDB25gNlhfNF9SGYgpsWA4?= =?us-ascii?Q?povboneSrtsZnJoeduLi2yZFtw6toKdvb2aV+/naNBUaiOjpPkZDs2Yqz1XW?= =?us-ascii?Q?njC3Quk0hgovtLytLb1MrUikrE4HsoUa2VZi3o/lX4P+9D8vhNzDSWaeVbiL?= =?us-ascii?Q?CZiVkC1Vo4rR2t9h/gIgJpIMHOVx2ZoYts1icDzsAgo5RaISr+kU6s4rkmoi?= =?us-ascii?Q?G3IQ1zVa/iuQKule9T49YSvbhVyyr+VXQpqYaeVzI0dD1i5wQsBbDnMUAS3P?= =?us-ascii?Q?wUnpUsmdksZ9uEJam+q+Z75KU/VyK94ejbqgDc6b/hQTBjhBssiV8OOP3S69?= =?us-ascii?Q?V7tCdU3Eonsn5XpWK8w58BSoWFiIkMhovRz13ssynYlHPcs1bh+hgGcxf+zW?= =?us-ascii?Q?oA341RavY/O7KZjhOM8tK2/TPC7nh2HGNlX4Y/GGzi3aUXSKa3HSzPtsJCN2?= =?us-ascii?Q?TUPfGouR09osMHLlIrnLAVANzwE3mPpAh1M7wTHYWzbwCJbsqTCnhW21wO1U?= =?us-ascii?Q?OqZdQy9t+S2/Un1u3iRbrru5eS3PRgg1IBBU7m9FD855Yea90YGf4oSs4ONM?= =?us-ascii?Q?gOa3rBHs8143042VlOHfex+KG7cye4V9JXOS+znpwFaThUu3f9TLX1v7UQ4S?= =?us-ascii?Q?4RY7ZzhWptkHvUXYgvBCJz3GaWMXxVVNei+FUiAfUJQcvdHQrvkHYM4L+p1+?= =?us-ascii?Q?rMV5NXIq3zwZMtzkfbrHcy1WVkVPMta3M4mu6A6OX/ZIoXsUmvT1joWpWQlC?= =?us-ascii?Q?JzgXBcSLS72MK4xN+Fi0aMjbrdc/vtgbGqApW94SsYjhExLjDcxIXo1dL3ft?= =?us-ascii?Q?mSF9A2GveNzOqbEgSOFQ5+rwnA41uUOsO9rLGhFGJFVhdutN88A10cHLgmJW?= =?us-ascii?Q?J0dwIrf2guHCnAI/KZ2796fnCK0WHVS4c7T+fFldCiWtrAmTpCWHQ6fEWo6j?= =?us-ascii?Q?fMrKV5Vw5m4fIY/XlM6yCj6I9psVLetnwG2pyZLFbJ/TGvsU+NSbA/eqDoLK?= =?us-ascii?Q?jzyw23tXuOWZC8W6AuKOGztRdGymve/BcXVEtwdQkxDkIZktA6u8E8zOEdKf?= =?us-ascii?Q?BYiGuY6expEoB7e41iIlQnO7O8vO/+H/t6gmLHQZNrwyMTF37VWANciTJ9We?= =?us-ascii?Q?4h43K0uum4zZzhJtMAenjTYPAuHBW4Ag6cp8fAc9RVMlD8hL/ewge/UBYO7b?= =?us-ascii?Q?pLiezDaEgtT5v7wu8v5ceQnpc6R0aT1osa0xG/3KCp3c/k0xBOmWJI7NoHln?= =?us-ascii?Q?jMq11DgvBfZZI+chAyTcjeQyHbwfsC2gF4mLrwf0D2k0mGUB7r5HzHhtuUDU?= =?us-ascii?Q?SJ6RlJ5N3aNQ4QyvVxKGjB/GoSa432oDCjhehH3PNNwBp+AiKVX9lPBQ2Y5g?= =?us-ascii?Q?XTY0vGAbCefgAd2iFvI=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)(82310400026)(36860700013)(1800799024)(376014)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Dec 2025 09:23:47.2264 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: edd8b0c0-967e-4319-b87d-08de43974ec6 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: CH2PEPF00000140.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7142 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/82e034edaff9d145e7ae11454b401c4771bec011 Thanks. Shani --- >From 82e034edaff9d145e7ae11454b401c4771bec011 Mon Sep 17 00:00:00 2001 From: Rongwei Liu Date: Wed, 5 Nov 2025 14:54:33 +0200 Subject: [PATCH] net/mlx5: fix indirect meter index leak [ upstream commit e56ebf25074280479141eac8050e1f40a69bdbf9 ] When destroying the meter_mark indirect action, PMD didn't recycle the ipool resources. Fixes: 48fbb0e93d06 ("net/mlx5: support flow meter mark indirect action with HWS") Signed-off-by: Rongwei Liu Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow_hw.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index a1d711caa5..320aa479f6 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -10549,13 +10549,16 @@ flow_hw_action_handle_destroy(struct rte_eth_dev *dev, uint32_t queue, break; } /* Wait for ASO object completion. */ - if (queue == MLX5_HW_INV_QUEUE && - mlx5_aso_mtr_wait(priv, aso_mtr, true)) { - ret = -EINVAL; - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_UNSPECIFIED, - NULL, "Unable to wait for ASO meter CQE"); - break; + if (queue == MLX5_HW_INV_QUEUE) { + if (mlx5_aso_mtr_wait(priv, aso_mtr, true)) { + ret = -EINVAL; + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, "Unable to wait for ASO meter CQE"); + } + mlx5_ipool_free(pool->idx_pool, idx); + if (ret < 0) + break; } aso = true; break; -- 2.43.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-12-25 11:16:39.270219493 +0200 +++ 0058-net-mlx5-fix-indirect-meter-index-leak.patch 2025-12-25 11:16:35.962902000 +0200 @@ -1 +1 @@ -From e56ebf25074280479141eac8050e1f40a69bdbf9 Mon Sep 17 00:00:00 2001 +From 82e034edaff9d145e7ae11454b401c4771bec011 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e56ebf25074280479141eac8050e1f40a69bdbf9 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index cd11619b26..1755f2cffc 100644 +index a1d711caa5..320aa479f6 100644 @@ -22 +23 @@ -@@ -13013,13 +13013,16 @@ flow_hw_action_handle_destroy(struct rte_eth_dev *dev, uint32_t queue, +@@ -10549,13 +10549,16 @@ flow_hw_action_handle_destroy(struct rte_eth_dev *dev, uint32_t queue,