net/iavf: fix VF reset issue for FDIR rule
PATCH 1/1 net/iavf: fix VF reset issue for FDIR rule
After VF reset, FDIR rule still takes effect. To solve the issue, this patch adds to flush all flows before flow uninit. VIRTCHNL sends message to PF by Admin Queue, so flow flush should be implemented before Admin Queue shut down.
--- drivers/net/iavf/iavf_ethdev.c | 1 + drivers/net/iavf/iavf_generic_flow.c | 4 +--- drivers/net/iavf/iavf_generic_flow.h | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-)
drivers/net/iavf/iavf_ethdev.c +1 -0
@@ -1431,6 +1431,7 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev,IAVF_DEV_PRIVATE_TO_ADAPTER (dev->data->dev_private);iavf_dev_stop (dev); +iavf_flow_flush (dev,NULL );iavf_shutdown_adminq (hw);/* disable uio intr before callback unregister */ rte_intr_disable (intr_handle);
drivers/net/iavf/iavf_generic_flow.c +1 -3
@@ -34,8 +34,6 @@ static struct rte_flow *iavf_flow_create(struct rte_eth_dev *dev,static int iavf_flow_destroy (struct rte_eth_dev *dev,struct rte_flow *flow,struct rte_flow_error *error); -static int iavf_flow_flush (struct rte_eth_dev *dev, -struct rte_flow_error *error); static int iavf_flow_query(struct rte_eth_dev *dev, struct rte_flow *flow, const struct rte_flow_action *actions,
@@ -966,7 +964,7 @@ struct iavf_pattern_match_item *return ret; } -static int +int iavf_flow_flush (struct rte_eth_dev *dev,struct rte_flow_error *error) {
drivers/net/iavf/iavf_generic_flow.h +2 -0
@@ -306,6 +306,8 @@ struct iavf_flow_parser_node {void iavf_register_flow_engine (struct iavf_flow_engine *engine);int iavf_flow_init (struct iavf_adapter *ad);void iavf_flow_uninit (struct iavf_adapter *ad); +int iavf_flow_flush (struct rte_eth_dev *dev, +struct rte_flow_error *error);int iavf_register_parser (struct iavf_flow_parser *parser,struct iavf_adapter *ad); void iavf_unregister_parser(struct iavf_flow_parser *parser,
Signature · 1 line
1.8.3.1
Quoted 64 lines · Simei Su
After VF reset, FDIR rule still takes effect. To solve the issue, this patch adds to flush all flows before flow uninit. VIRTCHNL sends message to PF by Admin Queue, so flow flush should be implemented before Admin Queue shut down.
Fixes c6ea8bd9f11f ("net/iavf: support generic flow")Signed-off-by Simei Su <[email protected]>---
drivers/net/iavf/iavf_ethdev.c | 1 + drivers/net/iavf/iavf_generic_flow.c | 4 +--- drivers/net/iavf/iavf_generic_flow.h | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-)drivers/net/iavf/iavf_ethdev.c +1
-0@@ -1431,6 +1431,7 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev,IAVF_DEV_PRIVATE_TO_ADAPTER (dev->data->dev_private);iavf_dev_stop (dev); +iavf_flow_flush (dev,NULL );iavf_shutdown_adminq (hw);/* disable uio intr before callback unregister */ rte_intr_disable (intr_handle);drivers/net/iavf/iavf_generic_flow.c +1
-3@@ -34,8 +34,6 @@ static struct rte_flow *iavf_flow_create(struct rte_eth_dev *dev,static int iavf_flow_destroy (struct rte_eth_dev *dev,struct rte_flow *flow,struct rte_flow_error *error); -static int iavf_flow_flush (struct rte_eth_dev *dev, -struct rte_flow_error *error); static int iavf_flow_query(struct rte_eth_dev *dev, struct rte_flow *flow, const struct rte_flow_action *actions,@@ -966,7 +964,7 @@ struct iavf_pattern_match_item *return ret; } -static int +int iavf_flow_flush (struct rte_eth_dev *dev,struct rte_flow_error *error) {drivers/net/iavf/iavf_generic_flow.h +2
-0@@ -306,6 +306,8 @@ struct iavf_flow_parser_node {void iavf_register_flow_engine (struct iavf_flow_engine *engine);int iavf_flow_init (struct iavf_adapter *ad);void iavf_flow_uninit (struct iavf_adapter *ad); +int iavf_flow_flush (struct rte_eth_dev *dev, +struct rte_flow_error *error);int iavf_register_parser (struct iavf_flow_parser *parser,struct iavf_adapter *ad); void iavf_unregister_parser(struct iavf_flow_parser *parser,Signature · 1 line
1.8.3.1
Applied to dpdk-next-net-intel, Thanks.
Test-by Peng, Yuan <[email protected]>
-----Original Message-----
From: dev <[email protected]> On Behalf Of Simei Su
Sent: Tuesday, April 28, 2020 1:49 PM
To: Zhang, Qi Z <[email protected]>; Ye, Xiaolong <[email protected]>; Wu, Jingjing <[email protected]>
Cc: [email protected]; Cao, Yahui <[email protected]>; Su, Simei <[email protected]>
Subject: [dpdk-dev] [PATCH] net/iavf: fix VF reset issue for FDIR rule
After VF reset, FDIR rule still takes effect. To solve the issue, this patch adds to flush all flows before flow uninit. VIRTCHNL sends message to PF by Admin Queue, so flow flush should be implemented before Admin Queue shut down.
--- drivers/net/iavf/iavf_ethdev.c | 1 + drivers/net/iavf/iavf_generic_flow.c | 4 +--- drivers/net/iavf/iavf_generic_flow.h | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-)
drivers/net/iavf/iavf_ethdev.c +1 -0
@@ -1431,6 +1431,7 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev,IAVF_DEV_PRIVATE_TO_ADAPTER (dev->data->dev_private);iavf_dev_stop (dev); +iavf_flow_flush (dev,NULL );iavf_shutdown_adminq (hw);/* disable uio intr before callback unregister */ rte_intr_disable (intr_handle);
drivers/net/iavf/iavf_generic_flow.c +0 -2
@@ -34,8 +34,6 @@ static struct rte_flow *iavf_flow_create(struct rte_eth_dev *dev, static int iavf_flow_destroy(struct rte_eth_dev *dev,struct rte_flow *flow, struct rte_flow_error *error); -static int iavf_flow_flush (struct rte_eth_dev *dev, -struct rte_flow_error *error); static int iavf_flow_query(struct rte_eth_dev *dev, struct rte_flow *flow, const struct rte_flow_action *actions, @@ -966,7 +964,7 @@ struct iavf_pattern_match_item * return ret;
}
-static int
+int
iavf_flow_flush(struct rte_eth_dev *dev,
struct rte_flow_error *error)
{
drivers/net/iavf/iavf_generic_flow.h +2 -1
@@ -306,6 +306,8 @@ struct iavf_flow_parser_node { void iavf_register_flow_engine(struct iavf_flow_engine *engine); int iavf_flow_init(struct iavf_adapter *ad); void iavf_flow_uninit(struct iavf_adapter *ad); +int iavf_flow_flush (struct rte_eth_dev *dev, +struct rte_flow_error *error);int iavf_register_parser (struct iavf_flow_parser *parser,struct iavf_adapter *ad); void iavf_unregister_parser(struct iavf_flow_parser *parser, --
1.8.3.1