From patchwork Wed Jun 7 23:56:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ga=C3=ABtan_Rivet?= X-Patchwork-Id: 25145 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 1B7567D15; Thu, 8 Jun 2017 01:57:55 +0200 (CEST) Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com [74.125.82.45]) by dpdk.org (Postfix) with ESMTP id 7F35E5A6A for ; Thu, 8 Jun 2017 01:57:33 +0200 (CEST) Received: by mail-wm0-f45.google.com with SMTP id n195so20798587wmg.1 for ; Wed, 07 Jun 2017 16:57:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=CJOaDGRR88Q+l1NUY7+Sns+l21Q4JNewIncZn9K0vfk=; b=homq2fODP9bPWGD+WcELbVijRSzJTZfDGSc3ex9savuQq1e3073RPYJdctDkSunkCb Or/RlmKbm85lYp5PbjSuRCHubv+/IwD1F6R4/ChvsQLvCQ41d+FkoH6ZuESUHSIUo8cr Vc57ppLkOtcFGnN8TWeNMOEH2mC+sc5QuduqgGnLemui2G0NpbJHfCZQzXQvCKGZaWcu C9dx1/LnfAGOwZMnlLTbNoDfbAFUu2a6WiiEbEDsMJhjtI8liZ0PMayn/qSEME30A6iy u6r0y+1qXShIm7gm/LQIUenkCvCRNa+ywXV81npMnqy7minKCcVd4XfSb62qyynxjg6v xSzA== 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:in-reply-to :references:in-reply-to:references; bh=CJOaDGRR88Q+l1NUY7+Sns+l21Q4JNewIncZn9K0vfk=; b=I+f+9jMYyZzOGFyN9Bfcj+vWYIus+ON0lmbFWZAoKgLDtNijIQHS0VtAj9VybbVLK3 sfw/mfb7L3f/ubJ/qyP9JXwDeTrZBMZXAOiNii2ge4F8i70+iM6azV3HP2dv4n8d0/xD 7iuTbdJu5RMLzEviM08Ee699FMlGIz7etC+DtRk1PhZdHe2+ZQu4kR8GW+z40ict2jOB RHO5JI2ndBhF8iq2CrItvhAxcvnFvgG2KN6j1CwiRwi9vlOfMkDBLDfOwif4b2puPkhP 1w5LOatsy+PLKWIyeZp7yMbvNlKGHCJtKHs5FN6e2pWad82Z1PYRcCSLU511Hn8jIhyK e4kg== X-Gm-Message-State: AODbwcAsaAV6iGwlpTnS9kbpuzkVv8oFrJW2aOb12sgeSGAcdR3g/BIa xl+GosZn8msoGRM6T+E= X-Received: by 10.28.24.202 with SMTP id 193mr1394382wmy.125.1496879852885; Wed, 07 Jun 2017 16:57:32 -0700 (PDT) Received: from bidouze.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id 185sm22397056wmp.1.2017.06.07.16.57.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Jun 2017 16:57:31 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Thu, 8 Jun 2017 01:56:58 +0200 Message-Id: <278b019ce8344bdea2234ff542a91891ca0f79ed.1496876859.git.gaetan.rivet@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v4 12/19] devargs: generic device representation 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" Remove the dependency of this subsystem upon bus specific device representation. Devargs only validates that a device declaration is correct and handled by a bus. The device interpretation is done afterward within the bus. Signed-off-by: Gaetan Rivet --- app/test-pmd/testpmd.c | 9 ++---- lib/librte_eal/common/eal_common_devargs.c | 48 +++++------------------------ lib/librte_eal/common/eal_common_pci.c | 9 ++++-- lib/librte_eal/common/eal_common_vdev.c | 17 +++++----- lib/librte_eal/common/include/rte_devargs.h | 16 ++-------- lib/librte_eal/common/include/rte_vdev.h | 2 +- test/test/test_devargs.c | 9 ++---- 7 files changed, 30 insertions(+), 80 deletions(-) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 17ae446..f36de2f 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -1810,7 +1810,6 @@ rmv_event_callback(void *arg) { struct rte_eth_dev *dev; struct rte_devargs *da; - char name[32] = ""; uint8_t port_id = (intptr_t)arg; RTE_ETH_VALID_PORTID_OR_RET(port_id); @@ -1819,12 +1818,8 @@ rmv_event_callback(void *arg) stop_port(port_id); close_port(port_id); - if (da->type == RTE_DEVTYPE_VIRTUAL) - snprintf(name, sizeof(name), "%s", da->virt.drv_name); - else if (da->type == RTE_DEVTYPE_WHITELISTED_PCI) - rte_pci_device_name(&da->pci.addr, name, sizeof(name)); - printf("removing device %s\n", name); - rte_eal_dev_detach(name); + printf("removing device %s\n", da->name); + rte_eal_dev_detach(da->name); dev->state = RTE_ETH_DEV_UNUSED; } diff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/librte_eal/common/eal_common_devargs.c index a5014bf..51ffb45 100644 --- a/lib/librte_eal/common/eal_common_devargs.c +++ b/lib/librte_eal/common/eal_common_devargs.c @@ -40,7 +40,6 @@ #include #include -#include #include #include "eal_private.h" @@ -112,24 +111,10 @@ rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str) if (rte_eal_parse_devargs_str(dev, &buf, &devargs->args)) goto fail; - switch (devargs->type) { - case RTE_DEVTYPE_WHITELISTED_PCI: - case RTE_DEVTYPE_BLACKLISTED_PCI: - /* try to parse pci identifier */ - if (eal_parse_pci_BDF(buf, &devargs->pci.addr) != 0 && - eal_parse_pci_DomBDF(buf, &devargs->pci.addr) != 0) - goto fail; - - break; - case RTE_DEVTYPE_VIRTUAL: - /* save driver name */ - ret = snprintf(devargs->virt.drv_name, - sizeof(devargs->virt.drv_name), "%s", buf); - if (ret < 0 || ret >= (int)sizeof(devargs->virt.drv_name)) - goto fail; - - break; - } + /* save device name. */ + ret = snprintf(devargs->name, sizeof(devargs->name), "%s", buf); + if (ret < 0 || ret >= (int)sizeof(devargs->name)) + goto fail; if (devargs->type == RTE_DEVTYPE_WHITELISTED_PCI) { if (bus->conf.scan_mode == RTE_BUS_SCAN_UNDEFINED) { bus->conf.scan_mode = RTE_BUS_SCAN_WHITELIST; @@ -181,27 +166,10 @@ rte_eal_devargs_dump(FILE *f) { struct rte_devargs *devargs; - fprintf(f, "User device white list:\n"); + fprintf(f, "User device list:\n"); TAILQ_FOREACH(devargs, &devargs_list, next) { - if (devargs->type == RTE_DEVTYPE_WHITELISTED_PCI) - fprintf(f, " PCI whitelist " PCI_PRI_FMT " %s\n", - devargs->pci.addr.domain, - devargs->pci.addr.bus, - devargs->pci.addr.devid, - devargs->pci.addr.function, - devargs->args); - else if (devargs->type == RTE_DEVTYPE_BLACKLISTED_PCI) - fprintf(f, " PCI blacklist " PCI_PRI_FMT " %s\n", - devargs->pci.addr.domain, - devargs->pci.addr.bus, - devargs->pci.addr.devid, - devargs->pci.addr.function, - devargs->args); - else if (devargs->type == RTE_DEVTYPE_VIRTUAL) - fprintf(f, " VIRTUAL %s %s\n", - devargs->virt.drv_name, - devargs->args); - else - fprintf(f, " UNKNOWN %s\n", devargs->args); + fprintf(f, " [%s]: %s %s\n", + (devargs->bus ? devargs->bus->name : "??"), + devargs->name, devargs->args); } } diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c index 3075eee..83ae378 100644 --- a/lib/librte_eal/common/eal_common_pci.c +++ b/lib/librte_eal/common/eal_common_pci.c @@ -73,12 +73,15 @@ const char *pci_get_sysfs_path(void) static struct rte_devargs *pci_devargs_lookup(struct rte_pci_device *dev) { struct rte_devargs *devargs; + struct rte_pci_addr addr; + struct rte_bus *pbus; + pbus = rte_bus_from_name(PCI_BUS_NAME); TAILQ_FOREACH(devargs, &devargs_list, next) { - if (devargs->type != RTE_DEVTYPE_BLACKLISTED_PCI && - devargs->type != RTE_DEVTYPE_WHITELISTED_PCI) + if (devargs->bus != pbus) continue; - if (!rte_eal_compare_pci_addr(&dev->addr, &devargs->pci.addr)) + devargs->bus->parse(devargs->name, &addr); + if (!rte_eal_compare_pci_addr(&dev->addr, &addr)) return devargs; } return NULL; diff --git a/lib/librte_eal/common/eal_common_vdev.c b/lib/librte_eal/common/eal_common_vdev.c index 7cc3c6c..c56fb6d 100644 --- a/lib/librte_eal/common/eal_common_vdev.c +++ b/lib/librte_eal/common/eal_common_vdev.c @@ -186,9 +186,8 @@ alloc_devargs(const char *name, const char *args) 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)) { + ret = snprintf(devargs->name, sizeof(devargs->name), "%s", name); + if (ret < 0 || ret >= (int)sizeof(devargs->name)) { free(devargs->args); free(devargs); return NULL; @@ -223,7 +222,7 @@ rte_vdev_init(const char *name, const char *args) dev->device.devargs = devargs; dev->device.numa_node = SOCKET_ID_ANY; - dev->device.name = devargs->virt.drv_name; + dev->device.name = devargs->name; ret = vdev_probe_all_drivers(dev); if (ret) { @@ -304,7 +303,7 @@ vdev_scan(void) if (devargs->bus != vbus) continue; - dev = find_vdev(devargs->virt.drv_name); + dev = find_vdev(devargs->name); if (dev) continue; @@ -314,7 +313,7 @@ vdev_scan(void) dev->device.devargs = devargs; dev->device.numa_node = SOCKET_ID_ANY; - dev->device.name = devargs->virt.drv_name; + dev->device.name = devargs->name; TAILQ_INSERT_TAIL(&vdev_device_list, dev, next); } @@ -361,12 +360,12 @@ vdev_plug(struct rte_devargs *da) struct rte_vdev_device *dev; int ret; - ret = rte_vdev_init(da->virt.drv_name, da->args); + ret = rte_vdev_init(da->name, da->args); if (ret) { rte_errno = -ret; return NULL; } - dev = find_vdev(da->virt.drv_name); + dev = find_vdev(da->name); return &dev->device; } @@ -381,7 +380,7 @@ vdev_unplug(struct rte_device *dev) rte_errno = EINVAL; return -1; } - ret = rte_vdev_uninit(da->virt.drv_name); + ret = rte_vdev_uninit(da->name); if (ret) rte_errno = -ret; return ret; diff --git a/lib/librte_eal/common/include/rte_devargs.h b/lib/librte_eal/common/include/rte_devargs.h index 1f50a24..6a26d3d 100644 --- a/lib/librte_eal/common/include/rte_devargs.h +++ b/lib/librte_eal/common/include/rte_devargs.h @@ -50,7 +50,6 @@ extern "C" { #include #include -#include #include /** @@ -77,21 +76,10 @@ struct rte_devargs { TAILQ_ENTRY(rte_devargs) next; /** Type of device. */ enum rte_devtype type; - RTE_STD_C11 - union { - /** Used if type is RTE_DEVTYPE_*_PCI. */ - struct { - /** PCI location. */ - struct rte_pci_addr addr; - } pci; - /** Used if type is RTE_DEVTYPE_VIRTUAL. */ - struct { - /** Driver name. */ - char drv_name[32]; - } virt; - }; /** Bus handle for the device. */ struct rte_bus *bus; + /** Name of the device. */ + char name[32]; /** Arguments string as given by user or "" for no argument. */ char *args; }; diff --git a/lib/librte_eal/common/include/rte_vdev.h b/lib/librte_eal/common/include/rte_vdev.h index 2d02c68..4debcde 100644 --- a/lib/librte_eal/common/include/rte_vdev.h +++ b/lib/librte_eal/common/include/rte_vdev.h @@ -52,7 +52,7 @@ static inline const char * rte_vdev_device_name(const struct rte_vdev_device *dev) { if (dev && dev->device.devargs) - return dev->device.devargs->virt.drv_name; + return dev->device.devargs->name; return NULL; } diff --git a/test/test/test_devargs.c b/test/test/test_devargs.c index 63242f1..18f54ed 100644 --- a/test/test/test_devargs.c +++ b/test/test/test_devargs.c @@ -90,8 +90,8 @@ test_devargs(void) if (rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL, "net_ring1,k1=val,k2=val2") < 0) goto fail; devargs = TAILQ_FIRST(&devargs_list); - if (strncmp(devargs->virt.drv_name, "net_ring1", - sizeof(devargs->virt.drv_name)) != 0) + if (strncmp(devargs->name, "net_ring1", + sizeof(devargs->name)) != 0) goto fail; if (!devargs->args || strcmp(devargs->args, "k1=val,k2=val2") != 0) goto fail; @@ -101,10 +101,7 @@ test_devargs(void) if (rte_eal_devargs_add(RTE_DEVTYPE_WHITELISTED_PCI, "04:00.1") < 0) goto fail; devargs = TAILQ_FIRST(&devargs_list); - if (devargs->pci.addr.domain != 0 || - devargs->pci.addr.bus != 4 || - devargs->pci.addr.devid != 0 || - devargs->pci.addr.function != 1) + if (strcmp(devargs->name, "04:00.1") != 0) goto fail; if (!devargs->args || strcmp(devargs->args, "") != 0) goto fail;