[dpdk-stable] patch 'net/mlx5: fix validation of VLAN PCP item' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/12/19. 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/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/7f25ef5baa0ba097473891fd4b4f35ab0813bf8f

Thanks.

Kevin Traynor

---
>From 7f25ef5baa0ba097473891fd4b4f35ab0813bf8f Mon Sep 17 00:00:00 2001
From: Dekel Peled <dekelp at mellanox.com>
Date: Mon, 29 Jul 2019 18:14:45 +0300
Subject: [PATCH] net/mlx5: fix validation of VLAN PCP item

[ upstream commit a3970d31e6fb0673611a4a0a4891b7109ae419cc ]

Function mlx5_flow_validate_item_vlan() validates the user setting
is supported by NIC, using a mask with TCI mask 0x0fff.
This check will reject a flow rule specifying a vlan pcp item.

This patch updates mlx5_flow_validate_item_vlan() to use mask 0xffff,
so flow rules with vlan pcp item are accepted.

Fixes: 23c1d42c7138 ("net/mlx5: split flow validation to dedicated function")

Signed-off-by: Dekel Peled <dekelp at mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
---
 drivers/net/mlx5/mlx5_flow.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 8e6585d18..f19b27ede 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -1099,6 +1099,6 @@ mlx5_flow_validate_item_vlan(const struct rte_flow_item *item,
 	const struct rte_flow_item_vlan *mask = item->mask;
 	const struct rte_flow_item_vlan nic_mask = {
-		.tci = RTE_BE16(0x0fff),
-		.inner_type = RTE_BE16(0xffff),
+		.tci = RTE_BE16(UINT16_MAX),
+		.inner_type = RTE_BE16(UINT16_MAX),
 	};
 	uint16_t vlan_tag = 0;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-09-05 10:36:50.405125318 +0100
+++ 0048-net-mlx5-fix-validation-of-VLAN-PCP-item.patch	2019-09-05 10:36:47.557699397 +0100
@@ -1 +1 @@
-From a3970d31e6fb0673611a4a0a4891b7109ae419cc Mon Sep 17 00:00:00 2001
+From 7f25ef5baa0ba097473891fd4b4f35ab0813bf8f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a3970d31e6fb0673611a4a0a4891b7109ae419cc ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index f40fee528..6ae98e197 100644
+index 8e6585d18..f19b27ede 100644
@@ -26 +27 @@
-@@ -1222,6 +1222,6 @@ mlx5_flow_validate_item_vlan(const struct rte_flow_item *item,
+@@ -1099,6 +1099,6 @@ mlx5_flow_validate_item_vlan(const struct rte_flow_item *item,