[dpdk-stable] patch 'net/mlx5: allow push VLAN without VID' 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/13/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 c4a6f4dae99202dd1d7ada3646799c1d45985b8c Mon Sep 17 00:00:00 2001
From: Dekel Peled <dekelp at mellanox.com>
Date: Wed, 22 Jan 2020 16:27:16 +0200
Subject: [PATCH] net/mlx5: allow push VLAN without VID

[ upstream commit 5507cb79279d03d196133bcc26feace49e8e1fab ]

Currently the push VLAN action requires a VID value, either from
existing VLAN item, or from following 'set VLAN vid' action.

This patch removes this limitation, allowing a push VLAN action with
vid value 0.

Fixes: b8c0372bc5ac ("net/mlx5: fix set VLAN ID/PCP in new header")

Signed-off-by: Dekel Peled <dekelp at mellanox.com>
Acked-by: Ori Kam <orika at mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 155e12b534..7aedfa903b 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -1605,7 +1605,7 @@ flow_dev_get_vlan_info_from_items(const struct rte_flow_item *items,
  */
 static int
 flow_dv_validate_action_push_vlan(uint64_t action_flags,
-				  uint64_t item_flags,
+				  uint64_t item_flags __rte_unused,
 				  const struct rte_flow_action *action,
 				  const struct rte_flow_attr *attr,
 				  struct rte_flow_error *error)
@@ -1622,14 +1622,6 @@ flow_dv_validate_action_push_vlan(uint64_t action_flags,
 					  RTE_FLOW_ERROR_TYPE_ACTION, action,
 					  "no support for multiple VLAN "
 					  "actions");
-	if (!mlx5_flow_find_action
-			(action + 1, RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID) &&
-	    !(item_flags & MLX5_FLOW_LAYER_OUTER_VLAN))
-		return rte_flow_error_set(error, ENOTSUP,
-				RTE_FLOW_ERROR_TYPE_ACTION, action,
-				"push VLAN needs to match on VLAN in order to "
-				"get VLAN VID information because there is "
-				"no followed set VLAN VID action");
 	if (action_flags & MLX5_FLOW_ACTION_PORT_ID)
 		return rte_flow_error_set(error, EINVAL,
 					  RTE_FLOW_ERROR_TYPE_ACTION, action,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-11 11:17:43.744873421 +0000
+++ 0147-net-mlx5-allow-push-VLAN-without-VID.patch	2020-02-11 11:17:38.680006583 +0000
@@ -1,8 +1,10 @@
-From 5507cb79279d03d196133bcc26feace49e8e1fab Mon Sep 17 00:00:00 2001
+From c4a6f4dae99202dd1d7ada3646799c1d45985b8c Mon Sep 17 00:00:00 2001
 From: Dekel Peled <dekelp at mellanox.com>
 Date: Wed, 22 Jan 2020 16:27:16 +0200
 Subject: [PATCH] net/mlx5: allow push VLAN without VID
 
+[ upstream commit 5507cb79279d03d196133bcc26feace49e8e1fab ]
+
 Currently the push VLAN action requires a VID value, either from
 existing VLAN item, or from following 'set VLAN vid' action.
 
@@ -10,7 +12,6 @@
 vid value 0.
 
 Fixes: b8c0372bc5ac ("net/mlx5: fix set VLAN ID/PCP in new header")
-Cc: stable at dpdk.org
 
 Signed-off-by: Dekel Peled <dekelp at mellanox.com>
 Acked-by: Ori Kam <orika at mellanox.com>
@@ -20,10 +21,10 @@
  1 file changed, 1 insertion(+), 9 deletions(-)
 
 diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
-index d7176c80ef..59ece01089 100644
+index 155e12b534..7aedfa903b 100644
 --- a/drivers/net/mlx5/mlx5_flow_dv.c
 +++ b/drivers/net/mlx5/mlx5_flow_dv.c
-@@ -1734,7 +1734,7 @@ flow_dev_get_vlan_info_from_items(const struct rte_flow_item *items,
+@@ -1605,7 +1605,7 @@ flow_dev_get_vlan_info_from_items(const struct rte_flow_item *items,
   */
  static int
  flow_dv_validate_action_push_vlan(uint64_t action_flags,
@@ -32,7 +33,7 @@
  				  const struct rte_flow_action *action,
  				  const struct rte_flow_attr *attr,
  				  struct rte_flow_error *error)
-@@ -1751,14 +1751,6 @@ flow_dv_validate_action_push_vlan(uint64_t action_flags,
+@@ -1622,14 +1622,6 @@ flow_dv_validate_action_push_vlan(uint64_t action_flags,
  					  RTE_FLOW_ERROR_TYPE_ACTION, action,
  					  "no support for multiple VLAN "
  					  "actions");