[dpdk-stable] patch 'net/mlx5: fix check for VLAN actions' 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 e6797a244f6c5796f8e1f6ddd2843cd8ea08449b Mon Sep 17 00:00:00 2001
From: Dekel Peled <dekelp at mellanox.com>
Date: Wed, 22 Jan 2020 16:27:14 +0200
Subject: [PATCH] net/mlx5: fix check for VLAN actions

[ upstream commit a2268a4cfb08e70e3f0f0a082033ad5a24a2a07d ]

Flow validation function includes, after all items and actions are
validated discretely, a check for VLAN and VXLAN actions.
This check is incorrect and redundant.

This patch removes the invalid check from validation function.
Check is incorrect, action_flags bit map is checked against
items mask MLX5_FLOW_LAYER_TUNNEL.
Check is also redundant, because VLAN push/pop actions can be used
together with packet reformat actions.

Fixes: b41e47da2592 ("net/mlx5: support pop flow action on VLAN 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 | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 74d1a68e4a..8a5aea0603 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -4830,13 +4830,6 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
 						  "action not supported");
 		}
 	}
-	if ((action_flags & MLX5_FLOW_LAYER_TUNNEL) &&
-	    (action_flags & MLX5_FLOW_VLAN_ACTIONS))
-		return rte_flow_error_set(error, ENOTSUP,
-					  RTE_FLOW_ERROR_TYPE_ACTION,
-					  actions,
-					  "can't have vxlan and vlan"
-					  " actions in the same rule");
 	/* Eswitch has few restrictions on using items and actions */
 	if (attr->transfer) {
 		if (!mlx5_flow_ext_mreg_supported(dev) &&
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-11 11:17:43.675021628 +0000
+++ 0145-net-mlx5-fix-check-for-VLAN-actions.patch	2020-02-11 11:17:38.664006283 +0000
@@ -1,8 +1,10 @@
-From a2268a4cfb08e70e3f0f0a082033ad5a24a2a07d Mon Sep 17 00:00:00 2001
+From e6797a244f6c5796f8e1f6ddd2843cd8ea08449b Mon Sep 17 00:00:00 2001
 From: Dekel Peled <dekelp at mellanox.com>
 Date: Wed, 22 Jan 2020 16:27:14 +0200
 Subject: [PATCH] net/mlx5: fix check for VLAN actions
 
+[ upstream commit a2268a4cfb08e70e3f0f0a082033ad5a24a2a07d ]
+
 Flow validation function includes, after all items and actions are
 validated discretely, a check for VLAN and VXLAN actions.
 This check is incorrect and redundant.
@@ -14,7 +16,6 @@
 together with packet reformat actions.
 
 Fixes: b41e47da2592 ("net/mlx5: support pop flow action on VLAN header")
-Cc: stable at dpdk.org
 
 Signed-off-by: Dekel Peled <dekelp at mellanox.com>
 Acked-by: Ori Kam <orika at mellanox.com>
@@ -24,10 +25,10 @@
  1 file changed, 7 deletions(-)
 
 diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
-index 5a1b42698c..afa3d0e1ce 100644
+index 74d1a68e4a..8a5aea0603 100644
 --- a/drivers/net/mlx5/mlx5_flow_dv.c
 +++ b/drivers/net/mlx5/mlx5_flow_dv.c
-@@ -5060,13 +5060,6 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
+@@ -4830,13 +4830,6 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
  						  "action not supported");
  		}
  	}