From patchwork Tue Oct 4 13:11:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 117315 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CCD38A0543; Tue, 4 Oct 2022 15:08:15 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6FE0D40DFB; Tue, 4 Oct 2022 15:08:15 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mails.dpdk.org (Postfix) with ESMTP id C9BF140DDC for ; Tue, 4 Oct 2022 15:08:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664888894; x=1696424894; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nx8Bazsod8RimDoZdhYFAAZjqxy5j3PrfivAPHvgPqE=; b=HfhWRqDhaxJO2z6LL0EKvXGS+nuzFcGNBGk89eR+U9RDnGQZhebEGuaW kTmPG164N90/jPTZbhmcruNkKhBwTcr8/iucLxcjS/lFj1tSomixB6aMf 89MnMRHAFdlhhT12XxNfoj2STZDC5D+QJqLpEoFR5wnmZv/xD7J8ODIeT nj3/6Xcu9zEwi5s5mdhDFej82mCq9+yKLu2oKZA/mHra+8opS8CLBCiUP /qUCgV5KG+MQ0+TNjs0AIqBoCirrbS3Q5FLxx8tinJMis/6f+2pqEoKy5 aLdwLIgDh4m8IM+gS80uiTzND/3kyU2bh+K7vneDdk0SzYFtCbsISgDHL A==; X-IronPort-AV: E=McAfee;i="6500,9779,10490"; a="304447722" X-IronPort-AV: E=Sophos;i="5.95,158,1661842800"; d="scan'208";a="304447722" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Oct 2022 06:08:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10490"; a="654763937" X-IronPort-AV: E=Sophos;i="5.95,157,1661842800"; d="scan'208";a="654763937" Received: from silpixa00401122.ir.intel.com ([10.243.22.75]) by orsmga008.jf.intel.com with ESMTP; 04 Oct 2022 06:08:10 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: david.marchand@redhat.com, bruce.richardson@intel.com, mb@smartsharesystems.com, lizh@nvidia.com, matan@nvidia.com, stephen@networkplumber.org, lihuisong@huawei.com, Kevin Laatz Subject: [PATCH v8] eal: add bus cleanup to eal cleanup Date: Tue, 4 Oct 2022 14:11:28 +0100 Message-Id: <20221004131128.919267-1-kevin.laatz@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220419161438.1837860-1-kevin.laatz@intel.com> References: <20220419161438.1837860-1-kevin.laatz@intel.com> MIME-Version: 1.0 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 During EAL init, all buses are probed and the devices found are initialized. On eal_cleanup(), the inverse does not happen, meaning any allocated memory and other configuration will not be cleaned up appropriately on exit. Currently, in order for device cleanup to take place, applications must call the driver-relevant functions to ensure proper cleanup is done before the application exits. Since initialization occurs for all devices on the bus, not just the devices used by an application, it requires a) application awareness of all bus devices that could have been probed on the system, and b) code duplication across applications to ensure cleanup is performed. An example of this is rte_eth_dev_close() which is commonly used across the example applications. This patch proposes adding bus cleanup to the eal_cleanup() to make EAL's init/exit more symmetrical, ensuring all bus devices are cleaned up appropriately without the application needing to be aware of all bus types that may have been probed during initialization. Contained in this patch are the changes required to perform cleanup for devices on the PCI bus and VDEV bus during eal_cleanup(). There would be an ask for bus maintainers to add the relevant cleanup for their buses since they have the domain expertise. Signed-off-by: Kevin Laatz Acked-by: Morten Brørup Reviewed-by: Bruce Richardson --- v8: * rebase v7: * free rte_pci_device structs during cleanup * free rte_vdev_device structs during cleanup v6: * fix units in doc API descriptions v5: * add doc updates for new APIs v4: * fix return value when scaling_freq_max is not set * fix mismatching comments v3: * move setters from arg parse function to init * consider 0 as 'not set' for scaling_freq_max * other minor fixes v2: * add doc update for l3fwd-power * order version.map additions alphabetically --- drivers/bus/pci/pci_common.c | 28 ++++++++++++++++++++++++++++ drivers/bus/vdev/vdev.c | 27 +++++++++++++++++++++++++++ lib/eal/common/eal_common_bus.c | 17 +++++++++++++++++ lib/eal/common/eal_private.h | 10 ++++++++++ lib/eal/freebsd/eal.c | 1 + lib/eal/include/bus_driver.h | 13 +++++++++++++ lib/eal/linux/eal.c | 1 + lib/eal/windows/eal.c | 1 + 8 files changed, 98 insertions(+) diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c index 5ea72bcf23..fb754e0e0a 100644 --- a/drivers/bus/pci/pci_common.c +++ b/drivers/bus/pci/pci_common.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "private.h" @@ -439,6 +440,32 @@ pci_probe(void) return (probed && probed == failed) ? -1 : 0; } +static int +pci_cleanup(void) +{ + struct rte_pci_device *dev, *tmp_dev; + int error = 0; + + RTE_TAILQ_FOREACH_SAFE(dev, &rte_pci_bus.device_list, next, tmp_dev) { + struct rte_pci_driver *drv = dev->driver; + int ret = 0; + + if (drv == NULL || drv->remove == NULL) + continue; + + ret = drv->remove(dev); + if (ret < 0) { + rte_errno = errno; + error = -1; + } + dev->driver = NULL; + dev->device.driver = NULL; + free(dev); + } + + return error; +} + /* dump one device */ static int pci_dump_one_device(FILE *f, struct rte_pci_device *dev) @@ -856,6 +883,7 @@ struct rte_pci_bus rte_pci_bus = { .bus = { .scan = rte_pci_scan, .probe = pci_probe, + .cleanup = pci_cleanup, .find_device = pci_find_device, .plug = pci_plug, .unplug = pci_unplug, diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c index b176b658fc..f5b43f1930 100644 --- a/drivers/bus/vdev/vdev.c +++ b/drivers/bus/vdev/vdev.c @@ -567,6 +567,32 @@ vdev_probe(void) return ret; } +static int +vdev_cleanup(void) +{ + struct rte_vdev_device *dev, *tmp_dev; + int error = 0; + + RTE_TAILQ_FOREACH_SAFE(dev, &vdev_device_list, next, tmp_dev) { + const struct rte_vdev_driver *drv; + int ret = 0; + + drv = container_of(dev->device.driver, const struct rte_vdev_driver, driver); + + if (drv == NULL || drv->remove == NULL) + continue; + + ret = drv->remove(dev); + if (ret < 0) + error = -1; + + dev->device.driver = NULL; + free(dev); + } + + return error; +} + struct rte_device * rte_vdev_find_device(const struct rte_device *start, rte_dev_cmp_t cmp, const void *data) @@ -625,6 +651,7 @@ vdev_get_iommu_class(void) static struct rte_bus rte_vdev_bus = { .scan = vdev_scan, .probe = vdev_probe, + .cleanup = vdev_cleanup, .find_device = rte_vdev_find_device, .plug = vdev_plug, .unplug = vdev_unplug, diff --git a/lib/eal/common/eal_common_bus.c b/lib/eal/common/eal_common_bus.c index be64d31b0f..deb9fb8a12 100644 --- a/lib/eal/common/eal_common_bus.c +++ b/lib/eal/common/eal_common_bus.c @@ -91,6 +91,23 @@ rte_bus_probe(void) return 0; } +/* Clean up all devices of all buses */ +int +eal_bus_cleanup(void) +{ + int ret = 0; + struct rte_bus *bus; + + TAILQ_FOREACH(bus, &rte_bus_list, next) { + if (bus->cleanup == NULL) + continue; + if (bus->cleanup() != 0) + ret = -1; + } + + return ret; +} + /* Dump information of a single bus */ static int bus_dump_one(FILE *f, struct rte_bus *bus) diff --git a/lib/eal/common/eal_private.h b/lib/eal/common/eal_private.h index 3ca9ce2ffc..0f4d75bb89 100644 --- a/lib/eal/common/eal_private.h +++ b/lib/eal/common/eal_private.h @@ -441,6 +441,16 @@ int rte_eal_memory_detach(void); */ struct rte_bus *rte_bus_find_by_device_name(const char *str); +/** + * For each device on the buses, call the driver-specific function for + * device cleanup. + * + * @return + * 0 for successful cleanup + * !0 otherwise + */ +int eal_bus_cleanup(void); + /** * Create the unix channel for primary/secondary communication. * diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c index a1bb5363b1..b9a7792c19 100644 --- a/lib/eal/freebsd/eal.c +++ b/lib/eal/freebsd/eal.c @@ -896,6 +896,7 @@ rte_eal_cleanup(void) rte_mp_channel_cleanup(); rte_trace_save(); eal_trace_fini(); + eal_bus_cleanup(); /* after this point, any DPDK pointers will become dangling */ rte_eal_memory_detach(); rte_eal_alarm_cleanup(); diff --git a/lib/eal/include/bus_driver.h b/lib/eal/include/bus_driver.h index d2e615a736..7b85a17a09 100644 --- a/lib/eal/include/bus_driver.h +++ b/lib/eal/include/bus_driver.h @@ -205,6 +205,18 @@ typedef int (*rte_bus_hot_unplug_handler_t)(struct rte_device *dev); */ typedef int (*rte_bus_sigbus_handler_t)(const void *failure_addr); +/** + * Implementation specific cleanup function which is responsible for cleaning up + * devices on that bus with applicable drivers. + * + * This is called while iterating over each registered bus. + * + * @return + * 0 for successful cleanup + * !0 for any error during cleanup + */ +typedef int (*rte_bus_cleanup_t)(void); + /** * Bus scan policies */ @@ -256,6 +268,7 @@ struct rte_bus { /**< handle hot-unplug failure on the bus */ rte_bus_sigbus_handler_t sigbus_handler; /**< handle sigbus error on the bus */ + rte_bus_cleanup_t cleanup; /**< Cleanup devices on bus */ }; /** diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c index 9a168b7773..b1d6b5046f 100644 --- a/lib/eal/linux/eal.c +++ b/lib/eal/linux/eal.c @@ -1365,6 +1365,7 @@ rte_eal_cleanup(void) rte_mp_channel_cleanup(); rte_trace_save(); eal_trace_fini(); + eal_bus_cleanup(); /* after this point, any DPDK pointers will become dangling */ rte_eal_memory_detach(); eal_mp_dev_hotplug_cleanup(); diff --git a/lib/eal/windows/eal.c b/lib/eal/windows/eal.c index 79322d2ce9..adb929a014 100644 --- a/lib/eal/windows/eal.c +++ b/lib/eal/windows/eal.c @@ -263,6 +263,7 @@ rte_eal_cleanup(void) eal_intr_thread_cancel(); eal_mem_virt2iova_cleanup(); + eal_bus_cleanup(); /* after this point, any DPDK pointers will become dangling */ rte_eal_memory_detach(); eal_cleanup_config(internal_conf);