From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 24A30A0526; Wed, 8 Jul 2020 14:04:41 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D80391DD1C; Wed, 8 Jul 2020 14:04:39 +0200 (CEST) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id CA77E1DBCB for ; Wed, 8 Jul 2020 14:04:38 +0200 (CEST) Received: by mail-wm1-f66.google.com with SMTP id q15so2736893wmj.2 for ; Wed, 08 Jul 2020 05:04:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=emumba-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=vwURkGZ0MxEzMUg4cwSkBOTysqIu4vNHrlcX3DlvUjY=; b=16VBH5mM4bEf0F7SOL3m5LObJSOgyUG0s8SDUc7V2gIHOe7RyrLTZD26tgIcJHkrkX yaQK4pe9XgXyfJ1109TAy3qaHuFhHwCZZ8poAnEW50xadhrIdupjnWURoo06akS0k6LS WWAxEORXPrMfZ/JSkyZwpBgcb4PXpALhi+tVbpuFsnzvOxb+UsPJ3CBcNItUXJE6jxt9 /1rP3OOnKDGnBtFFJvLxt46si4xFdmDPGW0QWZ2XF9MYVI3hLV4wk0vqKiami+I8vp50 HpwLgjDUGv/xJeqVXueGebcHTA4kCaN68mfWR4xsHy7Pdtzti6ZVC2v5GQJ9V8beiypo j3YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=vwURkGZ0MxEzMUg4cwSkBOTysqIu4vNHrlcX3DlvUjY=; b=sEKWn34hFA1VorbCUNLMubLrIO1LW5Zgao0tTE7vivTTx6ETG01V8OgvMo7pNkEqcp ofNZDMvCtzAxruG/7Rs5MjNrveNnwSVHvo1IHU/BQp9+uknm7zJCUJkd0HEwN/GinFd6 9wcqQvwQWb/6AzMlJswdeojrK2Erjjg/BcKwM4O/fSg4RlyXRrI+1gveAKjECHcP7z3H XWcJCJOMt4xhEguTvtrFeUCUWnOaGl7ZRtYfEe4b4FjIyNt8ySwEabKz8F72sQbh3fNq j4STpvTqSWOnqfc4VBf1i2+3UZ/Vu9Wj4QsxlDPdeqcZ5W64+V9KAqWIf0wu5a7i4isj kSSQ== X-Gm-Message-State: AOAM533C9RgrZmb6kFFp0GruodMh3wxvZqf84EkUgeS1MH4P8OcWJErR qb3VnQu1WmvgTdzy3NtVk0y4Uw== X-Google-Smtp-Source: ABdhPJyLTiBLUPucFh4F6wZf/DEVQ2ufee91e45gCOhxXrJqQ4G5kyNBxjmGfA/JFugx6bpaMX5Djg== X-Received: by 2002:a1c:7fd7:: with SMTP id a206mr8977671wmd.104.1594209878457; Wed, 08 Jul 2020 05:04:38 -0700 (PDT) Received: from localhost.localdomain ([182.191.83.208]) by smtp.gmail.com with ESMTPSA id 207sm6681501wme.13.2020.07.08.05.04.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2020 05:04:37 -0700 (PDT) From: Muhammad Bilal To: ferruh.yigit@intel.com, anatoly.burakov@intel.com Cc: vipin.varghese@intel.com, jgrajcia@cisco.com, jerinj@marvell.com, dev@dpdk.org, stable@dpdk.org, Muhammad Bilal Date: Wed, 8 Jul 2020 17:03:29 +0500 Message-Id: <20200708120329.103200-1-m.bilal@emumba.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH] EAL: Called remove() of drivers for vdev and pci buses X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" while using memif with app, the resources are not cleaned on exit, So an error occurred on running it second time. The cause of this problem is that remove() of memif driver is not called by rte_eal_cleanup() which is counterpart of probe() called from rte_eal_init(). This is a case for all other divers e.g pci, so to solve this problem I have added the functionality of calling remove() function of all the driver attached to devices on vdev and pci buses. Bugzilla ID: 353 Signed-off-by: Muhammad Bilal --- drivers/bus/pci/pci_common.c | 23 +++++++++++++++++++++++ drivers/bus/vdev/vdev.c | 19 ++++++++++++++++++- lib/librte_eal/common/eal_common_bus.c | 18 ++++++++++++++++++ lib/librte_eal/include/rte_bus.h | 23 +++++++++++++++++++++++ lib/librte_eal/linux/eal.c | 2 ++ 5 files changed, 84 insertions(+), 1 deletion(-) diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c index 245d94f59..203b32a23 100644 --- a/drivers/bus/pci/pci_common.c +++ b/drivers/bus/pci/pci_common.c @@ -320,6 +320,28 @@ pci_probe(void) return (probed && probed == failed) ? -1 : 0; } +/* + * Scan the content of the PCI bus, and call the remove() function for + * all registered drivers of devices that have already been probed. + */ +static int +pci_remove(void) +{ + struct rte_pci_device *dev = NULL; + int ret = 0; + + FOREACH_DEVICE_ON_PCIBUS(dev) { + if (rte_dev_is_probed(&dev->device)) + if (rte_pci_detach_dev(dev) != 0) { + RTE_LOG(INFO, EAL, + "failed to detach driver form %s\n", + dev->device.name); + ret = -1; + } + } + return ret; +} + /* dump one device */ static int pci_dump_one_device(FILE *f, struct rte_pci_device *dev) @@ -669,6 +691,7 @@ struct rte_pci_bus rte_pci_bus = { .bus = { .scan = rte_pci_scan, .probe = pci_probe, + .remove = pci_remove, .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 a89ea2353..692c936b9 100644 --- a/drivers/bus/vdev/vdev.c +++ b/drivers/bus/vdev/vdev.c @@ -546,6 +546,22 @@ vdev_unplug(struct rte_device *dev) return rte_vdev_uninit(dev->name); } +static int +vdev_remove(void) +{ + struct rte_vdev_device *dev; + int ret = 0; + + TAILQ_FOREACH(dev, &vdev_device_list, next) { + if (vdev_remove_driver(dev) != 0) { + VDEV_LOG(INFO, "driver of %s is not removed\n", + dev->device.name); + ret = -1; + } + } + return ret; +} + static struct rte_bus rte_vdev_bus = { .scan = vdev_scan, .probe = vdev_probe, @@ -554,7 +570,8 @@ static struct rte_bus rte_vdev_bus = { .unplug = vdev_unplug, .parse = vdev_parse, .dev_iterate = rte_vdev_dev_iterate, -}; + .remove = vdev_remove, + }; RTE_REGISTER_BUS(vdev, rte_vdev_bus); diff --git a/lib/librte_eal/common/eal_common_bus.c b/lib/librte_eal/common/eal_common_bus.c index baa5b532a..bff95a0ae 100644 --- a/lib/librte_eal/common/eal_common_bus.c +++ b/lib/librte_eal/common/eal_common_bus.c @@ -85,6 +85,24 @@ rte_bus_probe(void) return 0; } +/* Remove all devices of all buses */ +int +rte_bus_remove(void) +{ + int ret; + struct rte_bus *bus; + + TAILQ_FOREACH(bus, &rte_bus_list, next) { + if (!strcmp(bus->name, "vdev") || !strcmp(bus->name, "pci")) { + ret = bus->remove(); + if (ret) + RTE_LOG(INFO, EAL, "Bus (%s) remove failed.\n", + bus->name); + } + } + return 0; +} + /* Dump information of a single bus */ static int bus_dump_one(FILE *f, struct rte_bus *bus) diff --git a/lib/librte_eal/include/rte_bus.h b/lib/librte_eal/include/rte_bus.h index d3034d0ed..c3e7e62c9 100644 --- a/lib/librte_eal/include/rte_bus.h +++ b/lib/librte_eal/include/rte_bus.h @@ -67,6 +67,18 @@ typedef int (*rte_bus_scan_t)(void); */ typedef int (*rte_bus_probe_t)(void); +/** + * Implementation specific remove function which is responsible for unlinking + * devices on that bus from attached drivers. + * + * This is called while iterating over each registered bus. + * + * @return + * 0 for successful remove + * !0 for any error while removing + */ +typedef int (*rte_bus_remove_t)(void); + /** * Device iterator to find a device on a bus. * @@ -248,6 +260,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_remove_t remove; /**< remove device 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 */ @@ -301,6 +314,16 @@ int rte_bus_scan(void); */ int rte_bus_probe(void); +/** + * For each device on the buses,call the driver-specific remove + * for device uninitialization. + * + * @return + * 0 for successful match/probe + * !0 otherwise + */ +int rte_bus_remove(void); + /** * Dump information of all the buses registered with EAL. * diff --git a/lib/librte_eal/linux/eal.c b/lib/librte_eal/linux/eal.c index f162124a3..89a03d3bb 100644 --- a/lib/librte_eal/linux/eal.c +++ b/lib/librte_eal/linux/eal.c @@ -1330,6 +1330,8 @@ mark_freeable(const struct rte_memseg_list *msl, const struct rte_memseg *ms, int rte_eal_cleanup(void) { + /* Remove devices/drivers from all buses */ + rte_bus_remove(); /* if we're in a primary process, we need to mark hugepages as freeable * so that finalization can release them back to the system. */ -- 2.25.1