[dpdk-stable] patch 'net/mlx5: block push VLAN action on Rx' 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 155b81d550e03c0fd785083d6e959887d2c882f0 Mon Sep 17 00:00:00 2001
From: Dekel Peled <dekelp at mellanox.com>
Date: Wed, 22 Jan 2020 16:27:18 +0200
Subject: [PATCH] net/mlx5: block push VLAN action on Rx

[ upstream commit 55060e62e4d2802b963fb00a45efc31ae1f8aca0 ]

Add missing check in validation function of 'push VLAN' action.
Action is not allowed for ingress flow rules.

Fixes: 9aee7a8418d4 ("net/mlx5: support push 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 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 7aedfa903b..c189a4d919 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -1612,6 +1612,12 @@ flow_dv_validate_action_push_vlan(uint64_t action_flags,
 {
 	const struct rte_flow_action_of_push_vlan *push_vlan = action->conf;
 
+	if (attr->ingress)
+		return rte_flow_error_set(error, ENOTSUP,
+					  RTE_FLOW_ERROR_TYPE_ATTR_INGRESS,
+					  NULL,
+					  "push VLAN action not supported for "
+					  "ingress");
 	if (push_vlan->ethertype != RTE_BE16(RTE_ETHER_TYPE_VLAN) &&
 	    push_vlan->ethertype != RTE_BE16(RTE_ETHER_TYPE_QINQ))
 		return rte_flow_error_set(error, EINVAL,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-11 11:17:43.779025848 +0000
+++ 0148-net-mlx5-block-push-VLAN-action-on-Rx.patch	2020-02-11 11:17:38.684006657 +0000
@@ -1,13 +1,14 @@
-From 55060e62e4d2802b963fb00a45efc31ae1f8aca0 Mon Sep 17 00:00:00 2001
+From 155b81d550e03c0fd785083d6e959887d2c882f0 Mon Sep 17 00:00:00 2001
 From: Dekel Peled <dekelp at mellanox.com>
 Date: Wed, 22 Jan 2020 16:27:18 +0200
 Subject: [PATCH] net/mlx5: block push VLAN action on Rx
 
+[ upstream commit 55060e62e4d2802b963fb00a45efc31ae1f8aca0 ]
+
 Add missing check in validation function of 'push VLAN' action.
 Action is not allowed for ingress flow rules.
 
 Fixes: 9aee7a8418d4 ("net/mlx5: support push 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>
@@ -17,10 +18,10 @@
  1 file changed, 6 insertions(+)
 
 diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
-index b0d5688b29..1ed677ff21 100644
+index 7aedfa903b..c189a4d919 100644
 --- a/drivers/net/mlx5/mlx5_flow_dv.c
 +++ b/drivers/net/mlx5/mlx5_flow_dv.c
-@@ -1741,6 +1741,12 @@ flow_dv_validate_action_push_vlan(uint64_t action_flags,
+@@ -1612,6 +1612,12 @@ flow_dv_validate_action_push_vlan(uint64_t action_flags,
  {
  	const struct rte_flow_action_of_push_vlan *push_vlan = action->conf;