patch 'net/mlx5: fix indirect meter index leak' has been queued to stable release 22.11.11

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 22.11.11

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/14/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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/9705d89465ffc4873ddf53988dc85395004e1c42

Thanks.

Luca Boccassi

---
>From 9705d89465ffc4873ddf53988dc85395004e1c42 Mon Sep 17 00:00:00 2001
From: Rongwei Liu <rongweil at nvidia.com>
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 <rongweil at nvidia.com>
Acked-by: Dariusz Sosnowski <dsosnowski at nvidia.com>
---
 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 d78520710b..b54df8f432 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -8270,13 +8270,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->sh, MLX5_HW_INV_QUEUE, aso_mtr)) {
-			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->sh, MLX5_HW_INV_QUEUE, aso_mtr)) {
+				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;
 		}
 		if (!job)
 			mlx5_ipool_free(pool->idx_pool, idx);
-- 
2.47.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-11-12 16:20:42.498052534 +0000
+++ 0040-net-mlx5-fix-indirect-meter-index-leak.patch	2025-11-12 16:20:40.999718720 +0000
@@ -1 +1 @@
-From e56ebf25074280479141eac8050e1f40a69bdbf9 Mon Sep 17 00:00:00 2001
+From 9705d89465ffc4873ddf53988dc85395004e1c42 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e56ebf25074280479141eac8050e1f40a69bdbf9 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index cd11619b26..1755f2cffc 100644
+index d78520710b..b54df8f432 100644
@@ -22 +23 @@
-@@ -13013,13 +13013,16 @@ flow_hw_action_handle_destroy(struct rte_eth_dev *dev, uint32_t queue,
+@@ -8270,13 +8270,16 @@ flow_hw_action_handle_destroy(struct rte_eth_dev *dev, uint32_t queue,
@@ -27 +28 @@
--		    mlx5_aso_mtr_wait(priv, aso_mtr, true)) {
+-		    mlx5_aso_mtr_wait(priv->sh, MLX5_HW_INV_QUEUE, aso_mtr)) {
@@ -34 +35 @@
-+			if (mlx5_aso_mtr_wait(priv, aso_mtr, true)) {
++			if (mlx5_aso_mtr_wait(priv->sh, MLX5_HW_INV_QUEUE, aso_mtr)) {
@@ -44,2 +45,2 @@
- 		aso = true;
- 		break;
+ 		if (!job)
+ 			mlx5_ipool_free(pool->idx_pool, idx);