Allocating the interrupt handle is a waste of memory if no device is probed later (like for example, if a allowlist is passed).
Instead, allocate this handle, set eventfds and vfio at the time probe_device is called. Adjust the unplug_device path accordingly. Signed-off-by: David Marchand <[email protected]> --- drivers/bus/dpaa/dpaa_bus.c | 76 +++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 36 deletions(-) diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c index 06962a5b29..b9d7256c29 100644 --- a/drivers/bus/dpaa/dpaa_bus.c +++ b/drivers/bus/dpaa/dpaa_bus.c @@ -215,16 +215,6 @@ dpaa_create_device_list(void) dev->device.numa_node = SOCKET_ID_ANY; - /* Allocate interrupt handle instance */ - dev->intr_handle = - rte_intr_instance_alloc(RTE_INTR_INSTANCE_F_PRIVATE); - if (dev->intr_handle == NULL) { - DPAA_BUS_LOG(ERR, "Failed to allocate intr handle"); - ret = -ENOMEM; - free(dev); - goto cleanup; - } - cfg = &dpaa_netcfg->port_cfg[i]; fman_intf = cfg->fman_if; @@ -276,16 +266,6 @@ dpaa_create_device_list(void) goto cleanup; } - /* Allocate interrupt handle instance */ - dev->intr_handle = - rte_intr_instance_alloc(RTE_INTR_INSTANCE_F_PRIVATE); - if (dev->intr_handle == NULL) { - DPAA_BUS_LOG(ERR, "Failed to allocate intr handle"); - ret = -ENOMEM; - free(dev); - goto cleanup; - } - dev->device_type = FSL_DPAA_CRYPTO; dev->id.dev_id = dpaa_bus.device_count + i; @@ -336,7 +316,6 @@ dpaa_create_device_list(void) cleanup: RTE_BUS_FOREACH_DEV(dev, &rte_dpaa_bus) { rte_bus_remove_device(&rte_dpaa_bus, &dev->device); - rte_intr_instance_free(dev->intr_handle); free(dev); } @@ -637,7 +616,8 @@ rte_dpaa_bus_dev_build(void) return 0; } -static int rte_dpaa_setup_intr(struct rte_intr_handle *intr_handle) +static int +dpaa_setup_intr(struct rte_intr_handle *intr_handle) { int fd; @@ -657,13 +637,21 @@ static int rte_dpaa_setup_intr(struct rte_intr_handle *intr_handle) return 0; } +static void +dpaa_close_intr(struct rte_intr_handle *intr_handle) +{ + if (rte_intr_fd_get(intr_handle) >= 0) { + close(rte_intr_fd_get(intr_handle)); + rte_intr_fd_set(intr_handle, -1); + } +} + #define DPAA_DEV_PATH1 "/sys/devices/platform/soc/soc:fsl,dpaa" #define DPAA_DEV_PATH2 "/sys/devices/platform/fsl,dpaa" static int rte_dpaa_bus_scan(void) { - struct rte_dpaa_device *dev; FILE *svr_file = NULL; uint32_t svr_ver; static int process_once; @@ -752,14 +740,6 @@ rte_dpaa_bus_scan(void) */ rte_mbuf_set_platform_mempool_ops(DPAA_MEMPOOL_OPS_NAME); - RTE_BUS_FOREACH_DEV(dev, &rte_dpaa_bus) { - if (dev->device_type == FSL_DPAA_ETH) { - ret = rte_dpaa_setup_intr(dev->intr_handle); - if (ret) - DPAA_BUS_ERR("Error setting up interrupt."); - } - } - /* And initialize the PA->VA translation table */ dpaax_iova_table_populate(); @@ -787,10 +767,30 @@ dpaa_bus_probe_device(struct rte_driver *drv, struct rte_device *dev) struct rte_dpaa_driver *dpaa_drv = RTE_BUS_DRIVER(drv, *dpaa_drv); int ret; + /* Allocate interrupt handle instance */ + dpaa_dev->intr_handle = rte_intr_instance_alloc(RTE_INTR_INSTANCE_F_PRIVATE); + if (dpaa_dev->intr_handle == NULL) { + DPAA_BUS_LOG(ERR, "Failed to allocate intr handle"); + return -ENOMEM; + } + + if (dpaa_dev->device_type == FSL_DPAA_ETH) { + ret = dpaa_setup_intr(dpaa_dev->intr_handle); + if (ret != 0) { + DPAA_BUS_ERR("error setting up interrupt: %s", dpaa_dev->name); + ret = -ret; + goto release_intr; + } + } + ret = dpaa_drv->probe(dpaa_drv, dpaa_dev); - if (ret != 0) + if (ret != 0) { DPAA_BUS_ERR("unable to probe: %s", dpaa_dev->name); - + dpaa_close_intr(dpaa_dev->intr_handle); +release_intr: + rte_intr_instance_free(dpaa_dev->intr_handle); + dpaa_dev->intr_handle = NULL; + } return ret; } @@ -805,16 +805,20 @@ dpaa_bus_cleanup(struct rte_bus *bus) int ret = 0; if (!rte_dev_is_probed(&dev->device)) - continue; + goto next; drv = RTE_BUS_DRIVER(dev->device.driver, *drv); if (drv->remove == NULL) - continue; + goto next; ret = drv->remove(dev); if (ret < 0) { rte_errno = errno; - return -1; + goto next; } dev->device.driver = NULL; +next: + dpaa_close_intr(dev->intr_handle); + rte_intr_instance_free(dev->intr_handle); + dev->intr_handle = NULL; } dpaa_portal_finish((void *)DPAA_PER_LCORE_PORTAL); dpaa_bus_global_init = 0; -- 2.54.0
