From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <jblunck@gmail.com>
Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68])
by dpdk.org (Postfix) with ESMTP id C3C8DF94B
for <dev@dpdk.org>; Mon, 20 Feb 2017 15:19:07 +0100 (CET)
Received: by mail-wm0-f68.google.com with SMTP id u63so14586233wmu.2
for <dev@dpdk.org>; Mon, 20 Feb 2017 06:19:07 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=sender:from:to:cc:subject:date:message-id:in-reply-to:references
:in-reply-to:references;
bh=IEt9lYw82oZzz2CDpx3T1rsCR/kPTilV0L0JSfvIjSk=;
b=sV5V97fUk8O4wpC19bYbqXLz4+nLZmSKVf0Pj4QyqCXQkCdgICsS+kffVfBbo7rShx
9BXdRsXSQ+2C56cMQ9FFCoOOkfHZAygUOpM53Vhpl/eq7V/0GRVW+5WvoVNLQCABJfjH
Ql/ZK7l3mrOFm9HavI0biUvJegl55+cLAMfu9Fy/CmgUYc2Sk5Jxe5dEgeuv/OOg3jIB
eSbat4dsRZtFsJNDmSoQzvT4mBwVaMm7r+r0/uz9wajdtyqXYAqey9wtlUTtLa401zIw
VIZ0D7/BxJvFJ9Uiy2WDH+y4NdO5WrRrtm+IOSb/3h8/COvifDxq4U93gJqERY7qRb6P
m/Ig==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:sender:from:to:cc:subject:date:message-id
:in-reply-to:references:in-reply-to:references;
bh=IEt9lYw82oZzz2CDpx3T1rsCR/kPTilV0L0JSfvIjSk=;
b=cDUjaBHjo3h6YHu9IZ100rNsaH7W1YN6U41y7Q+FtDkDRK4cKUUPzVgMHqTFpLtwQA
T/pmWf9l0/kKNKj70gt9mXcXBRJ7gwOxxF4kF8t6CCtSqayNZTHdS/sc0gRu4S1ZrJOF
YFddvtuTodTp1D5Cab7Ql8AE5VRUPZXG74acOUvoahfcubL5E6BGW3JX/W6dHRfzp2n3
6f3RspP0+ugyrEwvbx3Sp7FN4A0NHKhX7jt4SWKKD4AGNZLS2vso+8VRuDN9M/BJdmWu
Y6Nc7rXEi7pDfGb+1cGIgzJQU/RukdUUtPGMa5xXSRl7A8OOaEHJQlYDUkD/O97181HE
A+Vg==
X-Gm-Message-State: AMke39mMi+MVk4F50WnznLoMalVFrnQIz7oWmaJrZiw/cyRaKGDEqDQ8+vMj3mdBaumdzg==
X-Received: by 10.28.178.16 with SMTP id b16mr20941584wmf.83.1487600347224;
Mon, 20 Feb 2017 06:19:07 -0800 (PST)
Received: from weierstrass.local.net ([91.200.109.169])
by smtp.gmail.com with ESMTPSA id o2sm24932276wra.42.2017.02.20.06.18.55
(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Mon, 20 Feb 2017 06:18:59 -0800 (PST)
Sender: Jan Blunck <jblunck@gmail.com>
From: Jan Blunck <jblunck@infradead.org>
To: dev@dpdk.org
Cc: david.marchand@6wind.com, shreyansh.jain@nxp.com, ferruh.yigit@intel.com
Date: Mon, 20 Feb 2017 15:17:42 +0100
Message-Id: <1487600262-14382-9-git-send-email-jblunck@infradead.org>
X-Mailer: git-send-email 2.7.4
In-Reply-To: <1487600262-14382-1-git-send-email-jblunck@infradead.org>
References: <1487600262-14382-1-git-send-email-jblunck@infradead.org>
In-Reply-To: <1487152929-23627-1-git-send-email-jblunck@infradead.org>
References: <1487152929-23627-1-git-send-email-jblunck@infradead.org>
Subject: [dpdk-dev] [PATCH v2 8/8] eal: make virtual bus use rte_vdev_device
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Feb 2017 14:19:07 -0000
This allows the virtual bus to be rescanned and probed by tracking the
creation of rte_vdev_device.
Signed-off-by: Jan Blunck <jblunck@infradead.org>
Tested-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
lib/librte_eal/common/eal_common_vdev.c | 195 +++++++++++++++++++++++++-------
1 file changed, 155 insertions(+), 40 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_vdev.c b/lib/librte_eal/common/eal_common_vdev.c
index a9798d0..531c61b 100644
--- a/lib/librte_eal/common/eal_common_vdev.c
+++ b/lib/librte_eal/common/eal_common_vdev.c
@@ -41,6 +41,7 @@
#include <rte_vdev.h>
#include <rte_common.h>
#include <rte_devargs.h>
+#include <rte_memory.h>
/** Double linked list of virtual device drivers. */
TAILQ_HEAD(vdev_device_list, rte_vdev_device);
@@ -73,9 +74,12 @@ rte_vdev_device_name(const struct rte_vdev_device *dev)
}
static int
-vdev_probe_all_drivers(const char *name, const char *args)
+vdev_probe_all_drivers(struct rte_vdev_device *dev)
{
+ const char *name = rte_vdev_device_name(dev);
+ char *args = dev->device.devargs->args;
struct rte_vdev_driver *driver;
+ int ret;
TAILQ_FOREACH(driver, &vdev_driver_list, next) {
/*
@@ -85,90 +89,202 @@ vdev_probe_all_drivers(const char *name, const char *args)
* So use strncmp to compare.
*/
if (!strncmp(driver->driver.name, name,
- strlen(driver->driver.name)))
- return driver->probe(name, args);
+ strlen(driver->driver.name))) {
+ dev->device.driver = &driver->driver;
+ ret = driver->probe(name, args);
+ if (ret)
+ dev->device.driver = NULL;
+ return ret;
+ }
}
/* Give new names precedence over aliases. */
TAILQ_FOREACH(driver, &vdev_driver_list, next) {
if (driver->driver.alias &&
!strncmp(driver->driver.alias, name,
- strlen(driver->driver.alias)))
- return driver->probe(name, args);
+ strlen(driver->driver.alias))) {
+ dev->device.driver = &driver->driver;
+ ret = driver->probe(name, args);
+ if (ret)
+ dev->device.driver = NULL;
+ return ret;
+ }
}
return 1;
}
+static struct rte_vdev_device *
+find_vdev(const char *name)
+{
+ struct rte_vdev_device *dev;
+
+ if (!name)
+ return NULL;
+
+ TAILQ_FOREACH(dev, &vdev_device_list, next) {
+ const char *devname = rte_vdev_device_name(dev);
+ if (!strncmp(devname, name, strlen(name)))
+ return dev;
+ }
+
+ return NULL;
+}
+
+static struct rte_devargs *
+alloc_devargs(const char *name, const char *args)
+{
+ struct rte_devargs *devargs;
+ int ret;
+
+ devargs = calloc(1, sizeof(*devargs));
+ if (!devargs)
+ return NULL;
+
+ devargs->type = RTE_DEVTYPE_VIRTUAL;
+ if (args)
+ devargs->args = strdup(args);
+
+ ret = snprintf(devargs->virt.drv_name,
+ sizeof(devargs->virt.drv_name), "%s", name);
+ if (ret < 0 || ret >= (int)sizeof(devargs->virt.drv_name)) {
+ free(devargs->args);
+ free(devargs);
+ return NULL;
+ }
+
+ return devargs;
+}
+
int
rte_eal_vdev_init(const char *name, const char *args)
{
+ struct rte_vdev_device *dev;
+ struct rte_devargs *devargs;
int ret;
if (name == NULL)
return -EINVAL;
- ret = vdev_probe_all_drivers(name, args);
- if (ret > 0)
- RTE_LOG(ERR, EAL, "no driver found for %s\n", name);
+ dev = find_vdev(name);
+ if (dev)
+ return -EEXIST;
+
+ devargs = alloc_devargs(name, args);
+ if (!devargs)
+ return -ENOMEM;
+
+ dev = calloc(1, sizeof(*dev));
+ if (!dev) {
+ ret = -ENOMEM;
+ goto fail;
+ }
+
+ dev->device.devargs = devargs;
+ dev->device.numa_node = SOCKET_ID_ANY;
+
+ ret = vdev_probe_all_drivers(dev);
+ if (ret) {
+ if (ret > 0)
+ RTE_LOG(ERR, EAL, "no driver found for %s\n", name);
+ goto fail;
+ }
+
+ TAILQ_INSERT_TAIL(&devargs_list, devargs, next);
+
+ rte_eal_device_insert(&dev->device);
+ TAILQ_INSERT_TAIL(&vdev_device_list, dev, next);
+ return 0;
+fail:
+ free(devargs->args);
+ free(devargs);
+ free(dev);
return ret;
}
static int
-vdev_remove_driver(const char *name)
+vdev_remove_driver(struct rte_vdev_device *dev)
{
- struct rte_vdev_driver *driver;
+ const char *name = rte_vdev_device_name(dev);
+ const struct rte_vdev_driver *driver;
- TAILQ_FOREACH(driver, &vdev_driver_list, next) {
- /*
- * search a driver prefix in virtual device name.
- * For example, if the driver is pcap PMD, driver->name
- * will be "net_pcap", but "name" will be "net_pcapN".
- * So use strncmp to compare.
- */
- if (!strncmp(driver->driver.name, name,
- strlen(driver->driver.name)))
- return driver->remove(name);
- }
-
- /* Give new names precedence over aliases. */
- TAILQ_FOREACH(driver, &vdev_driver_list, next) {
- if (driver->driver.alias &&
- !strncmp(driver->driver.alias, name,
- strlen(driver->driver.alias)))
- return driver->remove(name);
+ if (!dev->device.driver) {
+ RTE_LOG(DEBUG, EAL, "no driver attach to device %s\n", name);
+ return 1;
}
- return 1;
+ driver = container_of(dev->device.driver, const struct rte_vdev_driver,
+ driver);
+ return driver->remove(name);
}
int
rte_eal_vdev_uninit(const char *name)
{
+ struct rte_vdev_device *dev;
+ struct rte_devargs *devargs;
int ret;
if (name == NULL)
return -EINVAL;
- ret = vdev_remove_driver(name);
- if (ret > 0)
- RTE_LOG(ERR, EAL, "no driver found for %s\n", name);
+ dev = find_vdev(name);
+ if (!dev)
+ return -ENOENT;
- return ret;
+ devargs = dev->device.devargs;
+
+ ret = vdev_remove_driver(dev);
+ if (ret)
+ return ret;
+
+ TAILQ_REMOVE(&vdev_device_list, dev, next);
+ rte_eal_device_remove(&dev->device);
+
+ TAILQ_REMOVE(&devargs_list, devargs, next);
+
+ free(devargs->args);
+ free(devargs);
+ free(dev);
+ return 0;
}
static int
vdev_scan(void)
{
- /* for virtual devices we don't need to scan anything */
+ struct rte_vdev_device *dev;
+ struct rte_devargs *devargs;
+
+ /* for virtual devices we scan the devargs_list populated via cmdline */
+
+ TAILQ_FOREACH(devargs, &devargs_list, next) {
+
+ if (devargs->type != RTE_DEVTYPE_VIRTUAL)
+ continue;
+
+ dev = find_vdev(devargs->virt.drv_name);
+ if (dev)
+ continue;
+
+ dev = calloc(1, sizeof(*dev));
+ if (!dev)
+ return -1;
+
+ dev->device.devargs = devargs;
+ dev->device.numa_node = SOCKET_ID_ANY;
+
+ rte_eal_device_insert(&dev->device);
+ TAILQ_INSERT_TAIL(&vdev_device_list, dev, next);
+ }
+
return 0;
}
static int
vdev_probe(void)
{
- struct rte_devargs *devargs;
+ struct rte_vdev_device *dev;
/*
* Note that the dev_driver_list is populated here
@@ -177,15 +293,14 @@ vdev_probe(void)
*/
/* call the init function for each virtual device */
- TAILQ_FOREACH(devargs, &devargs_list, next) {
+ TAILQ_FOREACH(dev, &vdev_device_list, next) {
- if (devargs->type != RTE_DEVTYPE_VIRTUAL)
+ if (dev->device.driver)
continue;
- if (rte_eal_vdev_init(devargs->virt.drv_name,
- devargs->args)) {
+ if (vdev_probe_all_drivers(dev)) {
RTE_LOG(ERR, EAL, "failed to initialize %s device\n",
- devargs->virt.drv_name);
+ rte_vdev_device_name(dev));
return -1;
}
}
--
2.7.4