patch 'net/mlx4: fix empty Ethernet spec with VLAN' has been queued to stable release 20.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.4

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/30/21. 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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/b1c95cef1d78246b4b0f815fe3fd149f9db92b67

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From b1c95cef1d78246b4b0f815fe3fd149f9db92b67 Mon Sep 17 00:00:00 2001
From: Xiaoyu Min <jackmin at nvidia.com>
Date: Mon, 22 Nov 2021 21:53:29 +0800
Subject: [PATCH] net/mlx4: fix empty Ethernet spec with VLAN
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit d564eea7ce7fe66f6b4210956b8907f663d30734 ]

When the ETH spec is empty MLX4 PMD doesn't allow match other criteria,
which means the flow should be promisc one.

Currently, PMD validates this by setting flow->promisc bit when ETH spec
is empty and checking whether there is other rte_flow_item followed
when flow->promisc is on.

However, commit [1] adds support to match traffic only on VLAN id, the
above validation logic should be changed accordingly.

This patch changes the above validate logic by skipping flow->promisc
check if this item is VLAN.

[1]:
Fixes: c0d239263156 ("net/mlx4: support flow w/o ETH spec and with VLAN")

Signed-off-by: Xiaoyu Min <jackmin at nvidia.com>
Acked-by: Matan Azrad <matan at nvidia.com>
---
 drivers/net/mlx4/mlx4_flow.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mlx4/mlx4_flow.c b/drivers/net/mlx4/mlx4_flow.c
index 418e3c6bb0..cf231e5944 100644
--- a/drivers/net/mlx4/mlx4_flow.c
+++ b/drivers/net/mlx4/mlx4_flow.c
@@ -713,7 +713,8 @@ fill:
 			flow->internal = 1;
 			continue;
 		}
-		if (flow->promisc || flow->allmulti) {
+		if ((item->type != RTE_FLOW_ITEM_TYPE_VLAN && flow->promisc) ||
+		    flow->allmulti) {
 			msg = "mlx4 does not support additional matching"
 				" criteria combined with indiscriminate"
 				" matching on Ethernet headers";
-- 
2.34.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-28 22:41:06.606898220 +0800
+++ 0066-net-mlx4-fix-empty-Ethernet-spec-with-VLAN.patch	2021-11-28 22:41:03.413539290 +0800
@@ -1 +1 @@
-From d564eea7ce7fe66f6b4210956b8907f663d30734 Mon Sep 17 00:00:00 2001
+From b1c95cef1d78246b4b0f815fe3fd149f9db92b67 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit d564eea7ce7fe66f6b4210956b8907f663d30734 ]
@@ -21 +23,0 @@
-Cc: stable at dpdk.org
@@ -30 +32 @@
-index 2e1b6c87e9..9d7247cf81 100644
+index 418e3c6bb0..cf231e5944 100644