patch 'net/mlx5: fix flow tag modification' 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 03/31/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=d25716a8a02dc5568f26c3cdae8705c447d12bff

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From d25716a8a02dc5568f26c3cdae8705c447d12bff Mon Sep 17 00:00:00 2001
From: Michael Baum <michaelba at nvidia.com>
Date: Mon, 27 Nov 2023 18:01:02 +0200
Subject: [PATCH] net/mlx5: fix flow tag modification
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit b9427fe259ac687c3a29f5c13b63945c16a283db ]

When MPLS modification support was added [1], the "tag_index" field was
added into "rte_flow_action_modify_data" structure.
As part of this change, the "RTE_FLOW_FIELD_TAG" type moved to use it
for tag array instead of using "level" field.
Using "level" is still supported for backwards compatibility when
"tag_index" field is zero.

The "mlx5_flow_field_id_to_modify_info()" function calls
"flow_hw_get_reg_id()" function with "level" without checking first
whether "tag_index" field is valid.

This patch calls first to "flow_tag_index_get()" function to get the
index before sending it to "flow_hw_get_reg_id()" function.

[1] commit c23626f27b09 ("ethdev: add MPLS header modification")

Fixes: 04e740e69512 ("net/mlx5: separate registers usage per port")

Signed-off-by: Michael Baum <michaelba at nvidia.com>
Acked-by: Ori Kam <orika at nvidia.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 5d0cb4278b..cea94e889d 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -1925,7 +1925,7 @@ mlx5_flow_field_id_to_modify_info
 			if (priv->sh->config.dv_flow_en == 2)
 				reg = flow_hw_get_reg_id(dev,
 							 RTE_FLOW_ITEM_TYPE_TAG,
-							 data->level);
+							 tag_index);
 			else
 				reg = mlx5_flow_get_reg_id(dev, MLX5_APP_TAG,
 							   tag_index, error);
--
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-03-05 17:39:34.753047825 +0800
+++ 0126-net-mlx5-fix-flow-tag-modification.patch	2024-03-05 17:39:31.013566501 +0800
@@ -1 +1 @@
-From b9427fe259ac687c3a29f5c13b63945c16a283db Mon Sep 17 00:00:00 2001
+From d25716a8a02dc5568f26c3cdae8705c447d12bff Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit b9427fe259ac687c3a29f5c13b63945c16a283db ]
@@ -23 +25,0 @@
-Cc: stable at dpdk.org
@@ -32 +34 @@
-index f881dae6e8..60fbdd96e6 100644
+index 5d0cb4278b..cea94e889d 100644