net/hinic: fix the problem of hugepage memory leaks
PATCH v2 1/1 net/hinic: fix the problem of hugepage memory leaks
The nic_io memory sets to NULL before free it, this is wrong, and the freeing of some private port resources should be moved from the ".remove(device)" function to the ".dev_close(port)" function.
Fixes f30e69b41f94 ("ethdev: add device flag to bypass auto-filled queue xstats")
Signed-off-by Guoyang Zhou <[email protected]>
---
v2:
- correct the incorrect words in the comments.
--- drivers/net/hinic/base/hinic_pmd_nicio.c | 1 - drivers/net/hinic/hinic_pmd_ethdev.c | 17 ++++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-)
drivers/net/hinic/base/hinic_pmd_nicio.c +0 -1
@@ -664,7 +664,6 @@ static int hinic_init_nic_hwdev(struct hinic_hwdev *hwdev)static void hinic_free_nic_hwdev (struct hinic_hwdev *hwdev) {hinic_vf_func_free (hwdev); - hwdev->nic_io =NULL ; }int hinic_rx_tx_flush (struct hinic_hwdev *hwdev)
drivers/net/hinic/hinic_pmd_ethdev.c +8 -9
@@ -1268,6 +1268,8 @@ static void hinic_disable_interrupt(struct rte_eth_dev *dev)if (retries ==HINIC_INTR_CB_UNREG_MAX_RETRIES )PMD_DRV_LOG (ERR ,"Unregister intr callback failed after %d retries" , retries); + +rte_bit_relaxed_clear32 (HINIC_DEV_INIT , &nic_dev->dev_status); }static int hinic_set_dev_promiscuous (struct hinic_nic_dev *nic_dev,bool enable)
@@ -1540,6 +1542,9 @@ static void hinic_deinit_mac_addr(struct rte_eth_dev *eth_dev)/* delete multicast mac addrs */ hinic_delete_mc_addr_list (nic_dev); + +rte_free (nic_dev->mc_list); + }static int hinic_dev_set_mtu (struct rte_eth_dev *dev,uint16_t mtu)
@@ -3006,6 +3011,9 @@ static int hinic_dev_close(struct rte_eth_dev *dev)/* disable hardware and uio interrupt */ hinic_disable_interrupt (dev); +/* destroy rx mode mutex */ +hinic_mutex_destroy (&nic_dev->rx_mode_mutex); +/* deinit nic hardware device */ hinic_nic_dev_destroy (dev);
@@ -3246,20 +3254,11 @@ static int hinic_dev_init(struct rte_eth_dev *eth_dev)static int hinic_dev_uninit (struct rte_eth_dev *dev) { -struct hinic_nic_dev *nic_dev; - - nic_dev =HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV (dev); -rte_bit_relaxed_clear32 (HINIC_DEV_INIT , &nic_dev->dev_status); -if (rte_eal_process_type () !=RTE_PROC_PRIMARY )return 0 ; -hinic_mutex_destroy (&nic_dev->rx_mode_mutex); -hinic_dev_close (dev); -rte_free (nic_dev->mc_list); -return HINIC_OK ; }
Signature · 1 line
1.8.3.1
Ferruh Yigit
AppliedQuoted 7 lines · Guoyang Zhou
The
nic_iomemory sets to NULL before free it, this is wrong, and the freeing of some private port resources should be moved from the ".remove(device)" function to the ".dev_close(port)" function.Fixes f30e69b41f94 ("ethdev: add device flag to bypass auto-filled queue xstats")Signed-off-by Guoyang Zhou <[email protected]>
Applied to dpdk-next-net/main, thanks.