[dpdk-stable] patch 'net/i40e: fix QinQ flow pattern to allow non full mask' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

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

Queued patches are on a temporary branch at:
https://github.com/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/6955f4bf01ca00b656ee38260abe5e9978ed4605

Thanks.

Luca Boccassi

---
>From 6955f4bf01ca00b656ee38260abe5e9978ed4605 Mon Sep 17 00:00:00 2001
From: Padraig Connolly <padraig.j.connolly at intel.com>
Date: Thu, 15 Oct 2020 10:28:58 +0100
Subject: [PATCH] net/i40e: fix QinQ flow pattern to allow non full mask

[ upstream commit ff0df4e134cc6efe75e1ed103b2c7b316b8269e2 ]

Issue reported by customer that only full mask was allowed on inner and
outer VLAN tag, thus not allowing mask to set VLAN ID filter only.
Removed check that enforces inner vlan and outer vlan equal
I40E_TCI_MASK (full mask 0xffff).

Fixes: d37705068ee8 ("net/i40e: parse QinQ pattern")

Signed-off-by: Padraig Connolly <padraig.j.connolly at intel.com>
Acked-by: Bernard Iremonger <bernard.iremonger at intel.com>
---
 drivers/net/i40e/i40e_flow.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index 11e0e24782..7fe22e3007 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -4178,14 +4178,9 @@ i40e_flow_parse_qinq_pattern(__rte_unused struct rte_eth_dev *dev,
 	}
 
 	/* Get filter specification */
-	if ((o_vlan_mask != NULL) && (o_vlan_mask->tci ==
-			rte_cpu_to_be_16(I40E_TCI_MASK)) &&
-			(i_vlan_mask != NULL) &&
-			(i_vlan_mask->tci == rte_cpu_to_be_16(I40E_TCI_MASK))) {
-		filter->outer_vlan = rte_be_to_cpu_16(o_vlan_spec->tci)
-			& I40E_TCI_MASK;
-		filter->inner_vlan = rte_be_to_cpu_16(i_vlan_spec->tci)
-			& I40E_TCI_MASK;
+	if (o_vlan_mask != NULL &&  i_vlan_mask != NULL) {
+		filter->outer_vlan = rte_be_to_cpu_16(o_vlan_spec->tci);
+		filter->inner_vlan = rte_be_to_cpu_16(i_vlan_spec->tci);
 	} else {
 			rte_flow_error_set(error, EINVAL,
 					   RTE_FLOW_ERROR_TYPE_ITEM,
-- 
2.27.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-09 18:40:12.546816862 +0000
+++ 0033-net-i40e-fix-QinQ-flow-pattern-to-allow-non-full-mas.patch	2020-11-09 18:40:11.155311656 +0000
@@ -1 +1 @@
-From ff0df4e134cc6efe75e1ed103b2c7b316b8269e2 Mon Sep 17 00:00:00 2001
+From 6955f4bf01ca00b656ee38260abe5e9978ed4605 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ff0df4e134cc6efe75e1ed103b2c7b316b8269e2 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index adc5da1c53..8e7a9989b3 100644
+index 11e0e24782..7fe22e3007 100644
@@ -24 +25 @@
-@@ -4649,14 +4649,9 @@ i40e_flow_parse_qinq_pattern(__rte_unused struct rte_eth_dev *dev,
+@@ -4178,14 +4178,9 @@ i40e_flow_parse_qinq_pattern(__rte_unused struct rte_eth_dev *dev,