From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gaetan.rivet@6wind.com>
Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54])
by dpdk.org (Postfix) with ESMTP id E22712C71
for <dev@dpdk.org>; Wed, 8 Mar 2017 16:16:07 +0100 (CET)
Received: by mail-wm0-f54.google.com with SMTP id n11so117444480wma.1
for <dev@dpdk.org>; Wed, 08 Mar 2017 07:16:07 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=6wind-com.20150623.gappssmtp.com; s=20150623;
h=from:to:subject:date:message-id:in-reply-to:references:in-reply-to
:references; bh=0V+nJgCFp1+vS3WrqMTqY5Qtzag7XTSRO0+K44AEzqU=;
b=1e82KYlxuzVhtKYfWlS8dXdKzJtQcL46t7jOCsJcECoQbEVhJy8FNkJ08M7/yB9Zx2
ckh3uyAieqjPbwaoGARdXtvuimzYo+YtwMuFeTPd4ie9JwrSee9FMiMXJlLxzRvicVOq
4faklIAe90iYmpQNyR0mJw5lEK7y/8P2IrGOYqKwM3qFgdWW/iC9mkFsMyKw0enMeMUV
at6IpHGaTMk4K+vqTMTiEN8d5ZhwZu1+XDt/FT/luNJNoldHMkQTEztDa1WqPbTm/0wO
SUYIqVT/C+xDvUmUJMK7B/A6cK8si2K/WUbgLOyQ9KXHx1dMGtjPe80WDxKpKomt0dda
iu5g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to
:references:in-reply-to:references;
bh=0V+nJgCFp1+vS3WrqMTqY5Qtzag7XTSRO0+K44AEzqU=;
b=n8dSTJJkJK1g8+fDtI8Gdy6Dku3nsImfHptPJkqjEscWeHCjBCLYsqxty80L1R7mfs
Pmj/v3IJycKOegNUFJJ9Mkm9wBg6UdzZtliKmLW1VFE6ZToBm3adIv9VoDGvez8vb+T1
HfNqZqKgz/pixmKKa5IXg0htPxXbIeVQ6YQNluKg7rqUNjxsItoznm9yMI+1OauyY/1e
HzdXCu4UsvudHKdSX/LmbBRf+RRwAxQXkzCK4Hj2O5OlpNjKgYr/3wZPplc+E8zvnXJ+
aZzdgT0yHumKaaMZlQouz346ykrtJnCN3yv+5W/oQB4tHH+XskWcRmlFqr9ocCifjnoX
ti9A==
X-Gm-Message-State: AMke39nc2t0LHPtiDkOTtgu6shx6l/zaMuvHLAljpCrOu2FbOQlgLRcAa3D19N5No5UgNghD
X-Received: by 10.28.236.209 with SMTP id h78mr24802655wmi.97.1488986167408;
Wed, 08 Mar 2017 07:16:07 -0800 (PST)
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 t103sm4553592wrc.43.2017.03.08.07.16.06
for <dev@dpdk.org>
(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
Wed, 08 Mar 2017 07:16:06 -0800 (PST)
From: Gaetan Rivet <gaetan.rivet@6wind.com>
To: dev@dpdk.org
Date: Wed, 8 Mar 2017 16:15:38 +0100
Message-Id: <fe802947ac2a4e0dae51e4cd4cd0027345821fa0.1488985489.git.gaetan.rivet@6wind.com>
X-Mailer: git-send-email 2.1.4
In-Reply-To: <cover.1488550982.git.gaetan.rivet@6wind.com>
References: <cover.1488550982.git.gaetan.rivet@6wind.com>
In-Reply-To: <cover.1488985489.git.gaetan.rivet@6wind.com>
References: <cover.1488985489.git.gaetan.rivet@6wind.com>
Subject: [dpdk-dev] [PATCH v2 05/13] pci: expose parse and probe routines
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: Wed, 08 Mar 2017 15:16:08 -0000
Make pci_probe_all_drivers public, no further changes to it.
Introduce a public function for pci_scan_one. This functions scan one
device, but does not allocate that device or insert it within the device
list.
Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
---
lib/librte_eal/bsdapp/eal/rte_eal_version.map | 1 +
lib/librte_eal/common/eal_common_pci.c | 10 +++----
lib/librte_eal/common/include/rte_pci.h | 25 ++++++++++++++++
lib/librte_eal/linuxapp/eal/eal_pci.c | 39 +++++++++++++++----------
lib/librte_eal/linuxapp/eal/rte_eal_version.map | 2 ++
5 files changed, 57 insertions(+), 20 deletions(-)
diff --git a/lib/librte_eal/bsdapp/eal/rte_eal_version.map b/lib/librte_eal/bsdapp/eal/rte_eal_version.map
index 3a87756..ba8f8e4 100644
--- a/lib/librte_eal/bsdapp/eal/rte_eal_version.map
+++ b/lib/librte_eal/bsdapp/eal/rte_eal_version.map
@@ -188,5 +188,6 @@ DPDK_17.02 {
DPDK_17.05 {
rte_eal_pci_detach_all_drivers;
+ rte_eal_pci_probe_all_drivers;
} DPDK_17.02;
diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c
index d38335a..15a0c48 100644
--- a/lib/librte_eal/common/eal_common_pci.c
+++ b/lib/librte_eal/common/eal_common_pci.c
@@ -282,8 +282,8 @@ rte_eal_pci_detach_dev(struct rte_pci_driver *dr,
* registered driver for the given device. Return -1 if initialization
* failed, return 1 if no driver is found for this device.
*/
-static int
-pci_probe_all_drivers(struct rte_pci_device *dev)
+int
+rte_eal_pci_probe_all_drivers(struct rte_pci_device *dev)
{
struct rte_pci_driver *dr = NULL;
int rc = 0;
@@ -358,7 +358,7 @@ rte_eal_pci_probe_one(const struct rte_pci_addr *addr)
if (rte_eal_compare_pci_addr(&dev->addr, addr))
continue;
- ret = pci_probe_all_drivers(dev);
+ ret = rte_eal_pci_probe_all_drivers(dev);
if (ret)
goto err_return;
return 0;
@@ -430,10 +430,10 @@ rte_eal_pci_probe(void)
/* probe all or only whitelisted devices */
if (probe_all)
- ret = pci_probe_all_drivers(dev);
+ ret = rte_eal_pci_probe_all_drivers(dev);
else if (devargs != NULL &&
devargs->type == RTE_DEVTYPE_WHITELISTED_PCI)
- ret = pci_probe_all_drivers(dev);
+ ret = rte_eal_pci_probe_all_drivers(dev);
if (ret < 0)
rte_exit(EXIT_FAILURE, "Requested device " PCI_PRI_FMT
" cannot be used\n", dev->addr.domain, dev->addr.bus,
diff --git a/lib/librte_eal/common/include/rte_pci.h b/lib/librte_eal/common/include/rte_pci.h
index 598a1ef..4291da8 100644
--- a/lib/librte_eal/common/include/rte_pci.h
+++ b/lib/librte_eal/common/include/rte_pci.h
@@ -373,6 +373,16 @@ rte_eal_compare_pci_addr(const struct rte_pci_addr *addr,
int rte_eal_pci_scan(void);
/**
+ * Parse the content of one PCI entry.
+ *
+ * @return
+ * 0 on success, negative on error
+ */
+int rte_eal_pci_parse_sysfs_entry(struct rte_pci_device *dev,
+ const char *dirname,
+ const struct rte_pci_addr *addr);
+
+/**
* Probe the PCI bus for registered drivers.
*
* Scan the content of the PCI bus, and call the probe() function for
@@ -459,6 +469,21 @@ void pci_unmap_resource(void *requested_addr, size_t size);
int rte_eal_pci_probe_one(const struct rte_pci_addr *addr);
/**
+ * Probe all pci drivers against the device.
+ *
+ * If vendor/device ID match, call the probe() function of all
+ * registered driver for the given device.
+ *
+ * @param dev
+ * The PCI device to probe
+ * @return
+ * - 0 on success.
+ * - Negative on error.
+ * - Positive if no driver exists for that device.
+ */
+int rte_eal_pci_probe_all_drivers(struct rte_pci_device *dev);
+
+/**
* Remove any PCI drivers tied to the device.
*
* If vendor/device ID match, call the remove() function of all
diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c
index e2fc219..51c6b84 100644
--- a/lib/librte_eal/linuxapp/eal/eal_pci.c
+++ b/lib/librte_eal/linuxapp/eal/eal_pci.c
@@ -226,27 +226,22 @@ pci_parse_sysfs_resource(const char *filename, struct rte_pci_device *dev)
return -1;
}
-/* Scan one pci sysfs entry, and fill the devices list from it. */
-static int
-pci_scan_one(const char *dirname, const struct rte_pci_addr *addr)
+/* Parse a pci sysfs entry */
+int
+rte_eal_pci_parse_sysfs_entry(struct rte_pci_device *dev, const char *dirname,
+ const struct rte_pci_addr *addr)
{
char filename[PATH_MAX];
unsigned long tmp;
- struct rte_pci_device *dev;
char driver[PATH_MAX];
int ret;
- dev = malloc(sizeof(*dev));
- if (dev == NULL)
- return -1;
-
memset(dev, 0, sizeof(*dev));
dev->addr = *addr;
/* get vendor id */
snprintf(filename, sizeof(filename), "%s/vendor", dirname);
if (eal_parse_sysfs_value(filename, &tmp) < 0) {
- free(dev);
return -1;
}
dev->id.vendor_id = (uint16_t)tmp;
@@ -254,7 +249,6 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr)
/* get device id */
snprintf(filename, sizeof(filename), "%s/device", dirname);
if (eal_parse_sysfs_value(filename, &tmp) < 0) {
- free(dev);
return -1;
}
dev->id.device_id = (uint16_t)tmp;
@@ -263,7 +257,6 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr)
snprintf(filename, sizeof(filename), "%s/subsystem_vendor",
dirname);
if (eal_parse_sysfs_value(filename, &tmp) < 0) {
- free(dev);
return -1;
}
dev->id.subsystem_vendor_id = (uint16_t)tmp;
@@ -272,7 +265,6 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr)
snprintf(filename, sizeof(filename), "%s/subsystem_device",
dirname);
if (eal_parse_sysfs_value(filename, &tmp) < 0) {
- free(dev);
return -1;
}
dev->id.subsystem_device_id = (uint16_t)tmp;
@@ -281,7 +273,6 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr)
snprintf(filename, sizeof(filename), "%s/class",
dirname);
if (eal_parse_sysfs_value(filename, &tmp) < 0) {
- free(dev);
return -1;
}
/* the least 24 bits are valid: class, subclass, program interface */
@@ -320,7 +311,6 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr)
snprintf(filename, sizeof(filename), "%s/resource", dirname);
if (pci_parse_sysfs_resource(filename, dev) < 0) {
RTE_LOG(ERR, EAL, "%s(): cannot parse resource\n", __func__);
- free(dev);
return -1;
}
@@ -329,7 +319,6 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr)
ret = pci_get_kernel_driver_by_path(filename, driver);
if (ret < 0) {
RTE_LOG(ERR, EAL, "Fail to get kernel driver\n");
- free(dev);
return -1;
}
@@ -345,6 +334,26 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr)
} else
dev->kdrv = RTE_KDRV_NONE;
+ return 0;
+}
+
+/* Scan one pci sysfs entry, and fill the devices list from it. */
+static int
+pci_scan_one(const char *dirname, const struct rte_pci_addr *addr)
+{
+ struct rte_pci_device *dev;
+ int ret;
+
+ dev = malloc(sizeof(*dev));
+ if (dev == NULL)
+ return -1;
+
+ ret = rte_eal_pci_parse_sysfs_entry(dev, dirname, addr);
+ if (ret) {
+ free(dev);
+ return ret;
+ }
+
/* device is valid, add in list (sorted) */
if (TAILQ_EMPTY(&pci_device_list)) {
rte_eal_device_insert(&dev->device);
diff --git a/lib/librte_eal/linuxapp/eal/rte_eal_version.map b/lib/librte_eal/linuxapp/eal/rte_eal_version.map
index 192c0d5..27b7939 100644
--- a/lib/librte_eal/linuxapp/eal/rte_eal_version.map
+++ b/lib/librte_eal/linuxapp/eal/rte_eal_version.map
@@ -192,5 +192,7 @@ DPDK_17.02 {
DPDK_17.05 {
rte_eal_pci_detach_all_drivers;
+ rte_eal_pci_probe_all_drivers;
+ rte_eal_pci_parse_sysfs_entry;
} DPDK_17.02;
--
2.1.4