patch 'net/mlx5: fix masked indirect age action validation' has been queued to stable release 23.11.5

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/10/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=4e2077a1a72e8fe2a5d56b06aa15800e45b75b71

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 4e2077a1a72e8fe2a5d56b06aa15800e45b75b71 Mon Sep 17 00:00:00 2001
From: Dariusz Sosnowski <dsosnowski at nvidia.com>
Date: Tue, 1 Jul 2025 12:32:53 +0200
Subject: [PATCH] net/mlx5: fix masked indirect age action validation
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 6ed1ce029d6bd89a47968cd92d99cdf7ece8ac96 ]

Masked indirect age flow action is not supported in
actions templates.
Up to this patch, this case was checked only through
debug assertion. As a side effect, in a build without assertions,
this lead to a segfault on the attempt to create
a table using actions template with masked indirect age action.
To prevent the segfault, this patch adds relevant validation
to actions template creation and removes the debug assertion
which now becomes redundant.

Fixes: 04a4de756e14 ("net/mlx5: support flow age action with HWS")
Cc: stable at dpdk.org

Signed-off-by: Dariusz Sosnowski <dsosnowski at nvidia.com>
Acked-by: Bing Zhao <bingz at nvidia.com>
---
 drivers/net/mlx5/mlx5_flow_hw.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index 37011b9950..540828008b 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -1042,10 +1042,6 @@ flow_hw_shared_action_translate(struct rte_eth_dev *dev,
 			return -1;
 		}
 		break;
-	case MLX5_INDIRECT_ACTION_TYPE_AGE:
-		/* Not supported, prevent by validate function. */
-		MLX5_ASSERT(0);
-		break;
 	case MLX5_INDIRECT_ACTION_TYPE_CT:
 		if (flow_hw_ct_compile(dev, MLX5_HW_INV_QUEUE,
 				       idx, &acts->rule_acts[action_dst])) {
@@ -5351,6 +5347,10 @@ flow_hw_validate_action_indirect(struct rte_eth_dev *dev,
 		*action_flags |= MLX5_FLOW_ACTION_INDIRECT_COUNT;
 		break;
 	case RTE_FLOW_ACTION_TYPE_AGE:
+		if (action->conf && mask->conf)
+			return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION,
+						  action,
+						  "Fixed indirect age action is not supported");
 		ret = flow_hw_validate_action_age(dev, action, *action_flags,
 						  *fixed_cnt, error);
 		if (ret < 0)
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-07-30 22:50:04.413037852 +0800
+++ 0021-net-mlx5-fix-masked-indirect-age-action-validation.patch	2025-07-30 22:50:03.076763670 +0800
@@ -1 +1 @@
-From 6ed1ce029d6bd89a47968cd92d99cdf7ece8ac96 Mon Sep 17 00:00:00 2001
+From 4e2077a1a72e8fe2a5d56b06aa15800e45b75b71 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 6ed1ce029d6bd89a47968cd92d99cdf7ece8ac96 ]
@@ -26 +29 @@
-index 4ecc2bacfc..6dc16f80d3 100644
+index 37011b9950..540828008b 100644
@@ -29 +32 @@
-@@ -1351,10 +1351,6 @@ flow_hw_shared_action_translate(struct rte_eth_dev *dev,
+@@ -1042,10 +1042,6 @@ flow_hw_shared_action_translate(struct rte_eth_dev *dev,
@@ -40 +43 @@
-@@ -6405,6 +6401,10 @@ flow_hw_validate_action_indirect(struct rte_eth_dev *dev,
+@@ -5351,6 +5347,10 @@ flow_hw_validate_action_indirect(struct rte_eth_dev *dev,