From patchwork Mon Jan 10 05:26:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rohit Raj X-Patchwork-Id: 105703 X-Patchwork-Delegate: thomas@monjalon.net 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 07307A0351; Mon, 10 Jan 2022 06:26:31 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 803E040E0F; Mon, 10 Jan 2022 06:26:31 +0100 (CET) Received: from inva021.nxp.com (inva021.nxp.com [92.121.34.21]) by mails.dpdk.org (Postfix) with ESMTP id 415844013F for ; Mon, 10 Jan 2022 06:26:30 +0100 (CET) Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id F2B14201138; Mon, 10 Jan 2022 06:26:29 +0100 (CET) Received: from aprdc01srsp001v.ap-rdc01.nxp.com (aprdc01srsp001v.ap-rdc01.nxp.com [165.114.16.16]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 90E01201137; Mon, 10 Jan 2022 06:26:29 +0100 (CET) Received: from lsv03196.swis.in-blr01.nxp.com (lsv03196.swis.in-blr01.nxp.com [92.120.146.192]) by aprdc01srsp001v.ap-rdc01.nxp.com (Postfix) with ESMTP id 64EC3183AC4C; Mon, 10 Jan 2022 13:26:28 +0800 (+08) From: rohit.raj@nxp.com To: Bruce Richardson , Ray Kinsella , Dmitry Kozlyuk , Narcisa Ana Maria Vasile , Dmitry Malloy , Pallavi Kadam Cc: dev@dpdk.org, nipun.gupta@nxp.com, sachin.saxena@nxp.com, hemant.agrawal@nxp.com, Rohit Raj Subject: [PATCH v5 1/2] eal: add API for bus close Date: Mon, 10 Jan 2022 10:56:26 +0530 Message-Id: <20220110052627.22577-1-rohit.raj@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201008153048.19369-1-rohit.raj@nxp.com> References: <20201008153048.19369-1-rohit.raj@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP 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 From: Rohit Raj As per the current code we have API for bus probe, but the bus close API is missing. This breaks the multi process scenarios as objects are not cleaned while terminating the secondary processes. This patch adds a new API rte_bus_close() for cleanup of bus objects which were acquired during probe. Signed-off-by: Rohit Raj --- Rebased on this patch series: https://patches.dpdk.org/project/dpdk/list/?series=21049 v5: * Updated release notes for new feature and API change. * Added support for error checking while closing bus. * Added experimental banner for new API. * Squashed changes related to freebsd and windows into single patch. * Discarded patch to fix a bug which is already fixed on latest release. v4: * Added comments to clarify responsibility of rte_bus_close. * Added support for rte_bus_close on freebsd. * Added support for rte_bus_close on windows. v3: * nit: combined nested if statements. v2: * Moved rte_bus_close call to rte_eal_cleanup path. doc/guides/rel_notes/release_22_03.rst | 8 +++++++ lib/eal/common/eal_common_bus.c | 33 +++++++++++++++++++++++++- lib/eal/freebsd/eal.c | 1 + lib/eal/include/rte_bus.h | 30 ++++++++++++++++++++++- lib/eal/linux/eal.c | 8 +++++++ lib/eal/version.map | 3 +++ lib/eal/windows/eal.c | 1 + 7 files changed, 82 insertions(+), 2 deletions(-) diff --git a/doc/guides/rel_notes/release_22_03.rst b/doc/guides/rel_notes/release_22_03.rst index 6d99d1eaa9..7417606a2a 100644 --- a/doc/guides/rel_notes/release_22_03.rst +++ b/doc/guides/rel_notes/release_22_03.rst @@ -55,6 +55,11 @@ New Features Also, make sure to start the actual text at the margin. ======================================================= + * **Added support to close bus.** + + Added capability to allow a user to do cleanup of bus objects which + were acquired during bus probe. + Removed Items ------------- @@ -84,6 +89,9 @@ API Changes Also, make sure to start the actual text at the margin. ======================================================= + * eal: Added new API ``rte_bus_close`` to perform cleanup bus objects which + were acquired during bus probe. + ABI Changes ----------- diff --git a/lib/eal/common/eal_common_bus.c b/lib/eal/common/eal_common_bus.c index baa5b532af..2c3c0a90d2 100644 --- a/lib/eal/common/eal_common_bus.c +++ b/lib/eal/common/eal_common_bus.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright 2016 NXP + * Copyright 2016,2022 NXP */ #include @@ -85,6 +85,37 @@ rte_bus_probe(void) return 0; } +/* Close all devices of all buses */ +int +rte_bus_close(void) +{ + int ret; + struct rte_bus *bus, *vbus = NULL; + + TAILQ_FOREACH(bus, &rte_bus_list, next) { + if (!strcmp(bus->name, "vdev")) { + vbus = bus; + continue; + } + + if (bus->close) { + ret = bus->close(); + if (ret) + RTE_LOG(ERR, EAL, "Bus (%s) close failed.\n", + bus->name); + } + } + + if (vbus && vbus->close) { + ret = vbus->close(); + if (ret) + RTE_LOG(ERR, EAL, "Bus (%s) close failed.\n", + vbus->name); + } + + return 0; +} + /* Dump information of a single bus */ static int bus_dump_one(FILE *f, struct rte_bus *bus) diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c index a1cd2462db..87d70c6898 100644 --- a/lib/eal/freebsd/eal.c +++ b/lib/eal/freebsd/eal.c @@ -984,6 +984,7 @@ rte_eal_cleanup(void) { struct internal_config *internal_conf = eal_get_internal_configuration(); + rte_bus_close(); rte_service_finalize(); rte_mp_channel_cleanup(); /* after this point, any DPDK pointers will become dangling */ diff --git a/lib/eal/include/rte_bus.h b/lib/eal/include/rte_bus.h index bbbb6efd28..c6211bbd95 100644 --- a/lib/eal/include/rte_bus.h +++ b/lib/eal/include/rte_bus.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright 2016 NXP + * Copyright 2016,2022 NXP */ #ifndef _RTE_BUS_H_ @@ -66,6 +66,23 @@ typedef int (*rte_bus_scan_t)(void); */ typedef int (*rte_bus_probe_t)(void); +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice + * + * Implementation specific close function which is responsible for resetting all + * detected devices on the bus to a default state, closing UIO nodes or VFIO + * groups and also freeing any memory allocated during rte_bus_probe like + * private resources for device list. + * + * This is called while iterating over each registered bus. + * + * @return + * 0 for successful close + * !0 for any error while closing + */ +typedef int (*rte_bus_close_t)(void); + /** * Device iterator to find a device on a bus. * @@ -263,6 +280,7 @@ struct rte_bus { const char *name; /**< Name of the bus */ rte_bus_scan_t scan; /**< Scan for devices attached to bus */ rte_bus_probe_t probe; /**< Probe devices on bus */ + rte_bus_close_t close; /**< Close devices on bus */ rte_bus_find_device_t find_device; /**< Find a device on the bus */ rte_bus_plug_t plug; /**< Probe single device for drivers */ rte_bus_unplug_t unplug; /**< Remove single device from driver */ @@ -317,6 +335,16 @@ int rte_bus_scan(void); */ int rte_bus_probe(void); +/** + * For each device on the buses, call the device specific close. + * + * @return + * 0 for successful close + * !0 otherwise + */ +__rte_experimental +int rte_bus_close(void); + /** * Dump information of all the buses registered with EAL. * diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c index 60b4924838..5c60131e46 100644 --- a/lib/eal/linux/eal.c +++ b/lib/eal/linux/eal.c @@ -1362,6 +1362,14 @@ rte_eal_cleanup(void) if (rte_eal_process_type() == RTE_PROC_PRIMARY) rte_memseg_walk(mark_freeable, NULL); + + /* Close all the buses and devices/drivers on them */ + if (rte_bus_close()) { + rte_eal_init_alert("Cannot close devices"); + rte_errno = ENOTSUP; + return -1; + } + rte_service_finalize(); rte_mp_channel_cleanup(); /* after this point, any DPDK pointers will become dangling */ diff --git a/lib/eal/version.map b/lib/eal/version.map index ab28c22791..39882dbbd5 100644 --- a/lib/eal/version.map +++ b/lib/eal/version.map @@ -420,6 +420,9 @@ EXPERIMENTAL { rte_intr_instance_free; rte_intr_type_get; rte_intr_type_set; + + # added in 22.03 + rte_bus_close; }; INTERNAL { diff --git a/lib/eal/windows/eal.c b/lib/eal/windows/eal.c index 67db7f099a..5915ab6291 100644 --- a/lib/eal/windows/eal.c +++ b/lib/eal/windows/eal.c @@ -260,6 +260,7 @@ rte_eal_cleanup(void) struct internal_config *internal_conf = eal_get_internal_configuration(); + rte_bus_close(); eal_intr_thread_cancel(); eal_mem_virt2iova_cleanup(); /* after this point, any DPDK pointers will become dangling */