From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gaetan.rivet@6wind.com>
Received: from mail-wr0-f176.google.com (mail-wr0-f176.google.com
 [209.85.128.176]) by dpdk.org (Postfix) with ESMTP id C3E832C8
 for <dev@dpdk.org>; Fri,  7 Jul 2017 02:03:47 +0200 (CEST)
Received: by mail-wr0-f176.google.com with SMTP id 77so24189940wrb.1
 for <dev@dpdk.org>; Thu, 06 Jul 2017 17:03:47 -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=qp0W3/3nFeRgb2SVCZMcS1l2gZKCooXw/udb+M3FvrM=;
 b=CwBdSJuv48znpK2zeA4ScrU52p/jz6L4ceSPSV/7C0w+yIKoMN0X/eZi5GPIG3XYA/
 Pxdpy91kyh0Q8Ev8oAla45/Ur/wYweCJXBB9tXAKzx0C1sqAM4friGz4pBcILRejRG5W
 mSttVIN1MA/eWte2GLq3ukvXZieRDzMPRZXSCX83mMO4jHlodSCjswF69RVMpNcqFGTr
 zm7VZEasQUyjnbztfBb6qB4AB7+/pwEBoCizFDezGgMtcTQSKiAj0CY0Q+PauJ8O5MGz
 KWcMgJwZF4bk++yWhNDTmlI/fV+0Dc5AlNY5S1Uo6CWaGC0BsHUT1HyhbT6TuCTdkgcg
 KI5g==
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=qp0W3/3nFeRgb2SVCZMcS1l2gZKCooXw/udb+M3FvrM=;
 b=kgdu5Zsmm8kfPDCaMku9DGVpa/Gfmj++mesNK/9pFwqkanY8rMwQFxFIKFOxG3qX9+
 W13sBxv2CscJoaYc66XwR2x0SRtMTB4c3ZRogqw/+7FTecYex4EkInXlZHTG4Q9/YEHp
 m0M2IFA9+98+RuZZF6OfY81yae/zyErSPfJpflZDMDLF9DkxHA2CK6VKNA1DmgXax44f
 AynLOvsj5UhmmoacTCHI5UfCLq6mnmt2GJaRzIz8J7aK9Cgfsb5qLzwSC+zCVEowHmXD
 9HyK+ooNuknu5wboNOo2laNLx/M0FVlNqpBQZKimNvf1lzdwfsW9tfFhYx/LS3/8z7qp
 b55w==
X-Gm-Message-State: AKS2vOze6kdnr7cUDv4w/keYvPXqRp8dlkiUDJtDRPekG9jukXBFCFns
 M2cBYQTvMqVjbfnYyzE=
X-Received: by 10.223.166.139 with SMTP id t11mr43357285wrc.39.1499385827164; 
 Thu, 06 Jul 2017 17:03:47 -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 p7sm2364921wmf.11.2017.07.06.17.03.46
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
 Thu, 06 Jul 2017 17:03:46 -0700 (PDT)
From: Gaetan Rivet <gaetan.rivet@6wind.com>
To: dev@dpdk.org
Cc: Gaetan Rivet <gaetan.rivet@6wind.com>
Date: Fri,  7 Jul 2017 02:03:12 +0200
Message-Id: <c1b0948b7fa37cf71fadf44365f13a52264557c8.1499384335.git.gaetan.rivet@6wind.com>
X-Mailer: git-send-email 2.1.4
In-Reply-To: <cover.1499384335.git.gaetan.rivet@6wind.com>
References: <cover.1499211317.git.gaetan.rivet@6wind.com>
 <cover.1499384335.git.gaetan.rivet@6wind.com>
In-Reply-To: <cover.1499384335.git.gaetan.rivet@6wind.com>
References: <cover.1499384335.git.gaetan.rivet@6wind.com>
Subject: [dpdk-dev] [PATCH v8 6/6] devargs: parse bus info
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: Fri, 07 Jul 2017 00:03:48 -0000

Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
Acked-by: Shreyansh Jain <shreyansh.jain@nxp.com>
---
 lib/librte_eal/common/eal_common_devargs.c  | 42 ++++++++++++++++++++++++-----
 lib/librte_eal/common/eal_common_vdev.c     |  6 +++--
 lib/librte_eal/common/include/rte_devargs.h |  3 +++
 3 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/librte_eal/common/eal_common_devargs.c
