net/iavf: fix reset VF doesn't notify PF to reset
PATCH 1/1 net/iavf: fix reset VF doesn't notify PF to reset
When VF closed, the VF should notify PF to close/reset relative resources from PF side.
Check the VF RSS offload flag and ignore relative operation when iavf hash uninit to avoid reset/close error.
--- drivers/common/iavf/iavf_prototype.h | 1 + drivers/common/iavf/version.map | 1 + drivers/net/iavf/iavf_ethdev.c | 48 +++++++++++++++++++++++++++- drivers/net/iavf/iavf_hash.c | 9 ++++-- 4 files changed, 55 insertions(+), 4 deletions(-)
drivers/common/iavf/iavf_prototype.h +1 -0
@@ -83,6 +83,7 @@ void iavf_destroy_spinlock(struct iavf_spinlock *sp);__rte_internal void iavf_vf_parse_hw_config(struct iavf_hw *hw,struct virtchnl_vf_resource *msg); +__rte_internal enum iavf_status iavf_vf_reset(struct iavf_hw *hw);__rte_internal enum iavf_status iavf_aq_send_msg_to_pf(struct iavf_hw *hw,
drivers/common/iavf/version.map +1 -0
@@ -7,6 +7,7 @@ INTERNAL { iavf_set_mac_type; iavf_shutdown_adminq; iavf_vf_parse_hw_config; + iavf_vf_reset; local: *; };
drivers/net/iavf/iavf_ethdev.c +47 -1
66 lines not on this page · raw message
drivers/net/iavf/iavf_hash.c +6 -3
@@ -1093,10 +1093,13 @@ iavf_hash_uninit(struct iavf_adapter *ad)if (vf->vf_reset)return ; -if (iavf_hash_default_set (ad, false)) -PMD_DRV_LOG (ERR ,"fail to delete default RSS" ); +if (vf->vf_res && + vf->vf_res->vf_cap_flags &VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF ) { +if (iavf_hash_default_set (ad, false)) +PMD_DRV_LOG (ERR ,"fail to delete default RSS" ); -iavf_unregister_parser (&iavf_hash_parser, ad); +iavf_unregister_parser (&iavf_hash_parser, ad); + } } static void
Signature · 1 line
2.17.1
Quoted 11 lines
-----Original Message-----
From: Steve Yang <[email protected]>
Sent: Thursday, November 5, 2020 4:32 PM
To: [email protected]
Cc: Yang, Qiming <[email protected]>; Xing, Beilei <[email protected]>; Wu, Jingjing <[email protected]>; Yang, SteveX <[email protected]>
Subject: [PATCH v1] net/iavf: fix reset VF doesn't notify PF to reset
Quoted 5 lines
When VF closed, the VF should notify PF to close/reset relative resources from PF side.
Check the VF RSS offload flag and ignore relative operation when iavf hash uninit to avoid reset/close error.
Seems there're 2 bug fix in the patch, it's better to split.
Is the fix ported from i40evf?
For vf_reset, I think there's another patch needed backport: commit 0eaa1f8c75311b96d269a0195b80e80d6c27e83c
Quoted 130 lines
Fixes 22b123a36d07 ("net/avf: initialize PMD")Signed-off-by Steve Yang <[email protected]>--- drivers/common/iavf/iavf_prototype.h | 1 + drivers/common/iavf/version.map | 1 + drivers/net/iavf/iavf_ethdev.c | 48 +++++++++++++++++++++++++++- drivers/net/iavf/iavf_hash.c | 9 ++++-- 4 files changed, 55 insertions(+), 4 deletions(-)drivers/common/iavf/iavf_prototype.h +1
-0@@ -83,6 +83,7 @@ void iavf_destroy_spinlock(struct iavf_spinlock *sp); __rte_internal void iavf_vf_parse_hw_config(struct iavf_hw *hw,struct virtchnl_vf_resource *msg); +__rte_internal enum iavf_status iavf_vf_reset(struct iavf_hw *hw); __rte_internal enum
iavf_statusiavf_aq_send_msg_to_pf(structiavf_hw*hw, diff --git a/drivers/common/iavf/version.map b/drivers/common/iavf/version.map indexe0f117197c..6c1427cca4100644drivers/common/iavf/version.map +1
-0@@ -7,6 +7,7 @@ INTERNAL { iavf_set_mac_type; iavf_shutdown_adminq; iavf_vf_parse_hw_config; + iavf_vf_reset; local: *; };drivers/net/iavf/iavf_ethdev.c +47
-1@@ -1780,6 +1780,34 @@ iavf_init_proto_xtr(struct rte_eth_dev *dev) } } +static int +iavf_reset_vf (struct iavf_hw *hw) +{ +int ret; +if (iavf_vf_reset (hw) !=IAVF_SUCCESS ) { +PMD_INIT_LOG (ERR ,"Reset VF NIC failed" ); +return -1 ; + } +/** +* After issuing vf reset command to pf, pf won't necessarily +* reset vf, it depends on what state it exactly is. If it's not +* initialized yet, it won't have vf reset since it's in a certain +* state. If not, it will try to reset. Even vf is reset, pf will +* set I40E_VFGEN_RSTAT to COMPLETE first, then wait 10ms and set +* it to ACTIVE. In this duration, vf may not catch the moment that +* COMPLETE is set. So, for vf, we'll try to wait a long time. +*/ +rte_delay_ms (200 ); + + ret =iavf_check_vf_reset_done (hw); +if (ret) { +PMD_INIT_LOG (ERR ,"VF is still resetting" ); +return ret; + } + +return 0 ; +} +static int iavf_init_vf (struct rte_eth_dev *dev) {@@ -1814,6 +1842,24 @@ iavf_init_vf(struct rte_eth_dev *dev) goto err; } +/* Reset VF and wait until it's complete */ +if (iavf_reset_vf (hw)) { +PMD_INIT_LOG (ERR ,"reset NIC failed" ); + goto err_aq; + } + +/* VF reset, shutdown admin queue and initialize again */ +if (iavf_shutdown_adminq (hw) !=IAVF_SUCCESS ) { +PMD_INIT_LOG (ERR ,"iavf_shutdown_adminq failed" ); + goto err; + } + +iavf_init_adminq_parameter (hw); +if (iavf_init_adminq (hw) !=IAVF_SUCCESS ) { +PMD_INIT_LOG (ERR ,"init_adminq failed" ); + goto err; + } + vf->aq_resp =rte_zmalloc ("vf_aq_resp" ,IAVF_AQ_BUF_SZ ,0 );if (!vf->aq_resp) {PMD_INIT_LOG (ERR ,"unable to allocate vf_aq_resp memory" );@@ -2050,7 +2096,7 @@ iavf_dev_close(struct rte_eth_dev *dev)iavf_flow_flush (dev,NULL );iavf_flow_uninit (adapter); - +iavf_reset_vf (hw);/* * disable promiscuous mode before reset vf * it is a workaround solution when work with kernel driver diff --git
a/drivers/net/iavf/iavf_hash.cb/drivers/net/iavf/iavf_hash.cindex8a5a6bb5a4..d3e9218f75100644drivers/net/iavf/iavf_hash.c +6
-4@@ -1093,10 +1093,13 @@ iavf_hash_uninit(struct iavf_adapter *ad)if (vf->vf_reset)return ; -if (iavf_hash_default_set (ad, false)) -PMD_DRV_LOG (ERR ,"fail to delete default RSS" ); +if (vf->vf_res && + vf->vf_res->vf_cap_flags &VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF ) { +if (iavf_hash_default_set (ad, false)) +PMD_DRV_LOG (ERR ,"fail to delete default RSS" ); -iavf_unregister_parser (&iavf_hash_parser, ad); +iavf_unregister_parser (&iavf_hash_parser, ad); + } } static void --2.17.1
v2 cover net/iavf: backported bug fixes from i40evf to iavf
In reply to Steve YangWhen VF closed, the VF should notify PF to close/reset relative resources from PF side.
Check the VF RSS offload flag and ignore relative operation when iavf hash uninit to avoid reset/close error.
---
v2:
* split to 2 patches;
* added patch backport: commit 0eaa1f8c75
Steve Yang (2):
net/iavf: fix reset VF doesn't notify PF to reset net/iavf: fix the RSS error when VF port closed
drivers/common/iavf/iavf_prototype.h | 1 + drivers/common/iavf/version.map | 1 + drivers/net/iavf/iavf_ethdev.c | 57 ++++++++++++++++++++++++++-- drivers/net/iavf/iavf_hash.c | 9 +++-- 4 files changed, 62 insertions(+), 6 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/2 net/iavf: fix reset VF doesn't notify PF to reset
When VF closed, the VF should notify PF to close/reset relative resources from PF side.
--- drivers/common/iavf/iavf_prototype.h | 1 + drivers/common/iavf/version.map | 1 + drivers/net/iavf/iavf_ethdev.c | 57 ++++++++++++++++++++++++++-- 3 files changed, 56 insertions(+), 3 deletions(-)
drivers/common/iavf/iavf_prototype.h +1 -0
@@ -83,6 +83,7 @@ void iavf_destroy_spinlock(struct iavf_spinlock *sp);__rte_internal void iavf_vf_parse_hw_config(struct iavf_hw *hw,struct virtchnl_vf_resource *msg); +__rte_internal enum iavf_status iavf_vf_reset(struct iavf_hw *hw);__rte_internal enum iavf_status iavf_aq_send_msg_to_pf(struct iavf_hw *hw,
drivers/common/iavf/version.map +1 -0
@@ -7,6 +7,7 @@ INTERNAL { iavf_set_mac_type; iavf_shutdown_adminq; iavf_vf_parse_hw_config; + iavf_vf_reset; local: *; };
drivers/net/iavf/iavf_ethdev.c +54 -3
94 lines not on this page · raw message
Signature · 1 line
2.17.1
Quoted 11 lines
-----Original Message-----
From: Steve Yang <[email protected]>
Sent: Monday, November 9, 2020 2:52 PM
To: [email protected]
Cc: Yang, Qiming <[email protected]>; Xing, Beilei <[email protected]>; Wu, Jingjing <[email protected]>; Yang, SteveX <[email protected]>
Subject: [PATCH v2 1/2] net/iavf: fix reset VF doesn't notify PF to reset
Quoted 2 lines
When VF closed, the VF should notify PF to close/reset relative resources from PF side.
The commit log and title should be refined since this patch includes ' notify PF to reset ' and 'clear VF reset flag', right?
If it's hard to summarize, it's better to split.
Quoted 4 lines
Fixes 22b123a36d07 ("net/avf: initialize PMD")Signed-off-by Steve Yang <[email protected]>
PATCH v2 2/2 net/iavf: fix the RSS error when VF port closed
In reply to Steve YangCheck the VF RSS offload flag and ignore relative operation when iavf hash uninit to avoid reset/close error.
--- drivers/net/iavf/iavf_hash.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/iavf/iavf_hash.c +6 -3
@@ -1093,10 +1093,13 @@ iavf_hash_uninit(struct iavf_adapter *ad)if (vf->vf_reset)return ; -if (iavf_hash_default_set (ad, false)) -PMD_DRV_LOG (ERR ,"fail to delete default RSS" ); +if (vf->vf_res && + vf->vf_res->vf_cap_flags &VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF ) { +if (iavf_hash_default_set (ad, false)) +PMD_DRV_LOG (ERR ,"fail to delete default RSS" ); -iavf_unregister_parser (&iavf_hash_parser, ad); +iavf_unregister_parser (&iavf_hash_parser, ad); + } } static void
Signature · 1 line
2.17.1
Re: [dpdk-dev] [PATCH v2 2/2] net/iavf: fix the RSS error when VF port closed
Quoted 27 lines
-----Original Message-----
From: dev <[email protected]> On Behalf Of Steve Yang
Sent: Monday, November 9, 2020 2:52 PM
To: [email protected]
Cc: Yang, Qiming <[email protected]>; Xing, Beilei <[email protected]>; Wu, Jingjing <[email protected]>; Yang, SteveX <[email protected]>
Subject: [dpdk-dev] [PATCH v2 2/2] net/iavf: fix the RSS error when VF port closedCheck the VF RSS offload flag and ignore relative operation when iavf hash uninit to avoid reset/close error.
Fixes 7be10c3004be ("net/iavf: add RSS configuration for VF")Signed-off-by Steve Yang <[email protected]>--- drivers/net/iavf/iavf_hash.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)drivers/net/iavf/iavf_hash.c index renamed from drivers/net/iavf/iavf_hash.c +0
-0
8a5a6bb5a4..d3e9218f75100644
drivers/net/iavf/iavf_hash.c iavf_hash_uninit(struct iavf_adapter *ad) · line 1099
Quoted 9 lines
drivers/net/iavf/iavf_hash.c +4
-2@@ -1093,10 +1093,13 @@ iavf_hash_uninit(struct iavf_adapter *ad)if (vf->vf_reset)return ; -if (iavf_hash_default_set (ad, false)) -PMD_DRV_LOG (ERR ,"fail to delete default RSS" ); +if (vf->vf_res && + vf->vf_res->vf_cap_flags &VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF ) { +if (iavf_hash_default_set (ad, false)) +PMD_DRV_LOG (ERR ,"fail to delete default RSS" );
Better to follow the same pattern in ice_hash_init, return immediate when check something wrong.
Quoted 9 lines
drivers/net/iavf/iavf_hash.c +2
-2-iavf_unregister_parser (&iavf_hash_parser, ad); +iavf_unregister_parser (&iavf_hash_parser, ad); + } } static void --2.17.1
v2 cover net/iavf: backported bug fixes from i40evf to iavf
In reply to Steve YangWhen VF closed, the VF should notify PF to close/reset relative resources from PF side.
Check the VF RSS offload flag and ignore relative operation when iavf hash uninit to avoid reset/close error.
---
v3:
* changed code pattern for 'ice_hash_uninit'.
v2:
* split to 2 patches;
* added patch backport: commit 0eaa1f8c75
Steve Yang (2):
net/iavf: fix reset VF doesn't notify PF to reset net/iavf: fix the RSS error when VF port closed
drivers/common/iavf/iavf_prototype.h | 1 + drivers/common/iavf/version.map | 1 + drivers/net/iavf/iavf_ethdev.c | 57 ++++++++++++++++++++++++++-- drivers/net/iavf/iavf_hash.c | 6 +++ 4 files changed, 62 insertions(+), 3 deletions(-)
Signature · 1 line
2.17.1
PATCH v3 1/2 net/iavf: fix reset VF doesn't notify PF to reset
When VF closed, the VF should notify PF to close/reset relative resources from PF side.
--- drivers/common/iavf/iavf_prototype.h | 1 + drivers/common/iavf/version.map | 1 + drivers/net/iavf/iavf_ethdev.c | 57 ++++++++++++++++++++++++++-- 3 files changed, 56 insertions(+), 3 deletions(-)
drivers/common/iavf/iavf_prototype.h +1 -0
@@ -83,6 +83,7 @@ void iavf_destroy_spinlock(struct iavf_spinlock *sp);__rte_internal void iavf_vf_parse_hw_config(struct iavf_hw *hw,struct virtchnl_vf_resource *msg); +__rte_internal enum iavf_status iavf_vf_reset(struct iavf_hw *hw);__rte_internal enum iavf_status iavf_aq_send_msg_to_pf(struct iavf_hw *hw,
drivers/common/iavf/version.map +1 -0
@@ -7,6 +7,7 @@ INTERNAL { iavf_set_mac_type; iavf_shutdown_adminq; iavf_vf_parse_hw_config; + iavf_vf_reset; local: *; };
drivers/net/iavf/iavf_ethdev.c +54 -3
94 lines not on this page · raw message
Signature · 1 line
2.17.1
Quoted 11 lines
-----Original Message-----
From: Steve Yang <[email protected]>
Sent: Friday, November 13, 2020 8:47 AM
To: [email protected]
Cc: Yang, Qiming <[email protected]>; Xing, Beilei <[email protected]>; Wu, Jingjing <[email protected]>; Zhang, Qi Z <[email protected]>; Yang, SteveX <[email protected]>
Subject: [PATCH v3 1/2] net/iavf: fix reset VF doesn't notify PF to reset
Quoted 6 lines
When VF closed, the VF should notify PF to close/reset relative resources from PF side.
Fixes 22b123a36d07 ("net/avf: initialize PMD")Signed-off-by Steve Yang <[email protected]>
No need this patch since there'll be PCI reset during VF init/close. So nack it.
PATCH v3 2/2 net/iavf: fix the RSS error when VF port closed
In reply to Steve YangCheck the VF RSS offload flag and ignore relative operation when iavf hash uninit to avoid reset/close error.
--- drivers/net/iavf/iavf_hash.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/iavf/iavf_hash.c +6 -0
@@ -1093,6 +1093,12 @@ iavf_hash_uninit(struct iavf_adapter *ad)if (vf->vf_reset)return ; +if (!vf->vf_res) +return ; + +if (!(vf->vf_res->vf_cap_flags &VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF )) +return ; +if (iavf_hash_default_set (ad, false))PMD_DRV_LOG (ERR ,"fail to delete default RSS" );
Signature · 1 line
2.17.1
Re: [dpdk-dev] [PATCH v3 2/2] net/iavf: fix the RSS error when VF port closed
Quoted 11 lines
-----Original Message-----
From: Steve Yang <[email protected]>
Sent: Friday, November 13, 2020 8:47 AM
To: [email protected]
Cc: Yang, Qiming <[email protected]>; Xing, Beilei <[email protected]>; Wu, Jingjing <[email protected]>; Zhang, Qi Z <[email protected]>; Yang, SteveX <[email protected]>
Subject: [PATCH v3 2/2] net/iavf: fix the RSS error when VF port closed
Quoted 6 lines
Check the VF RSS offload flag and ignore relative operation when iavf hash uninit to avoid reset/close error.
Fixes 7be10c3004be ("net/iavf: add RSS configuration for VF")Signed-off-by Steve Yang <[email protected]>
Applied to dpdk-next-net-intel.
Thanks
Qi