From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6A833C982C1 for ; Thu, 17 Sep 2026 07:49:50 +0000 (UTC) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D14DB42D26; Thu, 17 Sep 2026 09:49:42 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 7AEE6400D5 for ; Thu, 17 Sep 2026 09:49:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789631380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=omfrrXEW2HBgJuFWsOM2yoGkzNzOJN4nIW1DqlU68ik=; b=SC0yV/JQwkjqQvYfOTN/suqoCcmgemCXYU9rp+NxiPprMkUkf0N9JrgnD3P5qqzpccByYO ogo0hQ4akCqPXn2xvrSq5FpuMfaHh0avWUma53yrSgRKjdFg4MaCUsXdB83W2BrocYu28A WhFH7VITvpu2Dq3kJzSPG5oYb7O4cPM= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-652-zUK7cITSM-GoYbR0N55YQg-1; Thu, 17 Sep 2026 03:49:36 -0400 X-MC-Unique: zUK7cITSM-GoYbR0N55YQg-1 X-Mimecast-MFC-AGG-ID: zUK7cITSM-GoYbR0N55YQg_1789631375 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BCABA185588F; Thu, 17 Sep 2026 07:49:35 +0000 (UTC) Received: from dmarchan.redhat.corp (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A98901956087; Thu, 17 Sep 2026 07:49:34 +0000 (UTC) From: David Marchand To: hemant.agrawal@nxp.com, dev@dpdk.org Cc: Sachin Saxena Subject: [RFC v2 03/16] bus/dpaa: allocate interrupt during probing Date: Thu, 17 Sep 2026 09:49:03 +0200 Message-ID: <20260917074917.595603-4-david.marchand@redhat.com> In-Reply-To: <20260917074917.595603-1-david.marchand@redhat.com> References: <20260723135400.3621271-1-david.marchand@redhat.com> <20260917074917.595603-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: YpOjq9ey2lCXS0UF-oZoV6UovzuddQjelUdp1ovO2TE_1789631375 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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 --- Changes since RFC v1: - restored return code on error in cleanup, --- drivers/bus/dpaa/dpaa_bus.c | 82 ++++++++++++++++++++----------------- 1 file changed, 44 insertions(+), 38 deletions(-) diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c index 5df2dff8f2..ef904a7192 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; @@ -660,13 +640,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; @@ -755,14 +743,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(); @@ -790,10 +770,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; } @@ -801,29 +801,35 @@ static int dpaa_bus_cleanup(struct rte_bus *bus) { struct rte_dpaa_device *dev; + int error = 0; BUS_INIT_FUNC_TRACE(); RTE_BUS_FOREACH_DEV(dev, bus) { const struct rte_dpaa_driver *drv; - int ret = 0; + int ret; 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; + error = -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; DPAA_BUS_DEBUG("Bus cleanup done"); - return 0; + return error; } /* Adding destructor for double check in case non-gracefully -- 2.54.0