[dpdk-stable] patch 'net/i40e: fix flow director for ARP packets' 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 74095b0ca6c98ff3a51769689f6a2266cefe41c3 Mon Sep 17 00:00:00 2001
From: Wei Zhao <wei.zhao1 at intel.com>
Date: Wed, 29 Apr 2020 10:03:51 +0800
Subject: [PATCH] net/i40e: fix flow director for ARP packets

[ upstream commit 73cc2f0ab5cfaa7f4b2dd4c0cacc98b8e17cc778 ]

Currently, flow "pattern eth type is 0x0806 / end actions mark id
0x86 / rss / end" can't be created successfully. FDIR parser
shouldn't deny RTE_ETHER_TYPE_ARP since ARP packets will be
parsed as PCTYPE_L2_PAYLOAD. This patch fixes the issue.

Bugzilla ID: 402
Fixes: 42044b69c67d ("net/i40e: support input set selection for FDIR")

Signed-off-by: Wei Zhao <wei.zhao1 at intel.com>
Acked-by: Beilei Xing <beilei.xing at intel.com>
---
 drivers/net/i40e/i40e_flow.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index a5bd1c7783..6cd39babba 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -2542,7 +2542,6 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
 				if (next_type == RTE_FLOW_ITEM_TYPE_VLAN ||
 				    ether_type == RTE_ETHER_TYPE_IPV4 ||
 				    ether_type == RTE_ETHER_TYPE_IPV6 ||
-				    ether_type == RTE_ETHER_TYPE_ARP ||
 				    ether_type == outer_tpid) {
 					rte_flow_error_set(error, EINVAL,
 						     RTE_FLOW_ERROR_TYPE_ITEM,
@@ -2587,7 +2586,6 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
 
 				if (ether_type == RTE_ETHER_TYPE_IPV4 ||
 				    ether_type == RTE_ETHER_TYPE_IPV6 ||
-				    ether_type == RTE_ETHER_TYPE_ARP ||
 				    ether_type == outer_tpid) {
 					rte_flow_error_set(error, EINVAL,
 						     RTE_FLOW_ERROR_TYPE_ITEM,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:50.004588081 +0100
+++ 0137-net-i40e-fix-flow-director-for-ARP-packets.patch	2020-05-19 14:04:44.448652578 +0100
@@ -1,8 +1,10 @@
-From 73cc2f0ab5cfaa7f4b2dd4c0cacc98b8e17cc778 Mon Sep 17 00:00:00 2001
+From 74095b0ca6c98ff3a51769689f6a2266cefe41c3 Mon Sep 17 00:00:00 2001
 From: Wei Zhao <wei.zhao1 at intel.com>
 Date: Wed, 29 Apr 2020 10:03:51 +0800
 Subject: [PATCH] net/i40e: fix flow director for ARP packets
 
+[ upstream commit 73cc2f0ab5cfaa7f4b2dd4c0cacc98b8e17cc778 ]
+
 Currently, flow "pattern eth type is 0x0806 / end actions mark id
 0x86 / rss / end" can't be created successfully. FDIR parser
 shouldn't deny RTE_ETHER_TYPE_ARP since ARP packets will be
@@ -10,7 +12,6 @@
 
 Bugzilla ID: 402
 Fixes: 42044b69c67d ("net/i40e: support input set selection for FDIR")
-Cc: stable at dpdk.org
 
 Signed-off-by: Wei Zhao <wei.zhao1 at intel.com>
 Acked-by: Beilei Xing <beilei.xing at intel.com>
@@ -19,10 +20,10 @@
  1 file changed, 2 deletions(-)
 
 diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
-index 7e64ae53a3..1533d5abbd 100644
+index a5bd1c7783..6cd39babba 100644
 --- a/drivers/net/i40e/i40e_flow.c
 +++ b/drivers/net/i40e/i40e_flow.c
-@@ -2666,7 +2666,6 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
+@@ -2542,7 +2542,6 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
  				if (next_type == RTE_FLOW_ITEM_TYPE_VLAN ||
  				    ether_type == RTE_ETHER_TYPE_IPV4 ||
  				    ether_type == RTE_ETHER_TYPE_IPV6 ||
@@ -30,7 +31,7 @@
  				    ether_type == outer_tpid) {
  					rte_flow_error_set(error, EINVAL,
  						     RTE_FLOW_ERROR_TYPE_ITEM,
-@@ -2711,7 +2710,6 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
+@@ -2587,7 +2586,6 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
  
  				if (ether_type == RTE_ETHER_TYPE_IPV4 ||
  				    ether_type == RTE_ETHER_TYPE_IPV6 ||