index ffa8ad9..102bd8d 100644
--- a/lib/librte_eal/common/eal_common_devargs.c
+++ b/lib/librte_eal/common/eal_common_devargs.c
@@ -78,12 +78,23 @@ rte_eal_parse_devargs_str(const char *devargs_str,
 	return 0;
 }
 
+static int
+bus_name_cmp(const struct rte_bus *bus, const void *_name)
+{
+	const char *name = _name;
+
+	return strncmp(bus->name, name,
+		       strlen(bus->name));
+}
+
 /* store a whitelist parameter for later parsing */
 int
 rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str)
 {
 	struct rte_devargs *devargs = NULL;
-	char *buf = NULL;
+	struct rte_bus *bus = NULL;
+	char *dev = NULL;
+	const char *devname;
 	int ret;
 
 	/* use malloc instead of rte_malloc as it's called early at init */
@@ -94,34 +105,51 @@ rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str)
 	memset(devargs, 0, sizeof(*devargs));
 	devargs->type = devtype;
 
-	if (rte_eal_parse_devargs_str(devargs_str, &buf, &devargs->args))
+	if (rte_eal_parse_devargs_str(devargs_str, &dev, &devargs->args))
 		goto fail;
+	devname = dev;
+	do {
+		bus = rte_bus_find(bus, bus_name_cmp, dev);
+		if (bus == NULL)
+			break;
+		devname = dev + strlen(bus->name) + 1;
+		if (rte_bus_find_by_device_name(devname) == bus)
+			break;
+		devname = dev;
+	} while (1);
+	if (bus == NULL) {
+		bus = rte_bus_find_by_device_name(devname);
+		if (bus == NULL) {
+			fprintf(stderr, "ERROR: failed to parse bus info from device declaration\n");
+			goto fail;
+		}
+	}
+	devargs->bus = bus;
 
 	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)
+		if (bus->parse(devname, &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);
+			       sizeof(devargs->virt.drv_name), "%s", devname);
 		if (ret < 0 || ret >= (int)sizeof(devargs->virt.drv_name))
 			goto fail;
 
 		break;
 	}
 
-	free(buf);
+	free(dev);
 	TAILQ_INSERT_TAIL(&devargs_list, devargs, next);
 	return 0;
 
 fail:
-	free(buf);
+	free(dev);
 	if (devargs) {
 		free(devargs->args);
 		free(devargs);
diff --git a/lib/librte_eal/common/eal_common_vdev.c b/lib/librte_eal/common/eal_common_vdev.c
index 6ecd1b5..8fd1ef7 100644
--- a/lib/librte_eal/common/eal_common_vdev.c
+++ b/lib/librte_eal/common/eal_common_vdev.c
@@ -177,6 +177,7 @@ alloc_devargs(const char *name, const char *args)
 		return NULL;
 
 	devargs->type = RTE_DEVTYPE_VIRTUAL;
+	devargs->bus = rte_bus_find_by_name("vdev");
 	if (args)
 		devargs->args = strdup(args);
 
@@ -289,12 +290,13 @@ vdev_scan(void)
 {
 	struct rte_vdev_device *dev;
 	struct rte_devargs *devargs;
+	struct rte_bus *vbus;
 
 	/* for virtual devices we scan the devargs_list populated via cmdline */
-
+	vbus = rte_bus_find_by_name("vdev");
 	TAILQ_FOREACH(devargs, &devargs_list, next) {
 
-		if (devargs->type != RTE_DEVTYPE_VIRTUAL)
+		if (devargs->bus != vbus)
 			continue;
 
 		dev = find_vdev(devargs->virt.drv_name);
diff --git a/lib/librte_eal/common/include/rte_devargs.h b/lib/librte_eal/common/include/rte_devargs.h
index b11cbfc..6014853 100644
--- a/lib/librte_eal/common/include/rte_devargs.h
+++ b/lib/librte_eal/common/include/rte_devargs.h
@@ -51,6 +51,7 @@ extern "C" {
 #include <stdio.h>
 #include <sys/queue.h>
 #include <rte_pci.h>
+#include <rte_bus.h>
 
 /**
  * Type of generic device
@@ -89,6 +90,8 @@ struct rte_devargs {
 			char drv_name[RTE_DEV_NAME_MAX_LEN];
 		} virt;
 	};
+	/** Bus handle for the device. */
+	struct rte_bus *bus;
 	/** Arguments string as given by user or "" for no argument. */
 	char *args;
 };
-- 
2.1.4