[dpdk-stable] patch 'net/i40e: fix flush of flow director filter' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/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.

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/25b486624491329927a2d00c96fb2782ef2eeca0

Thanks.

Kevin.

---
>From 25b486624491329927a2d00c96fb2782ef2eeca0 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 98588d0113..088b92fdd1 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -4767,5 +4767,4 @@ 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);
 			dev->data->dev_conf.fdir_conf.mode =
 				   RTE_FDIR_MODE_NONE;
@@ -4963,6 +4962,4 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)
 	}
 
-	i40e_fdir_teardown(pf);
-
 	return ret;
 }
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:51.497159597 +0100
+++ 0010-net-i40e-fix-flush-of-flow-director-filter.patch	2020-06-05 19:20:50.720042858 +0100
@@ -1 +1 @@
-From 1491f63c75596b01b95355e395dde6795fab3c8b Mon Sep 17 00:00:00 2001
+From 25b486624491329927a2d00c96fb2782ef2eeca0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1491f63c75596b01b95355e395dde6795fab3c8b ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index 1533d5abbd..65f877866d 100644
+index 98588d0113..088b92fdd1 100644
@@ -26 +27 @@
-@@ -5146,5 +5146,4 @@ i40e_flow_destroy(struct rte_eth_dev *dev,
+@@ -4767,5 +4767,4 @@ i40e_flow_destroy(struct rte_eth_dev *dev,
@@ -30,3 +31,3 @@
- 			i40e_fdir_rx_proc_enable(dev, 0);
- 		}
-@@ -5344,6 +5343,4 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)
+ 			dev->data->dev_conf.fdir_conf.mode =
+ 				   RTE_FDIR_MODE_NONE;
+@@ -4963,6 +4962,4 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)