[dpdk-stable] patch 'net/mlx5: fix VLAN inner type matching on DR/DV' 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/ad50faccc8b55a3aa6557dd16e8492e2cb1a5e03

Thanks.

Kevin Traynor

---
>From ad50faccc8b55a3aa6557dd16e8492e2cb1a5e03 Mon Sep 17 00:00:00 2001
From: Xiaoyu Min <jackmin at mellanox.com>
Date: Fri, 2 Aug 2019 17:18:23 +0800
Subject: [PATCH] net/mlx5: fix VLAN inner type matching on DR/DV

[ upstream commit b12c7b23680159dd3e6d24e649e1761fc4f9cdcf ]

The rte_flow_item_vlan has the inner_type, which is missing on
DR/DV flow engine.

By adding this support, the example testpmd commands could be:

 - matching all vlan traffic with id 2:

 testpmd> flow create 0 ingress pattern eth / vlan vid is 2 / end
          actions queue index 2 / end

 - matching all ipv4 traffic in vlan with id 2:

 testpmd> flow create 0 ingress pattern eth / vlan vid is 2
          inner_type is 0x0800 / end actions queue index 2 / end

Fixes: fc2c498ccb94 ("net/mlx5: add Direct Verbs translate items")

Signed-off-by: Xiaoyu Min <jackmin at mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 207edcbc5..3b514d632 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -1177,8 +1177,4 @@ flow_dv_translate_item_vlan(void *matcher, void *key,
 	const struct rte_flow_item_vlan *vlan_m = item->mask;
 	const struct rte_flow_item_vlan *vlan_v = item->spec;
-	const struct rte_flow_item_vlan nic_mask = {
-		.tci = RTE_BE16(0x0fff),
-		.inner_type = RTE_BE16(0xffff),
-	};
 	void *headers_m;
 	void *headers_v;
@@ -1189,5 +1185,5 @@ flow_dv_translate_item_vlan(void *matcher, void *key,
 		return;
 	if (!vlan_m)
-		vlan_m = &nic_mask;
+		vlan_m = &rte_flow_item_vlan_mask;
 	if (inner) {
 		headers_m = MLX5_ADDR_OF(fte_match_param, matcher,
@@ -1209,4 +1205,8 @@ flow_dv_translate_item_vlan(void *matcher, void *key,
 	MLX5_SET(fte_match_set_lyr_2_4, headers_m, first_prio, tci_m >> 13);
 	MLX5_SET(fte_match_set_lyr_2_4, headers_v, first_prio, tci_v >> 13);
+	MLX5_SET(fte_match_set_lyr_2_4, headers_m, ethertype,
+		 rte_be_to_cpu_16(vlan_m->inner_type));
+	MLX5_SET(fte_match_set_lyr_2_4, headers_v, ethertype,
+		 rte_be_to_cpu_16(vlan_m->inner_type & vlan_v->inner_type));
 }
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-09-05 10:36:50.466683221 +0100
+++ 0049-net-mlx5-fix-VLAN-inner-type-matching-on-DR-DV.patch	2019-09-05 10:36:47.559699349 +0100
@@ -1 +1 @@
-From b12c7b23680159dd3e6d24e649e1761fc4f9cdcf Mon Sep 17 00:00:00 2001
+From ad50faccc8b55a3aa6557dd16e8492e2cb1a5e03 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b12c7b23680159dd3e6d24e649e1761fc4f9cdcf ]
+
@@ -22 +23,0 @@
-Cc: stable at dpdk.org
@@ -31 +32 @@
-index 536059d8c..a7d677f85 100644
+index 207edcbc5..3b514d632 100644
@@ -34 +35 @@
-@@ -3470,8 +3470,4 @@ flow_dv_translate_item_vlan(struct mlx5_flow *dev_flow,
+@@ -1177,8 +1177,4 @@ flow_dv_translate_item_vlan(void *matcher, void *key,
@@ -43 +44 @@
-@@ -3482,5 +3478,5 @@ flow_dv_translate_item_vlan(struct mlx5_flow *dev_flow,
+@@ -1189,5 +1185,5 @@ flow_dv_translate_item_vlan(void *matcher, void *key,
@@ -50 +51 @@
-@@ -3508,4 +3504,8 @@ flow_dv_translate_item_vlan(struct mlx5_flow *dev_flow,
+@@ -1209,4 +1205,8 @@ flow_dv_translate_item_vlan(void *matcher, void *key,