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 B0856C88E72 for ; Thu, 17 Sep 2026 07:50:45 +0000 (UTC) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C6F2142E71; Thu, 17 Sep 2026 09:50:17 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 7697D42E4D for ; Thu, 17 Sep 2026 09:50:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789631416; 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=m2uNzM7s72FizenPIC1Z1VNI+bPedtMrSn22RIl3U/o=; b=Q4fJaTrtviMiUND5egloZ0cOgPFHXjccfby16uBS80Z+RbA2Z+haeALAhYgH1/xT0hf7Zh 7mY8qTZHdpaXW4aEvTkcxr2hfWuLcAJU4tkd/XhlhP2P9038VjFUO2jeO/FVC2quabYwc1 eGfxwmCvjNOAozrDSOhJBMuraT310gI= Received: from mx-prod-mc-06.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-551-6ksPlNoFMo2Tbi_qdKg5Gw-1; Thu, 17 Sep 2026 03:50:12 -0400 X-MC-Unique: 6ksPlNoFMo2Tbi_qdKg5Gw-1 X-Mimecast-MFC-AGG-ID: 6ksPlNoFMo2Tbi_qdKg5Gw_1789631412 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DE2351802176; Thu, 17 Sep 2026 07:50:11 +0000 (UTC) Received: from dmarchan.redhat.corp (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E098D766; Thu, 17 Sep 2026 07:50:10 +0000 (UTC) From: David Marchand To: hemant.agrawal@nxp.com, dev@dpdk.org Cc: Sachin Saxena Subject: [RFC v2 13/16] bus/fslmc: move unplug for some device out of VFIO Date: Thu, 17 Sep 2026 09:49:13 +0200 Message-ID: <20260917074917.595603-14-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.6 on 10.30.177.95 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: a8uV3qNrnNvEhiE4iPsWvlEZfmtcmRRygiTE79K0myk_1789631412 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 Move device unplug out of the code dealing with VFIO, interrupts and IO devices. Signed-off-by: David Marchand --- Changes since RFC v1: - simplified the loop over devices since only devices for ethdev, dma or crypto are in the bus device list, --- drivers/bus/fslmc/fslmc_bus.c | 11 ++++++++++- drivers/bus/fslmc/fslmc_vfio.c | 13 ------------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c index 4789ab0cf3..3b22d3367d 100644 --- a/drivers/bus/fslmc/fslmc_bus.c +++ b/drivers/bus/fslmc/fslmc_bus.c @@ -620,10 +620,19 @@ fslmc_bus_match(const struct rte_driver *drv, const struct rte_device *dev) } static int -rte_fslmc_close(struct rte_bus *bus __rte_unused) +fslmc_bus_unplug_device(struct rte_device *rte_dev); + +static int +rte_fslmc_close(struct rte_bus *bus) { + struct rte_dpaa2_device *dev; int ret = 0; + RTE_BUS_FOREACH_DEV(dev, bus) { + if (rte_dev_is_probed(&dev->device) && fslmc_bus_unplug_device(&dev->device)) + DPAA2_BUS_ERR("Unable to remove %s", dev->device.name); + } + ret = fslmc_vfio_close_group(); if (ret) DPAA2_BUS_INFO("Unable to close devices %d", ret); diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c index 954167f452..857f22f204 100644 --- a/drivers/bus/fslmc/fslmc_vfio.c +++ b/drivers/bus/fslmc/fslmc_vfio.c @@ -1449,7 +1449,6 @@ fslmc_close_iodevices(struct rte_dpaa2_device *dev, int vfio_fd) { struct rte_dpaa2_object *object = NULL; - const struct rte_dpaa2_driver *drv; int ret; switch (dev->dev_type) { @@ -1465,15 +1464,6 @@ fslmc_close_iodevices(struct rte_dpaa2_device *dev, continue; } break; - case DPAA2_ETH: - case DPAA2_CRYPTO: - case DPAA2_QDMA: - if (dev->device.driver != NULL) { - drv = RTE_BUS_DRIVER(dev->device.driver, *drv); - if (drv->remove && drv->remove(dev)) - DPAA2_BUS_ERR("Unable to remove"); - } - break; default: break; } @@ -1617,9 +1607,6 @@ fslmc_vfio_close_group(void) fslmc_close_iodevices(dev, vfio_group_fd); } - RTE_BUS_FOREACH_DEV(dev, &rte_fslmc_bus) - fslmc_close_iodevices(dev, vfio_group_fd); - fslmc_vfio_clear_group(vfio_group_fd); return 0; -- 2.54.0