patch 'net/mlx5: fix non-masked indirect list meter translation' has been queued to stable release 23.11.1

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.11.1

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

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From af41defcf7a2252f8383ef3ca2643d6937fe7787 Mon Sep 17 00:00:00 2001
From: Gregory Etelson <getelson at nvidia.com>
Date: Thu, 29 Feb 2024 13:31:19 +0200
Subject: [PATCH] net/mlx5: fix non-masked indirect list meter translation
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 4c041e2f0595e4a4e176a6d1f1a00c30debbc1fe ]

Template table reuses DR5 action handle for non-masked indirect
actions. Flow rule must explicitly translate non-masked indirect
action and update DR5 handle with the rule indirect object.

Current PMD assumed DR5 handle of non-masked indirect action was
always NULL before the action translation.

The patch always translates non-masked indirect list meter object.

Fixes: e26f50adbf38 ("net/mlx5: support indirect list meter mark action")

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

diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index 6d0f1beeec..7ed0c0ac9b 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -1728,15 +1728,9 @@ flow_hw_translate_indirect_meter(struct rte_eth_dev *dev,
 	const struct rte_flow_indirect_update_flow_meter_mark **flow_conf =
 		(typeof(flow_conf))action_conf->conf;
 
-	/*
-	 * Masked indirect handle set dr5 action during template table
-	 * translation.
-	 */
-	if (!dr_rule->action) {
-		ret = flow_dr_set_meter(priv, dr_rule, action_conf);
-		if (ret)
-			return ret;
-	}
+	ret = flow_dr_set_meter(priv, dr_rule, action_conf);
+	if (ret)
+		return ret;
 	if (!act_data->shared_meter.conf_masked) {
 		if (flow_conf && flow_conf[0] && flow_conf[0]->init_color < RTE_COLORS)
 			flow_dr_mtr_flow_color(dr_rule, flow_conf[0]->init_color);
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-13 20:43:07.916616519 +0800
+++ 0095-net-mlx5-fix-non-masked-indirect-list-meter-translat.patch	2024-04-13 20:43:05.067753840 +0800
@@ -1 +1 @@
-From 4c041e2f0595e4a4e176a6d1f1a00c30debbc1fe Mon Sep 17 00:00:00 2001
+From af41defcf7a2252f8383ef3ca2643d6937fe7787 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 4c041e2f0595e4a4e176a6d1f1a00c30debbc1fe ]
@@ -16 +18,0 @@
-Cc: stable at dpdk.org
@@ -26 +28 @@
-index b9ba05f695..a4e204695e 100644
+index 6d0f1beeec..7ed0c0ac9b 100644
@@ -29 +31 @@
-@@ -1838,15 +1838,9 @@ flow_hw_translate_indirect_meter(struct rte_eth_dev *dev,
+@@ -1728,15 +1728,9 @@ flow_hw_translate_indirect_meter(struct rte_eth_dev *dev,