From 96b25c496aadae16c548ea25c0267a73154dbd64 Mon Sep 17 00:00:00 2001 From: Haiyue Wang Date: Fri, 13 Aug 2021 14:21:54 +0800 Subject: [PATCH] net/ice: fix memzone leak after device init failure 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") Cc: stable@dpdk.org Reported-by: David Marchand Signed-off-by: Haiyue Wang Acked-by: Qi Zhang --- drivers/net/ice/ice_ethdev.c | 10 ++++++++-- drivers/net/ice/ice_fdir_filter.c | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index a4cd39c954..0683296584 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -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: diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c index 82adb1fc8b..7ba65b9b04 100644 --- a/drivers/net/ice/ice_fdir_filter.c +++ b/drivers/net/ice/ice_fdir_filter.c @@ -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); -- 2.20.1