From patchwork Mon Mar 6 10:56:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Blunck X-Patchwork-Id: 21475 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 2799DF954; Mon, 6 Mar 2017 11:57:51 +0100 (CET) Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by dpdk.org (Postfix) with ESMTP id 35197952 for ; Mon, 6 Mar 2017 11:57:13 +0100 (CET) Received: by mail-wm0-f66.google.com with SMTP id z63so10862889wmg.2 for ; Mon, 06 Mar 2017 02:57:13 -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=ndwYxUKFbNm3+BDBs4roUBcp10WoTXIN9fSilCHaNrU=; b=seSPbgUO+dFLnOFYc4xgsBoxpVvrYfoL9DbgBws466OZbFIQ2KRZVd4QNi6KzStcSR TLbg8ZMgTsRNebpGPX+OEwtqwJhodW7+4GS+knqt6z/C5qfFJHwDX21K6VXarYvUUH4C NIYDl2n/2tidOyaCqewp9jN39anaJQnVUigeodNINvsTd11dC7dmBBkVx+SC9gdU1FIK FbREX/7K3IJ9OMZHK4c0oHlsrwD37S9spu15zczLqytbhERxyYqQjeKS/Xs7pbK4AhwT LR1PXK4ke4zp9cp4h2ybT7/1HYC+nPg4F7uv2ve+ZmYx/zsXkCqBzsMKxpRStIw7XAb0 wQMg== 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=ndwYxUKFbNm3+BDBs4roUBcp10WoTXIN9fSilCHaNrU=; b=LiaB2wPYVi+QOr1SIV/BtQJahRdc1apWjMOw3oRA05yHyTl+/399em0tcD8kgsnjA5 +qMsVVnbmhS/3z+4PO4paGrZDHinfv/dwusPbL5ITkwM7Z0FvbQGHhJMHm7EDPPe14JG mrR1agBxi0LLRGZ+H4Cd+77vIbxDPti2b2YLTbJzMasBtYiSwZh3bQDCLM3t4yURGhKk X6SxkLnBzaOeXb0smfw2IYHoOlMcX0LAu3ObFhNFwJJoooA4U//UL+vKSCa/xaTwfYAl nKGUrc7nTtRytE9vIOXXtl/2REHp0+myqS0pHZM8kiAsgKZigyAVPw4jOUq4vipdrK5b YwJQ== X-Gm-Message-State: AMke39lV9cuyJLne4KALd9JWBBVbotjrvhRv+PaorUIt6c89xBgKWm+KtInO+H4o40J3zQ== X-Received: by 10.28.84.18 with SMTP id i18mr12660595wmb.130.1488797832942; Mon, 06 Mar 2017 02:57:12 -0800 (PST) Received: from weierstrass.local.net ([91.200.109.169]) by smtp.gmail.com with ESMTPSA id o63sm14277896wmo.30.2017.03.06.02.57.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Mar 2017 02:57:12 -0800 (PST) From: Jan Blunck To: dev@dpdk.org Cc: david.marchand@6wind.com, shreyansh.jain@nxp.com, ferruh.yigit@intel.com Date: Mon, 6 Mar 2017 11:56:48 +0100 Message-Id: <1488797809-12917-10-git-send-email-jblunck@infradead.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488797809-12917-1-git-send-email-jblunck@infradead.org> References: <1488797809-12917-1-git-send-email-jblunck@infradead.org> In-Reply-To: <1488018496-995-1-git-send-email-jblunck@infradead.org> References: <1488018496-995-1-git-send-email-jblunck@infradead.org> Subject: [dpdk-dev] [PATCH v4 09/10] 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This allows the virtual bus to be rescanned and probed by tracking the creation of rte_vdev_device. Signed-off-by: Jan Blunck Tested-by: Ferruh Yigit Acked-by: Shreyansh Jain --- 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 f884c7b..d7a586b 100644 --- a/lib/librte_eal/common/eal_common_vdev.c +++ b/lib/librte_eal/common/eal_common_vdev.c @@ -41,6 +41,7 @@ #include #include #include +#include /** Double linked list of virtual device drivers. */ TAILQ_HEAD(vdev_device_list, rte_vdev_device); @@ -67,9 +68,12 @@ rte_eal_vdrv_unregister(struct rte_vdev_driver *driver) } 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); + const char *args = rte_vdev_device_args(dev); struct rte_vdev_driver *driver; + int ret; TAILQ_FOREACH(driver, &vdev_driver_list, next) { /* @@ -79,90 +83,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 @@ -171,15 +287,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; } }