patch 'net/mlx5: fix mark action validation in FDB mode' has been queued to stable release 24.11.2

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to stable release 24.11.2

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

Thanks.

Kevin

---
From 80d22471aebcd9e04fc1699d66567890a5ff4c37 Mon Sep 17 00:00:00 2001
From: Gregory Etelson <getelson@nvidia.com>
Date: Tue, 11 Mar 2025 14:46:35 +0200
Subject: [PATCH] net/mlx5: fix mark action validation in FDB mode

[ upstream commit 3e83c4821d57874b2677d7344bcc26f587ce5ba2 ]

The MARK action is supported in FDB SWS mode, but it
was not supported in the early FDB HWS implementations.

The current MARK action validation reflects the original
HWS functionality.

Recent MLX5 FW supports the MARK flow action in FDB mode.
The patch clears the MARK action for both SWS FDB and HWS FDB.

Fixes: d6dc072aeb12 ("net/mlx5: validate flow actions in table creation")

Signed-off-by: Gregory Etelson <getelson@nvidia.com>
Acked-by: Dariusz Sosnowski <dsosnowski@nvidia.com>
---
 drivers/net/mlx5/mlx5_flow.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 9678c94ff3..e909a6ab63 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -1945,5 +1945,5 @@ mlx5_flow_validate_action_flag(uint64_t action_flags,
  */
 int
-mlx5_flow_validate_action_mark(struct rte_eth_dev *dev,
+mlx5_flow_validate_action_mark(__rte_unused struct rte_eth_dev *dev,
 			       const struct rte_flow_action *action,
 			       uint64_t action_flags,
@@ -1978,8 +1978,4 @@ mlx5_flow_validate_action_mark(struct rte_eth_dev *dev,
 					  "mark action not supported for "
 					  "egress");
-	if (attr->transfer && mlx5_hws_active(dev))
-		return rte_flow_error_set(error, ENOTSUP,
-					  RTE_FLOW_ERROR_TYPE_ATTR_EGRESS, NULL,
-					  "non-template mark action not supported for transfer");
 	return 0;
 }
-- 
2.48.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-03-24 16:15:15.521070878 +0000
+++ 0019-net-mlx5-fix-mark-action-validation-in-FDB-mode.patch	2025-03-24 16:15:14.822735794 +0000
@@ -1 +1 @@
-From 3e83c4821d57874b2677d7344bcc26f587ce5ba2 Mon Sep 17 00:00:00 2001
+From 80d22471aebcd9e04fc1699d66567890a5ff4c37 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3e83c4821d57874b2677d7344bcc26f587ce5ba2 ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index 6169ebc13f..e2f4bd8cef 100644
+index 9678c94ff3..e909a6ab63 100644
@@ -38 +39 @@
--	if (attr->transfer && !mlx5_hws_active(dev))
+-	if (attr->transfer && mlx5_hws_active(dev))
@@ -40 +41 @@
--					  RTE_FLOW_ERROR_TYPE_ATTR_TRANSFER, NULL,
+-					  RTE_FLOW_ERROR_TYPE_ATTR_EGRESS, NULL,