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

[ upstream commit 1491f63c75596b01b95355e395dde6795fab3c8b ]

When we flush FDIR filter, we can not call i40e_fdir_teardown()
function as it will free vsi used for FDIR, then the vsi->base_queue
will be freed from pf->qp_pool, but vsi->base_queue can only get
once when do dev init in i40e_pf_setup(). If we free it, it will
never be alloc again.

Bugzilla ID: 404
Fixes: 2e67a7fbf3ff ("net/i40e: config flow director automatically")

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 | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index 6cd39babba..ea3b223e11 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -4791,7 +4791,6 @@ i40e_flow_destroy(struct rte_eth_dev *dev,
 
 		/* If the last flow is destroyed, disable fdir. */
 		if (!ret && TAILQ_EMPTY(&pf->fdir.fdir_list)) {
-			i40e_fdir_teardown(pf);
 			i40e_fdir_rx_proc_enable(dev, 0);
 		}
 		break;
@@ -4989,8 +4988,6 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)
 			pf->fdir.inset_flag[pctype] = 0;
 	}
 
-	i40e_fdir_teardown(pf);
-
 	return ret;
 }
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:50.091230009 +0100
+++ 0139-net-i40e-fix-flush-of-flow-director-filter.patch	2020-05-19 14:04:44.452652651 +0100
@@ -1,8 +1,10 @@
-From 1491f63c75596b01b95355e395dde6795fab3c8b Mon Sep 17 00:00:00 2001
+From d6db84d0b1ed83c463fd29b3b9183db3b65bf9ef Mon Sep 17 00:00:00 2001
 From: Wei Zhao <wei.zhao1 at intel.com>
 Date: Wed, 29 Apr 2020 10:03:53 +0800
 Subject: [PATCH] net/i40e: fix flush of flow director filter
 
+[ upstream commit 1491f63c75596b01b95355e395dde6795fab3c8b ]
+
 When we flush FDIR filter, we can not call i40e_fdir_teardown()
 function as it will free vsi used for FDIR, then the vsi->base_queue
 will be freed from pf->qp_pool, but vsi->base_queue can only get
@@ -11,7 +13,6 @@
 
 Bugzilla ID: 404
 Fixes: 2e67a7fbf3ff ("net/i40e: config flow director automatically")
-Cc: stable at dpdk.org
 
 Signed-off-by: Wei Zhao <wei.zhao1 at intel.com>
 Acked-by: Beilei Xing <beilei.xing at intel.com>
@@ -20,10 +21,10 @@
  1 file changed, 3 deletions(-)
 
 diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
-index 1533d5abbd..65f877866d 100644
+index 6cd39babba..ea3b223e11 100644
 --- a/drivers/net/i40e/i40e_flow.c
 +++ b/drivers/net/i40e/i40e_flow.c
-@@ -5145,7 +5145,6 @@ i40e_flow_destroy(struct rte_eth_dev *dev,
+@@ -4791,7 +4791,6 @@ i40e_flow_destroy(struct rte_eth_dev *dev,
  
  		/* If the last flow is destroyed, disable fdir. */
  		if (!ret && TAILQ_EMPTY(&pf->fdir.fdir_list)) {
@@ -31,7 +32,7 @@
  			i40e_fdir_rx_proc_enable(dev, 0);
  		}
  		break;
-@@ -5343,8 +5342,6 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)
+@@ -4989,8 +4988,6 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)
  			pf->fdir.inset_flag[pctype] = 0;
  	}