From 850989f9381902e36d44c2c4c7409ad703ef99cb Mon Sep 17 00:00:00 2001 From: David Marchand Date: Tue, 6 Jul 2021 16:12:37 +0200 Subject: [PATCH] net/ice: fix memzone leak when firmware is missing Caught by our QE. When the firmware is missing, memzones were not released. $ dpdk-testpmd -c 0x1f -a 0:0:0.0 -- -i ... testpmd> dump_memzone ... Zone 6: name:, len:0x15040, virt:0x1661b24c0, socket_id:0, flags:0 physical segments used: addr: 0x140000000 iova: 0x140000000 len: 0x40000000 pagesz: 0x40000000 testpmd> port attach 0000:5e:00.0 Attaching a new port... EAL: Using IOMMU type 1 (Type 1) EAL: Probe PCI driver: net_ice (8086:159b) device: 0000:5e:00.0 (socket 0) ice_load_pkg(): failed to open file: /lib/firmware/intel/ice/ddp/ice.pkg ice_dev_init(): Failed to load the DDP package,Use safe-mode-support=1 to enter Safe Mode EAL: Releasing PCI mapped resource for 0000:5e:00.0 EAL: Calling pci_unmap_resource for 0000:5e:00.0 at 0x2200000000 EAL: Calling pci_unmap_resource for 0000:5e:00.0 at 0x2202000000 EAL: Driver cannot attach the device (0000:5e:00.0) EAL: Failed to attach device on primary process testpmd: Failed to attach port 0000:5e:00.0 testpmd> dump_memzone ... Zone 139: name:, len:0x1000, virt:0x1660ed800, socket_id:0, flags:0 physical segments used: addr: 0x140000000 iova: 0x140000000 len: 0x40000000 pagesz: 0x40000000 With 20 tries attaching a net/ice port, we would end up with: EAL: Probe PCI driver: net_ice (8086:159b) device: 0000:5e:00.0 (socket 0) EAL: memzone_reserve_aligned_thread_unsafe(): Number of requested memzone segments exceeds RTE_MAX_MEMZONE ice_dev_init(): Failed to initialize HW Fixes: a4c8c48fe3f4 ("net/ice: load OS default package") Cc: stable@dpdk.org Signed-off-by: David Marchand Acked-by: Haiyue Wang --- drivers/net/ice/ice_ethdev.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index aec19b6521..a4cd39c954 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -2069,7 +2069,7 @@ ice_dev_init(struct rte_eth_dev *dev) if (ad->devargs.safe_mode_support == 0) { PMD_INIT_LOG(ERR, "Failed to load the DDP package," "Use safe-mode-support=1 to enter Safe Mode"); - return ret; + goto err_init_fw; } PMD_INIT_LOG(WARNING, "Failed to load the DDP package," @@ -2159,10 +2159,11 @@ err_msix_pool_init: rte_free(dev->data->mac_addrs); dev->data->mac_addrs = NULL; err_init_mac: - ice_sched_cleanup_all(hw); - rte_free(hw->port_info); - ice_shutdown_all_ctrlq(hw); rte_free(pf->proto_xtr); +#ifndef RTE_EXEC_ENV_WINDOWS +err_init_fw: +#endif + ice_deinit_hw(hw); return ret; } -- 2.20.1