[dpdk-stable] patch 'net/mlx5: fix VLAN ID check' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.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 05/21/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 7e01ad84bf0b9d564ed4d9ff22eeb9552330da15 Mon Sep 17 00:00:00 2001
From: Wisam Jaddo <wisamm at mellanox.com>
Date: Thu, 30 Apr 2020 08:31:03 +0000
Subject: [PATCH] net/mlx5: fix VLAN ID check

[ upstream commit b756f2980718bf2cb1c8f57762f42c656986998d ]

All comparison should be done in CPU endianness, otherwise
it will not give right results.

for example:
255 after converting into RTE_BE16 will be biger than 4096 after
converting into RTE_BE16.

Fixes: a5f2da0b816b ("net/mlx5: support modify VLAN ID on new VLAN header")

Signed-off-by: Wisam Jaddo <wisamm at mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo 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 6cdaa00519..5b6d78c86e 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -1831,7 +1831,7 @@ flow_dv_validate_action_set_vlan_vid(uint64_t item_flags,
 	const struct rte_flow_action *action = actions;
 	const struct rte_flow_action_of_set_vlan_vid *conf = action->conf;
 
-	if (conf->vlan_vid > RTE_BE16(0xFFE))
+	if (rte_be_to_cpu_16(conf->vlan_vid) > 0xFFE)
 		return rte_flow_error_set(error, EINVAL,
 					  RTE_FLOW_ERROR_TYPE_ACTION, action,
 					  "VLAN VID value is too big");
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:50.775567308 +0100
+++ 0155-net-mlx5-fix-VLAN-ID-check.patch	2020-05-19 14:04:44.492653376 +0100
@@ -1,8 +1,10 @@
-From b756f2980718bf2cb1c8f57762f42c656986998d Mon Sep 17 00:00:00 2001
+From 7e01ad84bf0b9d564ed4d9ff22eeb9552330da15 Mon Sep 17 00:00:00 2001
 From: Wisam Jaddo <wisamm at mellanox.com>
 Date: Thu, 30 Apr 2020 08:31:03 +0000
 Subject: [PATCH] net/mlx5: fix VLAN ID check
 
+[ upstream commit b756f2980718bf2cb1c8f57762f42c656986998d ]
+
 All comparison should be done in CPU endianness, otherwise
 it will not give right results.
 
@@ -11,7 +13,6 @@
 converting into RTE_BE16.
 
 Fixes: a5f2da0b816b ("net/mlx5: support modify VLAN ID on new VLAN header")
-Cc: stable at dpdk.org
 
 Signed-off-by: Wisam Jaddo <wisamm at mellanox.com>
 Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
@@ -20,10 +21,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 794afcf18c..8aba5c774a 100644
+index 6cdaa00519..5b6d78c86e 100644
 --- a/drivers/net/mlx5/mlx5_flow_dv.c
 +++ b/drivers/net/mlx5/mlx5_flow_dv.c
-@@ -1965,7 +1965,7 @@ flow_dv_validate_action_set_vlan_vid(uint64_t item_flags,
+@@ -1831,7 +1831,7 @@ flow_dv_validate_action_set_vlan_vid(uint64_t item_flags,
  	const struct rte_flow_action *action = actions;
  	const struct rte_flow_action_of_set_vlan_vid *conf = action->conf;