net/ice: fix memzone leak when device init failed
PATCH 1/1 net/ice: fix memzone leak when device init failed
When flow engine initialization or FXP resource reset failed, it needs to free the memory zone and unregister the interrupt callback.
Bugzilla ID: 752
--- drivers/net/ice/ice_ethdev.c | 10 ++++++++-- drivers/net/ice/ice_fdir_filter.c | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-)
drivers/net/ice/ice_ethdev.c +8 -2
@@ -2139,20 +2139,26 @@ ice_dev_init(struct rte_eth_dev *dev) ret =ice_flow_init (ad);if (ret) {PMD_INIT_LOG (ERR ,"Failed to initialize flow" ); -return ret; + goto err_flow_init; } } ret =ice_reset_fxp_resource (hw);if (ret) {PMD_INIT_LOG (ERR ,"Failed to reset fxp resource" ); -return ret; + goto err_flow_init; } pf->supported_rxdid =ice_get_supported_rxdid (hw);return 0 ; +err_flow_init: +ice_flow_uninit (ad); +rte_intr_disable (intr_handle); +ice_pf_disable_irq0 (hw); +rte_intr_callback_unregister (intr_handle, + ice_interrupt_handler, dev); err_pf_setup:ice_res_pool_destroy (&pf->msix_pool); err_msix_pool_init:
drivers/net/ice/ice_fdir_filter.c +2 -0
@@ -651,8 +651,10 @@ ice_fdir_teardown(struct ice_pf *pf)ice_tx_queue_release (pf->fdir.txq); pf->fdir.txq =NULL ; +rte_eth_dma_zone_free (eth_dev,"fdir_tx_ring" ,ICE_FDIR_QUEUE_ID );ice_rx_queue_release (pf->fdir.rxq); pf->fdir.rxq =NULL ; +rte_eth_dma_zone_free (eth_dev,"fdir_rx_ring" ,ICE_FDIR_QUEUE_ID );ice_fdir_prof_rm_all (pf);ice_fdir_prof_free (hw);ice_release_vsi (vsi);
Signature · 1 line
2.32.0
Quoted 22 lines · Haiyue Wang
When flow engine initialization or FXP resource reset failed, it needs to free the memory zone and unregister the interrupt callback.
Bugzilla ID: 752
Fixes 84dc7a95a2d3 ("net/ice: enable flow director engine")Fixes 7615a6895009 ("net/ice: rework for generic flow enabling")Fixes 7edc7158d771 ("net/ice: cleanup RSS/FDIR profile on device init")Reported-by David Marchand <[email protected]>Signed-off-by Haiyue Wang <[email protected]>--- drivers/net/ice/ice_ethdev.c | 10 ++++++++-- drivers/net/ice/ice_fdir_filter.c | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-)drivers/net/ice/ice_ethdev.c +0
-0
drivers/net/ice/ice_ethdev.c ice_dev_init(struct rte_eth_dev *dev) · line 2142
Quoted 5 lines
drivers/net/ice/ice_ethdev.c +1
-1@@ -2139,20 +2139,26 @@ ice_dev_init(struct rte_eth_dev *dev) ret =ice_flow_init (ad);if (ret) {PMD_INIT_LOG (ERR ,"Failed to initialize flow" ); -return ret; + goto err_flow_init;
Is it safe to call flow engine uninit callbacks when ice_flow_init() fails?
Quoted 23 lines
drivers/net/ice/ice_ethdev.c +7
-1} } ret =ice_reset_fxp_resource (hw);if (ret) {PMD_INIT_LOG (ERR ,"Failed to reset fxp resource" ); -return ret; + goto err_flow_init; } pf->supported_rxdid =ice_get_supported_rxdid (hw);return 0 ; +err_flow_init: +ice_flow_uninit (ad); +rte_intr_disable (intr_handle); +ice_pf_disable_irq0 (hw); +rte_intr_callback_unregister (intr_handle, + ice_interrupt_handler, dev); err_pf_setup:ice_res_pool_destroy (&pf->msix_pool); err_msix_pool_init:
Signature · 1 line
David Marchand
Quoted 27 lines
-----Original Message-----
From: David Marchand <[email protected]>
Sent: Tuesday, August 17, 2021 17:19
To: Wang, Haiyue <[email protected]>
Cc: dev <[email protected]>; Zhang, Qi Z <[email protected]>; dpdk stable <[email protected]>; Yang, Qiming <[email protected]>; Xiaolong Ye <[email protected]>; Xing, Beilei <[email protected]>; Wang, Ying A <[email protected]>
Subject: Re: [PATCH v1] net/ice: fix memzone leak when device init failedQuoted 17 lines · Haiyue Wang
When flow engine initialization or FXP resource reset failed, it needs to free the memory zone and unregister the interrupt callback.
Bugzilla ID: 752
Fixes 84dc7a95a2d3 ("net/ice: enable flow director engine")Fixes 7615a6895009 ("net/ice: rework for generic flow enabling")Fixes 7edc7158d771 ("net/ice: cleanup RSS/FDIR profile on device init")Reported-by David Marchand <[email protected]>Signed-off-by Haiyue Wang <[email protected]>--- drivers/net/ice/ice_ethdev.c | 10 ++++++++-- drivers/net/ice/ice_fdir_filter.c | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-)
Quoted 12 lines
drivers/net/ice/ice_ethdev.c ice_dev_init(struct rte_eth_dev *dev) · line 2142
Quoted 10 lines
drivers/net/ice/ice_ethdev.c +1
-1@@ -2139,20 +2139,26 @@ ice_dev_init(struct rte_eth_dev *dev) ret =ice_flow_init (ad);if (ret) {PMD_INIT_LOG (ERR ,"Failed to initialize flow" ); -return ret; + goto err_flow_init;Is it safe to call flow engine uninit callbacks when
ice_flow_init()fails?
If each engine->init/uninit handles its internal setting correctly, yes, it's safe, if not, this single engine has BUG, let's fix it. ;-)
intice_flow_init(struct ice_adapter *ad)
{
TAILQ_FOREACH_SAFE(engine, &engine_list, node, temp) {
if (engine->init == NULL) {
PMD_INIT_LOG(ERR, "Invalid engine type (%d)",
engine->type);
return -ENOTSUP;
}
ret = engine->init(ad);
if (ret) {
PMD_INIT_LOG(ERR, "Failed to initialize engine %d",
engine->type);
return ret;
}
}}
voidice_flow_uninit(struct ice_adapter *ad)
{
struct ice_pf *pf = &ad->pf;
struct ice_flow_engine *engine;
struct rte_flow *p_flow;
struct ice_flow_parser_node *p_parser;
void *temp;
TAILQ_FOREACH_SAFE(engine, &engine_list, node, temp) {
if (engine->uninit)
engine->uninit(ad);
}}
Quoted 29 lines
Quoted 15 lines
drivers/net/ice/ice_ethdev.c +1
-1} } ret =ice_reset_fxp_resource (hw);if (ret) {PMD_INIT_LOG (ERR ,"Failed to reset fxp resource" ); -return ret; + goto err_flow_init; } pf->supported_rxdid =ice_get_supported_rxdid (hw);return 0 ;drivers/net/ice/ice_ethdev.c ice_dev_init(struct rte_eth_dev *dev) · line 2164
Quoted 10 lines
drivers/net/ice/ice_ethdev.c +6
-0+err_flow_init: +ice_flow_uninit (ad); +rte_intr_disable (intr_handle); +ice_pf_disable_irq0 (hw); +rte_intr_callback_unregister (intr_handle, + ice_interrupt_handler, dev); err_pf_setup:ice_res_pool_destroy (&pf->msix_pool); err_msix_pool_init:--
David Marchand
Quoted 41 lines · Haiyue
Quoted 28 lines
-----Original Message-----
From: David Marchand <[email protected]>
Sent: Tuesday, August 17, 2021 17:19
To: Wang, Haiyue <[email protected]>
Cc: dev <[email protected]>; Zhang, Qi Z <[email protected]>; dpdk stable <[email protected]>; Yang, Qiming <[email protected]>; Xiaolong Ye <[email protected]>; Xing, Beilei <[email protected]>; Wang, Ying A <[email protected]>
Subject: Re: [PATCH v1] net/ice: fix memzone leak when device init failedQuoted 17 lines · Haiyue Wang
When flow engine initialization or FXP resource reset failed, it needs to free the memory zone and unregister the interrupt callback.
Bugzilla ID: 752
Fixes 84dc7a95a2d3 ("net/ice: enable flow director engine")Fixes 7615a6895009 ("net/ice: rework for generic flow enabling")Fixes 7edc7158d771 ("net/ice: cleanup RSS/FDIR profile on device init")Reported-by David Marchand <[email protected]>Signed-off-by Haiyue Wang <[email protected]>--- drivers/net/ice/ice_ethdev.c | 10 ++++++++-- drivers/net/ice/ice_fdir_filter.c | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-)Quoted 12 lines
drivers/net/ice/ice_ethdev.c ice_dev_init(struct rte_eth_dev *dev) · line 2142
Quoted 10 lines
drivers/net/ice/ice_ethdev.c +1
-1@@ -2139,20 +2139,26 @@ ice_dev_init(struct rte_eth_dev *dev) ret =ice_flow_init (ad);if (ret) {PMD_INIT_LOG (ERR ,"Failed to initialize flow" ); -return ret; + goto err_flow_init;Is it safe to call flow engine uninit callbacks when
ice_flow_init()fails?
Quoted 2 lines
If each engine->init/uninit handles its internal setting correctly, yes, it's safe, if not, this single engine has BUG, let's fix it. ;-)
That was my understanding, but I preferred to ask. Then, patch lgtm, thanks Haiyue.
Signature · 1 line
David Marchand
Quoted 16 lines
-----Original Message-----
From: Wang, Haiyue <[email protected]>
Sent: Friday, August 13, 2021 2:22 PM
To: [email protected]
Cc: Zhang, Qi Z <[email protected]>; Wang, Haiyue <[email protected]>; [email protected]; David Marchand <[email protected]>; Yang, Qiming <[email protected]>; Xiaolong Ye <[email protected]>; Xing, Beilei <[email protected]>; Wang, Ying A <[email protected]>
Subject: [PATCH v1] net/ice: fix memzone leak when device init failedWhen flow engine initialization or FXP resource reset failed, it needs to free the memory zone and unregister the interrupt callback.
Quoted 8 lines
Bugzilla ID: 752
Fixes 84dc7a95a2d3 ("net/ice: enable flow director engine")Fixes 7615a6895009 ("net/ice: rework for generic flow enabling")Fixes 7edc7158d771 ("net/ice: cleanup RSS/FDIR profile on device init")Reported-by David Marchand <[email protected]>Signed-off-by Haiyue Wang <[email protected]>
Applied dpdk-next-net-intel.
Thanks
Qi