[dpdk-stable] patch 'net/i40e: fix flow director initialisation' 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 461a2ba67a7e9836cd99aab3d0d585eed317c5bd Mon Sep 17 00:00:00 2001
From: Bernard Iremonger <bernard.iremonger at intel.com>
Date: Tue, 7 Apr 2020 16:26:41 +0100
Subject: [PATCH] net/i40e: fix flow director initialisation

[ upstream commit ae08c73e6f55e62e402fcdbfa6e8e967bf4bc5cc ]

Remove references to struct rte_fdir_conf which is deprecated,
in i40e_flow_parse_fdir_filter(), i40e_flow_destroy() and
i40e_flow_add_del_fdir_filter().

Fixes: c3be43817cfb ("net/i40e: fix unexpected skip FDIR setup")
Fixes: 2e67a7fbf3ff ("net/i40e: config flow director automatically")
Fixes: 4149825bbdb9 ("net/i40e: finish integration FDIR with generic flow API")

Signed-off-by: Bernard Iremonger <bernard.iremonger at intel.com>
Acked-by: Beilei Xing <beilei.xing at intel.com>
---
 drivers/net/i40e/i40e_fdir.c | 4 ++--
 drivers/net/i40e/i40e_flow.c | 7 +------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c
index dee007daae..239cdbf522 100644
--- a/drivers/net/i40e/i40e_fdir.c
+++ b/drivers/net/i40e/i40e_fdir.c
@@ -1559,8 +1559,8 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev,
 	struct i40e_fdir_filter check_filter; /* Check if the filter exists */
 	int ret = 0;
 
-	if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_PERFECT) {
-		PMD_DRV_LOG(ERR, "FDIR is not enabled, please check the mode in fdir_conf.");
+	if (pf->fdir.fdir_vsi == NULL) {
+		PMD_DRV_LOG(ERR, "FDIR is not enabled");
 		return -ENOTSUP;
 	}
 
diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index 61021037c8..a5bd1c7783 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -3208,8 +3208,7 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev,
 
 	cons_filter_type = RTE_ETH_FILTER_FDIR;
 
-	if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_PERFECT ||
-		pf->fdir.fdir_vsi == NULL) {
+	if (pf->fdir.fdir_vsi == NULL) {
 		/* Enable fdir when fdir flow is added at first time. */
 		ret = i40e_fdir_setup(pf);
 		if (ret != I40E_SUCCESS) {
@@ -3225,8 +3224,6 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev,
 					   NULL, "Failed to configure fdir.");
 			goto err;
 		}
-
-		dev->data->dev_conf.fdir_conf.mode = RTE_FDIR_MODE_PERFECT;
 	}
 
 	return 0;
@@ -4797,8 +4794,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);
-			dev->data->dev_conf.fdir_conf.mode =
-				   RTE_FDIR_MODE_NONE;
 			i40e_fdir_rx_proc_enable(dev, 0);
 		}
 		break;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:48.646677538 +0100
+++ 0103-net-i40e-fix-flow-director-initialisation.patch	2020-05-19 14:04:44.320650258 +0100
@@ -1,8 +1,10 @@
-From ae08c73e6f55e62e402fcdbfa6e8e967bf4bc5cc Mon Sep 17 00:00:00 2001
+From 461a2ba67a7e9836cd99aab3d0d585eed317c5bd Mon Sep 17 00:00:00 2001
 From: Bernard Iremonger <bernard.iremonger at intel.com>
 Date: Tue, 7 Apr 2020 16:26:41 +0100
 Subject: [PATCH] net/i40e: fix flow director initialisation
 
+[ upstream commit ae08c73e6f55e62e402fcdbfa6e8e967bf4bc5cc ]
+
 Remove references to struct rte_fdir_conf which is deprecated,
 in i40e_flow_parse_fdir_filter(), i40e_flow_destroy() and
 i40e_flow_add_del_fdir_filter().
@@ -10,7 +12,6 @@
 Fixes: c3be43817cfb ("net/i40e: fix unexpected skip FDIR setup")
 Fixes: 2e67a7fbf3ff ("net/i40e: config flow director automatically")
 Fixes: 4149825bbdb9 ("net/i40e: finish integration FDIR with generic flow API")
-Cc: stable at dpdk.org
 
 Signed-off-by: Bernard Iremonger <bernard.iremonger at intel.com>
 Acked-by: Beilei Xing <beilei.xing at intel.com>
@@ -20,10 +21,10 @@
  2 files changed, 3 insertions(+), 8 deletions(-)
 
 diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c
-index 2f24615b65..d59399afea 100644
+index dee007daae..239cdbf522 100644
 --- a/drivers/net/i40e/i40e_fdir.c
 +++ b/drivers/net/i40e/i40e_fdir.c
-@@ -1695,8 +1695,8 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev,
+@@ -1559,8 +1559,8 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev,
  	struct i40e_fdir_filter check_filter; /* Check if the filter exists */
  	int ret = 0;
  
@@ -35,10 +36,10 @@
  	}
  
 diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
-index d1bc960843..7e64ae53a3 100644
+index 61021037c8..a5bd1c7783 100644
 --- a/drivers/net/i40e/i40e_flow.c
 +++ b/drivers/net/i40e/i40e_flow.c
-@@ -3445,8 +3445,7 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev,
+@@ -3208,8 +3208,7 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev,
  
  	cons_filter_type = RTE_ETH_FILTER_FDIR;
  
@@ -48,7 +49,7 @@
  		/* Enable fdir when fdir flow is added at first time. */
  		ret = i40e_fdir_setup(pf);
  		if (ret != I40E_SUCCESS) {
-@@ -3462,8 +3461,6 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev,
+@@ -3225,8 +3224,6 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev,
  					   NULL, "Failed to configure fdir.");
  			goto err;
  		}
@@ -57,7 +58,7 @@
  	}
  
  	return 0;
-@@ -5151,8 +5148,6 @@ i40e_flow_destroy(struct rte_eth_dev *dev,
+@@ -4797,8 +4794,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);