Skip to contentSkip to conversation

net/i40e: fix flow director initialisation

PATCH Applied Bernard Iremonger 3 participants 3 messages Apr 7, 2020 – Apr 21, 2020 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/i40e: fix flow director initialisation

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")
---
 drivers/net/i40e/i40e_fdir.c | 4 ++--
 drivers/net/i40e/i40e_flow.c | 7 +------
 2 files changed, 3 insertions(+), 8 deletions(-)
drivers/net/i40e/i40e_fdir.c +2 -2
index 931f259..b603b33 100644
@@ -1689,8 +1689,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;
 	}
 
drivers/net/i40e/i40e_flow.c +1 -6
index d877ac2..8b6e1e4 100644
@@ -3394,8 +3394,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) {
@@ -3411,8 +3410,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;
@@ -4983,8 +4980,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;
Signature · 1 line
2.7.4
Acked-by on v1 1/1
#1 lore raw
Quoted 84 lines

-----Original Message-----
From: Iremonger, Bernard <[email protected]>
Sent: Tuesday, April 7, 2020 11:27 PM
To: [email protected]; Xing, Beilei <[email protected]>; Zhang, Qi Z <[email protected]>
Cc: Doherty, Declan <[email protected]>; Ananyev, Konstantin <[email protected]>; Shetty, Praveen <[email protected]>; Iremonger, Bernard <[email protected]>; [email protected]
Subject: [PATCH] net/i40e: fix flow director initialisation

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")
CC: [email protected]

---
 drivers/net/i40e/i40e_fdir.c | 4 ++--
 drivers/net/i40e/i40e_flow.c | 7 +------
 2 files changed, 3 insertions(+), 8 deletions(-)
drivers/net/i40e/i40e_fdir.c index renamed from drivers/net/i40e/i40e_fdir.c +0 -0

931f259..b603b33 100644

drivers/net/i40e/i40e_fdir.c +2 -2
@@ -1689,8 +1689,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");
drivers/net/i40e/i40e_fdir.c +0 -0
 		return -ENOTSUP;
 	}
drivers/net/i40e/i40e_flow.c index renamed from drivers/net/i40e/i40e_flow.c +0 -0

d877ac2..8b6e1e4 100644

drivers/net/i40e/i40e_flow.c +0 -1
@@ -3394,8 +3394,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 ||

drivers/net/i40e/i40e_flow.c +1 -3
-		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) {
@@ -3411,8 +3410,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;
 	}
drivers/net/i40e/i40e_flow.c +0 -3
 	return 0;
@@ -4983,8 +4980,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;
--
Quoted 1 line

2.7.4

Applied
#2 lore raw
In reply to Bernard Iremonger
Quoted 65 lines · Bernard Iremonger

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")

---
drivers/net/i40e/i40e_fdir.c | 4 ++--
drivers/net/i40e/i40e_flow.c | 7 +------

2 files changed, 3 insertions(+), 8 deletions(-)
drivers/net/i40e/i40e_fdir.c +2 -2
index 931f259..b603b33 100644
@@ -1689,8 +1689,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;
 	}
 
drivers/net/i40e/i40e_flow.c +1 -6
index d877ac2..8b6e1e4 100644
@@ -3394,8 +3394,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) {
@@ -3411,8 +3410,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;
@@ -4983,8 +4980,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;
Signature · 1 line
2.7.4

Applied to dpdk-next-net-intel, Thanks.