[dpdk-stable] patch 'net/i40e: fix ethernet flow rule' 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/04/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/e163a6a648314ae4b9bffe239d163b761eed286a

Thanks.

Kevin Traynor

---
>From e163a6a648314ae4b9bffe239d163b761eed286a Mon Sep 17 00:00:00 2001
From: Xiaolong Ye <xiaolong.ye at intel.com>
Date: Mon, 22 Jul 2019 20:06:37 +0800
Subject: [PATCH] net/i40e: fix ethernet flow rule

[ upstream commit 3106ca84dc2de241382461d93d49d5a643145c70 ]

i40e FDIR doesn't allow to create flow with empty spec and mask for
ethertype pattern. Without this patch, below flow would be created
successfully which is unexpected.

> flow create 0 ingress pattern eth / end actions drop / end

Fixes: 7d83c152a207 ("net/i40e: parse flow director filter")

Signed-off-by: Xiaolong Ye <xiaolong.ye at intel.com>
Acked-by: Beilei Xing <beilei.xing at intel.com>
---
 drivers/net/i40e/i40e_flow.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index 3c3b69b9f..1699578ff 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -2444,4 +2444,5 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
 	uint16_t frag_off;
 	enum rte_flow_item_type item_type;
+	enum rte_flow_item_type next_type;
 	enum rte_flow_item_type l3 = RTE_FLOW_ITEM_TYPE_END;
 	enum rte_flow_item_type cus_proto = RTE_FLOW_ITEM_TYPE_END;
@@ -2484,4 +2485,14 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
 			eth_spec = item->spec;
 			eth_mask = item->mask;
+			next_type = (item + 1)->type;
+
+			if (next_type == RTE_FLOW_ITEM_TYPE_END &&
+						(!eth_spec || !eth_mask)) {
+				rte_flow_error_set(error, EINVAL,
+						   RTE_FLOW_ERROR_TYPE_ITEM,
+						   item,
+						   "NULL eth spec/mask.");
+				return -rte_errno;
+			}
 
 			if (eth_spec && eth_mask) {
@@ -2496,6 +2507,4 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
 			}
 			if (eth_spec && eth_mask && eth_mask->type) {
-				enum rte_flow_item_type next = (item + 1)->type;
-
 				if (eth_mask->type != RTE_BE16(0xffff)) {
 					rte_flow_error_set(error, EINVAL,
@@ -2508,5 +2517,5 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
 				ether_type = rte_be_to_cpu_16(eth_spec->type);
 
-				if (next == RTE_FLOW_ITEM_TYPE_VLAN ||
+				if (next_type == RTE_FLOW_ITEM_TYPE_VLAN ||
 				    ether_type == ETHER_TYPE_IPv4 ||
 				    ether_type == ETHER_TYPE_IPv6 ||
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-28 14:32:35.198333313 +0100
+++ 0057-net-i40e-fix-ethernet-flow-rule.patch	2019-08-28 14:32:31.736955242 +0100
@@ -1 +1 @@
-From 3106ca84dc2de241382461d93d49d5a643145c70 Mon Sep 17 00:00:00 2001
+From e163a6a648314ae4b9bffe239d163b761eed286a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3106ca84dc2de241382461d93d49d5a643145c70 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index 48a6782a8..3c0af70c0 100644
+index 3c3b69b9f..1699578ff 100644
@@ -25 +26 @@
-@@ -2443,4 +2443,5 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
+@@ -2444,4 +2444,5 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
@@ -31 +32 @@
-@@ -2483,4 +2484,14 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
+@@ -2484,4 +2485,14 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
@@ -46 +47 @@
-@@ -2495,6 +2506,4 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
+@@ -2496,6 +2507,4 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
@@ -53 +54 @@
-@@ -2507,5 +2516,5 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
+@@ -2508,5 +2517,5 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
@@ -58,2 +59,2 @@
- 				    ether_type == RTE_ETHER_TYPE_IPV4 ||
- 				    ether_type == RTE_ETHER_TYPE_IPV6 ||
+ 				    ether_type == ETHER_TYPE_IPv4 ||
+ 				    ether_type == ETHER_TYPE_IPv6 ||