patch 'net/mlx5: fix non-template flow action validation' has been queued to stable release 23.11.3

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.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 12/10/24. 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=f782c65a9f7bc4797770b9688bb9ddcac21cf3bf

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From f782c65a9f7bc4797770b9688bb9ddcac21cf3bf Mon Sep 17 00:00:00 2001
From: Gregory Etelson <getelson at nvidia.com>
Date: Sun, 27 Oct 2024 16:36:59 +0200
Subject: [PATCH] net/mlx5: fix non-template flow action validation
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit ee76b173b2e93ab4a0c9b4153191965259dae972 ]

Remove HWS actions template validation for non-template API setup.
The non-template API does not have action masks, and action templates
are created internally by the PMD. The existing validation was
incorrectly checking action parameters in non-existent masks.

This change ensures that the HWS actions template validation is only
performed for the template API, where action masks are available and
the validation is meaningful.

Fixes: 04a4de756e14 ("net/mlx5: support flow age action with HWS")

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

diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index ca2611942e..5c611b03b9 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -6526,8 +6526,7 @@ flow_hw_actions_template_create(struct rte_eth_dev *dev,
 	uint32_t expand_mf_num = 0;
 	uint16_t src_off[MLX5_HW_MAX_ACTS] = {0, };

-	if (mlx5_flow_hw_actions_validate(dev, attr, actions, masks,
-					  &action_flags, error))
+	if (mlx5_flow_hw_actions_validate(dev, attr, actions, masks, &action_flags, error))
 		return NULL;
 	for (i = 0; ra[i].type != RTE_FLOW_ACTION_TYPE_END; ++i) {
 		switch (ra[i].type) {
--
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-12-06 23:26:44.719138519 +0800
+++ 0017-net-mlx5-fix-non-template-flow-action-validation.patch	2024-12-06 23:26:43.883044829 +0800
@@ -1 +1 @@
-From ee76b173b2e93ab4a0c9b4153191965259dae972 Mon Sep 17 00:00:00 2001
+From f782c65a9f7bc4797770b9688bb9ddcac21cf3bf Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit ee76b173b2e93ab4a0c9b4153191965259dae972 ]
@@ -16 +18,0 @@
-Cc: stable at dpdk.org
@@ -21,2 +23,2 @@
- drivers/net/mlx5/mlx5_flow_hw.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ drivers/net/mlx5/mlx5_flow_hw.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
@@ -25 +27 @@
-index 6081ebc7e2..94c9ecd165 100644
+index ca2611942e..5c611b03b9 100644
@@ -28,3 +30,3 @@
-@@ -7873,8 +7873,8 @@ __flow_hw_actions_template_create(struct rte_eth_dev *dev,
- 	uint32_t tmpl_flags = 0;
- 	int ret;
+@@ -6526,8 +6526,7 @@ flow_hw_actions_template_create(struct rte_eth_dev *dev,
+ 	uint32_t expand_mf_num = 0;
+ 	uint16_t src_off[MLX5_HW_MAX_ACTS] = {0, };
@@ -34,2 +36 @@
-+	if (!nt_mode && mlx5_flow_hw_actions_validate(dev, attr, actions, masks,
-+						      &action_flags, error))
++	if (mlx5_flow_hw_actions_validate(dev, attr, actions, masks, &action_flags, error))