net/iavf: fix flow flush after PF reset
PATCH 1/1 net/iavf: fix flow flush after PF reset
When VF begin reset after PF reset, VF will be uninitialized at first and then be initialized, during the time any invalid cmd such as flow flush should not be sent to PF until the uninitialization is finished.
--- drivers/net/iavf/iavf_ethdev.c | 4 ++-- drivers/net/iavf/iavf_hash.c | 4 ++++ drivers/net/iavf/iavf_vchnl.c | 7 ++++--- 3 files changed, 10 insertions(+), 5 deletions(-)
drivers/net/iavf/iavf_ethdev.c +2 -2
@@ -1677,8 +1677,6 @@ iavf_init_vf(struct rte_eth_dev *dev) } } - vf->vf_reset = false; -iavf_init_proto_xtr (dev);return 0 ;
@@ -1900,6 +1898,8 @@ iavf_dev_close(struct rte_eth_dev *dev)rte_free (vf->aq_resp); vf->aq_resp =NULL ; + + vf->vf_reset = false; } static int
drivers/net/iavf/iavf_hash.c +4 -0
@@ -1034,9 +1034,13 @@ iavf_hash_destroy(__rte_unused struct iavf_adapter *ad,struct rte_flow *flow, __rte_unused struct rte_flow_error *error) { + struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(ad);struct virtchnl_rss_cfg *rss_cfg;int ret =0 ; +if (vf->vf_reset) +return 0 ; + rss_cfg = (struct virtchnl_rss_cfg *)flow->rule; ret =iavf_add_del_rss_cfg (ad, rss_cfg, false);
drivers/net/iavf/iavf_vchnl.c +4 -3
@@ -73,12 +73,12 @@ iavf_execute_vf_cmd(struct iavf_adapter *adapter, struct iavf_cmd_info *args)int err =0 ;int i =0 ; -if (_atomic_set_cmd (vf, args->ops)) -return -1 ; -if (vf->vf_reset)return -EIO ; +if (_atomic_set_cmd (vf, args->ops)) +return -1 ; + ret =iavf_aq_send_msg_to_pf (hw, args->ops,IAVF_SUCCESS , args->in_args, args->in_args_size,NULL );if (ret) {
@@ -189,6 +189,7 @@ iavf_handle_pf_event_msg(struct rte_eth_dev *dev, uint8_t *msg,switch (pf_msg->event) {case VIRTCHNL_EVENT_RESET_IMPENDING :PMD_DRV_LOG (DEBUG ,"VIRTCHNL_EVENT_RESET_IMPENDING event" ); + vf->vf_reset = true;rte_eth_dev_callback_process (dev,RTE_ETH_EVENT_INTR_RESET ,NULL );break ;
Signature · 1 line
2.20.1
Quoted 10 lines
-----Original Message-----
From: Guo, Jia <[email protected]>
Sent: Wednesday, September 30, 2020 1:44 PM
To: Wu, Jingjing <[email protected]>; Zhang, Qi Z <[email protected]>; Xing, Beilei <[email protected]>
Cc: [email protected]; Guo, Jia <[email protected]>
Subject: [PATCH v1] net/iavf: fix flow flush after PF reset
Quoted 5 lines
When VF begin reset after PF reset, VF will be uninitialized at first and then be initialized, during the time any invalid cmd such as flow flush should not be sent to PF until the uninitialization is finished.
Fixes 1eab95fe2e36 ("net/iavf: fix command after PF reset")
as cc stable is required for the patch to fix.
so cc stable is also required for this patch.
Quoted 1 line
Signed-off-by Jeff Guo <[email protected]>
Applied to dpdk-next-net-intel.
Thanks
Qi