patch 'net/mlx5: fix mark action with shared Rx queue' has been queued to stable release 24.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 24.11.3

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

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/312f28ad91235b287288066ba5afc78d166f14fd

Thanks.

Kevin

---
>From 312f28ad91235b287288066ba5afc78d166f14fd Mon Sep 17 00:00:00 2001
From: Gregory Etelson <getelson at nvidia.com>
Date: Wed, 14 May 2025 10:50:18 +0300
Subject: [PATCH] net/mlx5: fix mark action with shared Rx queue

[ upstream commit 28eeca69eb1d9bebb0105e47c82885b0a8403654 ]

Fix the assignment of the mark_flag in the shared Rx queue setup
in mlx5_flow_rxq_dynf_set(). Previously, mark_flag was not set
correctly in all cases, which could lead to incorrect flow mark
action behavior when configuring shared Rx queues.

Fixes: 2d8763432add ("net/mlx5: fix shared Rx queue data access race")

Signed-off-by: Gregory Etelson <getelson at nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
---
 drivers/net/mlx5/mlx5_flow.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 61833c0dcb..f83ae1883d 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -1866,6 +1866,6 @@ mlx5_flow_rxq_dynf_set(struct rte_eth_dev *dev)
 				data->flow_meta_port_mask = priv->sh->dv_meta_mask;
 			}
-			data->mark_flag = mark_flag;
 		}
+		data->mark_flag = mark_flag;
 	}
 }
-- 
2.50.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-07-18 20:29:12.305498935 +0100
+++ 0034-net-mlx5-fix-mark-action-with-shared-Rx-queue.patch	2025-07-18 20:29:10.904907251 +0100
@@ -1 +1 @@
-From 28eeca69eb1d9bebb0105e47c82885b0a8403654 Mon Sep 17 00:00:00 2001
+From 312f28ad91235b287288066ba5afc78d166f14fd Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 28eeca69eb1d9bebb0105e47c82885b0a8403654 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 8696cc4e95..3d49a2d833 100644
+index 61833c0dcb..f83ae1883d 100644
@@ -24 +25 @@
-@@ -1867,6 +1867,6 @@ mlx5_flow_rxq_dynf_set(struct rte_eth_dev *dev)
+@@ -1866,6 +1866,6 @@ mlx5_flow_rxq_dynf_set(struct rte_eth_dev *dev)