[dpdk-stable] patch 'net/i40e: fix recreating flexible flow director rule' 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 10/30/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 1ed7d60cd9c8f3f0f29947ad2eb47496ec630069 Mon Sep 17 00:00:00 2001
From: Guinan Sun <guinanx.sun at intel.com>
Date: Tue, 15 Sep 2020 06:52:25 +0000
Subject: [PATCH] net/i40e: fix recreating flexible flow director rule

[ upstream commit 0acf70d473072fd77b667a0419f8b9ab70b35b39 ]

This patch fixes the failure of recreate flexible fdir rule.
The root cause is that the flex_mask_flag is not reset during
flow destroy and flow flush.

Fixes: 6ced3dd72f5f ("net/i40e: support flexible payload parsing for FDIR")

Signed-off-by: Guinan Sun <guinanx.sun at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/i40e/i40e_fdir.c | 2 ++
 drivers/net/i40e/i40e_flow.c | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c
index 9a2b40b8a7..8abdc3773a 100644
--- a/drivers/net/i40e/i40e_fdir.c
+++ b/drivers/net/i40e/i40e_fdir.c
@@ -1647,6 +1647,8 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev,
 			rte_free(fdir_filter);
 	} else {
 		ret = i40e_sw_fdir_filter_del(pf, &node->fdir.input);
+		if (ret >= 0)
+			pf->fdir.flex_mask_flag[pctype] = 0;
 	}
 
 	return ret;
diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index ae2fb45930..11e0e24782 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -5044,8 +5044,10 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)
 		}
 
 		for (pctype = I40E_FILTER_PCTYPE_NONF_IPV4_UDP;
-		     pctype <= I40E_FILTER_PCTYPE_L2_PAYLOAD; pctype++)
+		     pctype <= I40E_FILTER_PCTYPE_L2_PAYLOAD; pctype++) {
 			pf->fdir.inset_flag[pctype] = 0;
+			pf->fdir.flex_mask_flag[pctype] = 0;
+		}
 
 		/* Disable FDIR processing as all FDIR rules are now flushed */
 		i40e_fdir_rx_proc_enable(dev, 0);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:13.071584235 +0000
+++ 0041-net-i40e-fix-recreating-flexible-flow-director-rule.patch	2020-10-28 10:35:11.504830024 +0000
@@ -1,14 +1,15 @@
-From 0acf70d473072fd77b667a0419f8b9ab70b35b39 Mon Sep 17 00:00:00 2001
+From 1ed7d60cd9c8f3f0f29947ad2eb47496ec630069 Mon Sep 17 00:00:00 2001
 From: Guinan Sun <guinanx.sun at intel.com>
 Date: Tue, 15 Sep 2020 06:52:25 +0000
 Subject: [PATCH] net/i40e: fix recreating flexible flow director rule
 
+[ upstream commit 0acf70d473072fd77b667a0419f8b9ab70b35b39 ]
+
 This patch fixes the failure of recreate flexible fdir rule.
 The root cause is that the flex_mask_flag is not reset during
 flow destroy and flow flush.
 
 Fixes: 6ced3dd72f5f ("net/i40e: support flexible payload parsing for FDIR")
-Cc: stable at dpdk.org
 
 Signed-off-by: Guinan Sun <guinanx.sun at intel.com>
 Acked-by: Qi Zhang <qi.z.zhang at intel.com>
@@ -18,24 +19,24 @@
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c
-index 8e87b4a009..aa8e729495 100644
+index 9a2b40b8a7..8abdc3773a 100644
 --- a/drivers/net/i40e/i40e_fdir.c
 +++ b/drivers/net/i40e/i40e_fdir.c
-@@ -1882,6 +1882,8 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev,
- 			return -EINVAL;
- 		}
- 
-+		pf->fdir.flex_mask_flag[pctype] = 0;
-+
- 		if (fdir_info->fdir_invalprio == 1)
- 			wait_status = false;
+@@ -1647,6 +1647,8 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev,
+ 			rte_free(fdir_filter);
+ 	} else {
+ 		ret = i40e_sw_fdir_filter_del(pf, &node->fdir.input);
++		if (ret >= 0)
++			pf->fdir.flex_mask_flag[pctype] = 0;
  	}
+ 
+ 	return ret;
 diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
-index 51d8fdd790..adc5da1c53 100644
+index ae2fb45930..11e0e24782 100644
 --- a/drivers/net/i40e/i40e_flow.c
 +++ b/drivers/net/i40e/i40e_flow.c
-@@ -5679,8 +5679,10 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)
- 			I40E_MAX_FDIR_FILTER_NUM);
+@@ -5044,8 +5044,10 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)
+ 		}
  
  		for (pctype = I40E_FILTER_PCTYPE_NONF_IPV4_UDP;
 -		     pctype <= I40E_FILTER_PCTYPE_L2_PAYLOAD; pctype++)