patch 'net/mlx5/hws: fix VLAN inner type' has been queued to stable release 22.11.5

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 22.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 03/16/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://github.com/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/38b2735798d9ced9adddfac036b01a2d246560b8

Thanks.

Luca Boccassi

---
>From 38b2735798d9ced9adddfac036b01a2d246560b8 Mon Sep 17 00:00:00 2001
From: Hamdan Igbaria <hamdani at nvidia.com>
Date: Wed, 21 Feb 2024 08:28:11 +0200
Subject: [PATCH] net/mlx5/hws: fix VLAN inner type

[ upstream commit d1d350d868439357e750297d5719670f706facc2 ]

Set the correct VLAN inner_type value, till today the
once the VLAN inner_type field was set, an incorrect
value was taken instead of the inner_type field.

Fixes: c55c2bf35333 ("net/mlx5/hws: add definer layer")

Signed-off-by: Hamdan Igbaria <hamdani at nvidia.com>
Reviewed-by: Erez Shitrit <erezsh at nvidia.com>
Acked-by: Suanming Mou <suanmingm at nvidia.com>
---
 drivers/net/mlx5/hws/mlx5dr_definer.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c
index 52f615d842..b3d8d9504e 100644
--- a/drivers/net/mlx5/hws/mlx5dr_definer.c
+++ b/drivers/net/mlx5/hws/mlx5dr_definer.c
@@ -164,7 +164,8 @@ struct mlx5dr_definer_conv_data {
 	X(SET_BE32,	gre_opt_seq,		v->sequence.sequence,	rte_flow_item_gre_opt) \
 	X(SET_BE16,	gre_opt_checksum,	v->checksum_rsvd.checksum,	rte_flow_item_gre_opt) \
 	X(SET,		meter_color,		rte_col_2_mlx5_col(v->color),	rte_flow_item_meter_color) \
-	X(SET,		cvlan,			STE_CVLAN,		rte_flow_item_vlan)
+	X(SET,		cvlan,			STE_CVLAN,		rte_flow_item_vlan) \
+	X(SET_BE16,	inner_type,		v->inner_type,		rte_flow_item_vlan)
 
 /* Item set function format */
 #define X(set_type, func_name, value, item_type) \
@@ -513,7 +514,7 @@ mlx5dr_definer_conv_item_vlan(struct mlx5dr_definer_conv_data *cd,
 	if (m->inner_type) {
 		fc = &cd->fc[DR_CALC_FNAME(ETH_TYPE, inner)];
 		fc->item_idx = item_idx;
-		fc->tag_set = &mlx5dr_definer_eth_type_set;
+		fc->tag_set = &mlx5dr_definer_inner_type_set;
 		DR_CALC_SET(fc, eth_l2, l3_ethertype, inner);
 	}
 
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-03-14 00:09:22.665845555 +0000
+++ 0043-net-mlx5-hws-fix-VLAN-inner-type.patch	2024-03-14 00:09:20.645615856 +0000
@@ -1 +1 @@
-From d1d350d868439357e750297d5719670f706facc2 Mon Sep 17 00:00:00 2001
+From 38b2735798d9ced9adddfac036b01a2d246560b8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d1d350d868439357e750297d5719670f706facc2 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -17,2 +18,2 @@
- drivers/net/mlx5/hws/mlx5dr_definer.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ drivers/net/mlx5/hws/mlx5dr_definer.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
@@ -21 +22 @@
-index c1508e6b53..e036aca781 100644
+index 52f615d842..b3d8d9504e 100644
@@ -24,5 +25,7 @@
-@@ -224,6 +224,7 @@ struct mlx5dr_definer_conv_data {
- 	X(SET,		random_number,		v->value,		rte_flow_item_random) \
- 	X(SET,		ib_l4_bth_a,		v->hdr.a,		rte_flow_item_ib_bth) \
- 	X(SET,		cvlan,			STE_CVLAN,		rte_flow_item_vlan) \
-+	X(SET_BE16,	inner_type,		v->inner_type,		rte_flow_item_vlan) \
+@@ -164,7 +164,8 @@ struct mlx5dr_definer_conv_data {
+ 	X(SET_BE32,	gre_opt_seq,		v->sequence.sequence,	rte_flow_item_gre_opt) \
+ 	X(SET_BE16,	gre_opt_checksum,	v->checksum_rsvd.checksum,	rte_flow_item_gre_opt) \
+ 	X(SET,		meter_color,		rte_col_2_mlx5_col(v->color),	rte_flow_item_meter_color) \
+-	X(SET,		cvlan,			STE_CVLAN,		rte_flow_item_vlan)
++	X(SET,		cvlan,			STE_CVLAN,		rte_flow_item_vlan) \
++	X(SET_BE16,	inner_type,		v->inner_type,		rte_flow_item_vlan)
@@ -32,2 +35,2 @@
-@@ -990,7 +991,7 @@ mlx5dr_definer_conv_item_vlan(struct mlx5dr_definer_conv_data *cd,
- 	if (m->hdr.eth_proto) {
+@@ -513,7 +514,7 @@ mlx5dr_definer_conv_item_vlan(struct mlx5dr_definer_conv_data *cd,
+ 	if (m->inner_type) {