patch 'net/mlx5: fix meter mark allocation' has been queued to stable release 23.11.6

[Shani Peretz]

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 <rongweil at nvidia.com>
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 <rongweil at nvidia.com>
Acked-by: Dariusz Sosnowski <dsosnowski at nvidia.com>
---
 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 at 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);