From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gaetan Rivet Subject: [PATCH 05/12] pci: expose parse and probe routines Date: Fri, 3 Mar 2017 16:40:27 +0100 Message-ID: References: To: dev@dpdk.org Return-path: Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com [74.125.82.44]) by dpdk.org (Postfix) with ESMTP id D6E42F969 for ; Fri, 3 Mar 2017 16:40:49 +0100 (CET) Received: by mail-wm0-f44.google.com with SMTP id i17so8886652wmf.0 for ; Fri, 03 Mar 2017 07:40:49 -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 63sm3486280wmp.9.2017.03.03.07.40.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 03 Mar 2017 07:40:48 -0800 (PST) In-Reply-To: List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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. --- 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