[dpdk-stable] patch 'net/mlx5: fix VLAN ID action offset' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.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 02/29/20. 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.

Thanks.

Luca Boccassi

---
>From b79bdedd756d22a51d8eab75462b954b9c731971 Mon Sep 17 00:00:00 2001
From: Suanming Mou <suanmingm at mellanox.com>
Date: Wed, 19 Feb 2020 16:15:17 +0200
Subject: [PATCH] net/mlx5: fix VLAN ID action offset

[ upstream commit bdcfb8a10bea8f56f5d89394ed1364735f1e3408 ]

Currently, the set VLAN ID header modify action has already got the
action pointer with offset from the header modify action array, but
the configuration saves the detail to the memory of action with the
offset again. It causes double offset to set the VLAN ID action to
the wrong place in the header modify array.

Remove the offset when get the action pointer to fix that issue.

Fixes: 5f163d520cff ("net/mlx5: support modify VLAN ID on existing VLAN header")

Signed-off-by: Suanming Mou <suanmingm at mellanox.com>
Acked-by: Dekel Peled <dekelp at mellanox.com>
Acked-by: Matan Azrad <matan at mellanox.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 f3d9ae5bc4..2b37c1c353 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -568,7 +568,7 @@ flow_dv_convert_action_modify_vlan_vid
 	const struct rte_flow_action_of_set_vlan_vid *conf =
 		(const struct rte_flow_action_of_set_vlan_vid *)(action->conf);
 	int i = resource->actions_num;
-	struct mlx5_modification_cmd *actions = &resource->actions[i];
+	struct mlx5_modification_cmd *actions = resource->actions;
 	struct field_modify_info *field = modify_vlan_out_first_vid;
 
 	if (i >= MLX5_MAX_MODIFY_NUM)
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-27 09:31:56.730966370 +0000
+++ 0028-net-mlx5-fix-VLAN-ID-action-offset.patch	2020-02-27 09:31:55.783946225 +0000
@@ -1,8 +1,10 @@
-From bdcfb8a10bea8f56f5d89394ed1364735f1e3408 Mon Sep 17 00:00:00 2001
+From b79bdedd756d22a51d8eab75462b954b9c731971 Mon Sep 17 00:00:00 2001
 From: Suanming Mou <suanmingm at mellanox.com>
 Date: Wed, 19 Feb 2020 16:15:17 +0200
 Subject: [PATCH] net/mlx5: fix VLAN ID action offset
 
+[ upstream commit bdcfb8a10bea8f56f5d89394ed1364735f1e3408 ]
+
 Currently, the set VLAN ID header modify action has already got the
 action pointer with offset from the header modify action array, but
 the configuration saves the detail to the memory of action with the
@@ -12,7 +14,6 @@
 Remove the offset when get the action pointer to fix that issue.
 
 Fixes: 5f163d520cff ("net/mlx5: support modify VLAN ID on existing VLAN header")
-Cc: stable at dpdk.org
 
 Signed-off-by: Suanming Mou <suanmingm at mellanox.com>
 Acked-by: Dekel Peled <dekelp at mellanox.com>
@@ -22,10 +23,10 @@
  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 467d1ce6b1..99d668f5d3 100644
+index f3d9ae5bc4..2b37c1c353 100644
 --- a/drivers/net/mlx5/mlx5_flow_dv.c
 +++ b/drivers/net/mlx5/mlx5_flow_dv.c
-@@ -573,7 +573,7 @@ flow_dv_convert_action_modify_vlan_vid
+@@ -568,7 +568,7 @@ flow_dv_convert_action_modify_vlan_vid
  	const struct rte_flow_action_of_set_vlan_vid *conf =
  		(const struct rte_flow_action_of_set_vlan_vid *)(action->conf);
  	int i = resource->actions_num;