From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f48.google.com (mail-wm0-f48.google.com [74.125.82.48]) by dpdk.org (Postfix) with ESMTP id 625D1567C for ; Fri, 7 Apr 2017 17:28:30 +0200 (CEST) Received: by mail-wm0-f48.google.com with SMTP id w64so1411197wma.0 for ; Fri, 07 Apr 2017 08:28:30 -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=9KmjfN3Q5ERTTZEFN/kV4zhKyRC5JnuiZ3qJIGIwCc8=; b=XEG33pwpDOcH5rMdYgf128faEWY2/pwfaPMMJzZBqK4zmh8SPXcJ18JntTPOKHPhvI FDPbzCz/SmeLLMim5Duk9hRTkChAXkyYpMqt8fuMor23l6TIqMzomuOSaWJsGhmamKa3 otBUzAJKcEJYOykiL9h6ITiLIDEzOca9dwp8gEeDdQowqEfuo/7h5cC1qmY68J4nM5vV sK0QxtdZfm076XEVfaTuGXh6hiv4Kmg3bM8cZ6RANd0yPoqWatO8StoH39mk1+BDVp9K dQ9BETj6dBJ7FPJjVVAax006wNEAK9M+DMQZUKvYIccO1mrQZlLYvUGYH+JrZLkcGALW ffYw== 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=9KmjfN3Q5ERTTZEFN/kV4zhKyRC5JnuiZ3qJIGIwCc8=; b=rGuWIUyxwjpHycfguLowf2DVuqdQY5Hv4YKjXdMH0ZXFSQWgPwxUmNseXJ0r9SOPtV o5GwIkqUji01sj+8M6PX/Imc16PtuDne07KPdghZvawPSvAi4sfNFkL2FUuHOgLYtsHX KSjky21kdicJpe/Vs08pW51HeG1f6eQjwo2d/lB6J2uVrfASLxMyT6vw79uhsaBR6aZP 3e+0BcA6HaoXAAAh17Rtjn1Mh4RRy3ZHFK3xd59zgdz8m64Y4Fu9CDsW0fslVW8nFE/y rXmG3dOdTqibQT88UvFp/rJZ9B/vOi2RnOZVKq8fJu+/2ntOnyhfmblJyqyLhedl9i9X nSFA== X-Gm-Message-State: AFeK/H1FhRXmRzcEqkvXUPlwK9yt+LbtnaqmUFCkX+BBhDFjHFHtNZJj4HmmAhukKeeoOj/L X-Received: by 10.28.101.68 with SMTP id z65mr29232362wmb.102.1491578909478; Fri, 07 Apr 2017 08:28:29 -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 b199sm6699363wmb.13.2017.04.07.08.28.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 07 Apr 2017 08:28:28 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Shreyansh Jain , Thomas Monjalon Date: Fri, 7 Apr 2017 17:28:09 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: <1484801117-779-1-git-send-email-thomas.monjalon@6wind.com> In-Reply-To: References: Subject: [dpdk-dev] [PATCH v12 4/5] pci: use bus driver for scan/probe 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: , X-List-Received-Date: Fri, 07 Apr 2017 15:28:30 -0000 From: Shreyansh Jain Remove EAL initiated direct PCI scan/probe and enable PCI Bus linkage. Signed-off-by: Shreyansh Jain Reviewed-by: Ferruh Yigit Signed-off-by: Thomas Monjalon Reviewed-by: Gaetan Rivet --- lib/librte_eal/bsdapp/eal/eal.c | 14 --------- lib/librte_eal/bsdapp/eal/eal_pci.c | 35 ++++++++--------------- lib/librte_eal/bsdapp/eal/rte_eal_version.map | 2 -- lib/librte_eal/common/eal_common_pci.c | 26 +++++++---------- lib/librte_eal/common/eal_private.h | 10 ------- lib/librte_eal/common/include/rte_pci.h | 19 +++---------- lib/librte_eal/linuxapp/eal/eal.c | 14 --------- lib/librte_eal/linuxapp/eal/eal_pci.c | 38 +++++++++---------------- lib/librte_eal/linuxapp/eal/rte_eal_version.map | 2 -- 9 files changed, 41 insertions(+), 119 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c index fae6c7e..7321ac6 100644 --- a/lib/librte_eal/bsdapp/eal/eal.c +++ b/lib/librte_eal/bsdapp/eal/eal.c @@ -602,13 +602,6 @@ rte_eal_init(int argc, char **argv) return -1; } - if (rte_eal_pci_init() < 0) { - rte_eal_init_alert("Cannot init PCI\n"); - rte_errno = EPROTO; - rte_atomic32_clear(&run_once); - return -1; - } - eal_check_mem_on_local_socket(); if (eal_plugins_init() < 0) @@ -667,13 +660,6 @@ rte_eal_init(int argc, char **argv) return -1; } - /* Probe & Initialize PCI devices */ - if (rte_eal_pci_probe()) { - rte_eal_init_alert("Cannot probe PCI\n"); - rte_errno = ENOTSUP; - return -1; - } - if (rte_eal_dev_init() < 0) rte_eal_init_alert("Cannot init pmd devices\n"); diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/eal/eal_pci.c index 06b5a3a..f796ef6 100644 --- a/lib/librte_eal/bsdapp/eal/eal_pci.c +++ b/lib/librte_eal/bsdapp/eal/eal_pci.c @@ -87,6 +87,9 @@ * enabling bus master. */ +/* Forward declaration of PCI bus */ +struct rte_pci_bus rte_pci_bus; + /* Map pci device */ int rte_eal_pci_map_device(struct rte_pci_device *dev) @@ -313,21 +316,19 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf) } /* device is valid, add in list (sorted) */ - if (TAILQ_EMPTY(&pci_device_list)) { - rte_eal_device_insert(&dev->device); - TAILQ_INSERT_TAIL(&pci_device_list, dev, next); + if (TAILQ_EMPTY(&rte_pci_bus.device_list)) { + rte_eal_pci_add_device(dev); } else { struct rte_pci_device *dev2 = NULL; int ret; - TAILQ_FOREACH(dev2, &pci_device_list, next) { + TAILQ_FOREACH(dev2, &rte_pci_bus.device_list, next) { ret = rte_eal_compare_pci_addr(&dev->addr, &dev2->addr); if (ret > 0) continue; else if (ret < 0) { - TAILQ_INSERT_BEFORE(dev2, dev, next); - rte_eal_device_insert(&dev->device); + rte_eal_pci_insert_device(dev2, dev); } else { /* already registered */ dev2->kdrv = dev->kdrv; dev2->max_vfs = dev->max_vfs; @@ -338,8 +339,7 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf) } return 0; } - rte_eal_device_insert(&dev->device); - TAILQ_INSERT_TAIL(&pci_device_list, dev, next); + rte_eal_pci_add_device(dev); } return 0; @@ -367,6 +367,10 @@ rte_eal_pci_scan(void) .matches = &matches[0], }; + /* for debug purposes, PCI can be disabled */ + if (internal_config.no_pci) + return 0; + fd = open("/dev/pci", O_RDONLY); if (fd < 0) { RTE_LOG(ERR, EAL, "%s(): error opening /dev/pci\n", __func__); @@ -661,21 +665,6 @@ rte_eal_pci_ioport_unmap(struct rte_pci_ioport *p) return ret; } -/* Init the PCI EAL subsystem */ -int -rte_eal_pci_init(void) -{ - /* for debug purposes, PCI can be disabled */ - if (internal_config.no_pci) - return 0; - - if (rte_eal_pci_scan() < 0) { - RTE_LOG(ERR, EAL, "%s(): Cannot scan PCI bus\n", __func__); - return -1; - } - return 0; -} - struct rte_pci_bus rte_pci_bus = { .bus = { .scan = rte_eal_pci_scan, diff --git a/lib/librte_eal/bsdapp/eal/rte_eal_version.map b/lib/librte_eal/bsdapp/eal/rte_eal_version.map index e1fbebc..ca12d89 100644 --- a/lib/librte_eal/bsdapp/eal/rte_eal_version.map +++ b/lib/librte_eal/bsdapp/eal/rte_eal_version.map @@ -6,8 +6,6 @@ DPDK_2.0 { eal_parse_sysfs_value; eal_timer_source; lcore_config; - pci_device_list; - pci_driver_list; per_lcore__lcore_id; per_lcore__rte_errno; rte_calloc; diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c index 853a12c..02d92b9 100644 --- a/lib/librte_eal/common/eal_common_pci.c +++ b/lib/librte_eal/common/eal_common_pci.c @@ -84,11 +84,6 @@ #include "eal_private.h" -struct pci_driver_list pci_driver_list = - TAILQ_HEAD_INITIALIZER(pci_driver_list); -struct pci_device_list pci_device_list = - TAILQ_HEAD_INITIALIZER(pci_device_list); - extern struct rte_pci_bus rte_pci_bus; #define SYSFS_PCI_DEVICES "/sys/bus/pci/devices" @@ -315,7 +310,7 @@ pci_probe_all_drivers(struct rte_pci_device *dev) if (dev->driver != NULL) return 0; - TAILQ_FOREACH(dr, &pci_driver_list, next) { + FOREACH_DRIVER_ON_PCIBUS(dr) { rc = rte_eal_pci_probe_one_driver(dr, dev); if (rc < 0) /* negative value is an error */ @@ -336,6 +331,7 @@ int rte_eal_pci_probe_one(const struct rte_pci_addr *addr) { struct rte_pci_device *dev = NULL; + int ret = 0; if (addr == NULL) @@ -347,7 +343,7 @@ rte_eal_pci_probe_one(const struct rte_pci_addr *addr) if (pci_update_device(addr) < 0) goto err_return; - TAILQ_FOREACH(dev, &pci_device_list, next) { + FOREACH_DEVICE_ON_PCIBUS(dev) { if (rte_eal_compare_pci_addr(&dev->addr, addr)) continue; @@ -377,7 +373,7 @@ rte_eal_pci_detach(const struct rte_pci_addr *addr) if (addr == NULL) return -1; - TAILQ_FOREACH(dev, &pci_device_list, next) { + FOREACH_DEVICE_ON_PCIBUS(dev) { if (rte_eal_compare_pci_addr(&dev->addr, addr)) continue; @@ -389,7 +385,7 @@ rte_eal_pci_detach(const struct rte_pci_addr *addr) /* positive value means driver doesn't support it */ continue; - TAILQ_REMOVE(&pci_device_list, dev, next); + rte_eal_pci_remove_device(dev); free(dev); return 0; } @@ -419,7 +415,7 @@ rte_eal_pci_probe(void) if (rte_eal_devargs_type_count(RTE_DEVTYPE_WHITELISTED_PCI) == 0) probe_all = 1; - TAILQ_FOREACH(dev, &pci_device_list, next) { + FOREACH_DEVICE_ON_PCIBUS(dev) { probed++; /* set devargs in PCI structure */ @@ -472,7 +468,7 @@ rte_eal_pci_dump(FILE *f) { struct rte_pci_device *dev = NULL; - TAILQ_FOREACH(dev, &pci_device_list, next) { + FOREACH_DEVICE_ON_PCIBUS(dev) { pci_dump_one_device(f, dev); } } @@ -481,16 +477,16 @@ rte_eal_pci_dump(FILE *f) void rte_eal_pci_register(struct rte_pci_driver *driver) { - TAILQ_INSERT_TAIL(&pci_driver_list, driver, next); - rte_eal_driver_register(&driver->driver); + TAILQ_INSERT_TAIL(&rte_pci_bus.driver_list, driver, next); + driver->bus = &rte_pci_bus; } /* unregister a driver */ void rte_eal_pci_unregister(struct rte_pci_driver *driver) { - rte_eal_driver_unregister(&driver->driver); - TAILQ_REMOVE(&pci_driver_list, driver, next); + TAILQ_REMOVE(&rte_pci_bus.driver_list, driver, next); + driver->bus = NULL; } /* Add a device to PCI bus */ diff --git a/lib/librte_eal/common/eal_private.h b/lib/librte_eal/common/eal_private.h index 8b2d323..260dcbb 100644 --- a/lib/librte_eal/common/eal_private.h +++ b/lib/librte_eal/common/eal_private.h @@ -109,16 +109,6 @@ int rte_eal_timer_init(void); */ int rte_eal_log_init(const char *id, int facility); -/** - * Init the PCI infrastructure - * - * This function is private to EAL. - * - * @return - * 0 on success, negative on error - */ -int rte_eal_pci_init(void); - struct rte_pci_driver; struct rte_pci_device; diff --git a/lib/librte_eal/common/include/rte_pci.h b/lib/librte_eal/common/include/rte_pci.h index 6984fd5..f8d6fcb 100644 --- a/lib/librte_eal/common/include/rte_pci.h +++ b/lib/librte_eal/common/include/rte_pci.h @@ -87,12 +87,6 @@ extern "C" { #include #include -TAILQ_HEAD(pci_device_list, rte_pci_device); /**< PCI devices in D-linked Q. */ -TAILQ_HEAD(pci_driver_list, rte_pci_driver); /**< PCI drivers in D-linked Q. */ - -extern struct pci_driver_list pci_driver_list; /**< Global list of PCI drivers. */ -extern struct pci_device_list pci_device_list; /**< Global list of PCI devices. */ - /** Pathname of PCI devices directory. */ const char *pci_get_sysfs_path(void); @@ -208,8 +202,6 @@ struct rte_pci_device { .subsystem_device_id = PCI_ANY_ID #endif -struct rte_pci_driver; - /** * Initialisation function for the driver called during PCI probing. */ @@ -401,17 +393,14 @@ rte_eal_compare_pci_addr(const struct rte_pci_addr *addr, int rte_eal_pci_scan(void); /** - * Probe the PCI bus for registered drivers. - * - * Scan the content of the PCI bus, and call the probe() function for - * all registered drivers that have a matching entry in its id_table - * for discovered devices. + * Probe the PCI bus * * @return * - 0 on success. - * - Negative on error. + * - !0 on error. */ -int rte_eal_pci_probe(void); +int +rte_eal_pci_probe(void); /** * Map the PCI device resources in user space virtual memory address diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c index d98d56d..7cf33d6 100644 --- a/lib/librte_eal/linuxapp/eal/eal.c +++ b/lib/librte_eal/linuxapp/eal/eal.c @@ -830,13 +830,6 @@ rte_eal_init(int argc, char **argv) return -1; } - if (rte_eal_pci_init() < 0) { - rte_eal_init_alert("Cannot init PCI\n"); - rte_errno = EPROTO; - rte_atomic32_clear(&run_once); - return -1; - } - #ifdef VFIO_PRESENT if (rte_eal_vfio_setup() < 0) { rte_eal_init_alert("Cannot init VFIO\n"); @@ -946,13 +939,6 @@ rte_eal_init(int argc, char **argv) return -1; } - /* Probe & Initialize PCI devices */ - if (rte_eal_pci_probe()) { - rte_eal_init_alert("Cannot probe PCI\n"); - rte_errno = ENOTSUP; - return -1; - } - if (rte_eal_dev_init() < 0) rte_eal_init_alert("Cannot init pmd devices\n"); diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c index 979b6f3..858d36b 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c @@ -55,6 +55,9 @@ * IGB_UIO driver (or doesn't initialize, if the device wasn't bound to it). */ +/* Forward declaration of PCI bus */ +struct rte_pci_bus rte_pci_bus; + static int pci_get_kernel_driver_by_path(const char *filename, char *dri_name) { @@ -352,21 +355,19 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr) dev->kdrv = RTE_KDRV_NONE; /* device is valid, add in list (sorted) */ - if (TAILQ_EMPTY(&pci_device_list)) { - rte_eal_device_insert(&dev->device); - TAILQ_INSERT_TAIL(&pci_device_list, dev, next); + if (TAILQ_EMPTY(&rte_pci_bus.device_list)) { + rte_eal_pci_add_device(dev); } else { struct rte_pci_device *dev2; int ret; - TAILQ_FOREACH(dev2, &pci_device_list, next) { + TAILQ_FOREACH(dev2, &rte_pci_bus.device_list, next) { ret = rte_eal_compare_pci_addr(&dev->addr, &dev2->addr); if (ret > 0) continue; if (ret < 0) { - TAILQ_INSERT_BEFORE(dev2, dev, next); - rte_eal_device_insert(&dev->device); + rte_eal_pci_insert_device(dev2, dev); } else { /* already registered */ dev2->kdrv = dev->kdrv; dev2->max_vfs = dev->max_vfs; @@ -376,8 +377,8 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr) } return 0; } - rte_eal_device_insert(&dev->device); - TAILQ_INSERT_TAIL(&pci_device_list, dev, next); + + rte_eal_pci_add_device(dev); } return 0; @@ -453,6 +454,10 @@ rte_eal_pci_scan(void) char dirname[PATH_MAX]; struct rte_pci_addr addr; + /* for debug purposes, PCI can be disabled */ + if (internal_config.no_pci) + return 0; + dir = opendir(pci_get_sysfs_path()); if (dir == NULL) { RTE_LOG(ERR, EAL, "%s(): opendir failed: %s\n", @@ -469,6 +474,7 @@ rte_eal_pci_scan(void) snprintf(dirname, sizeof(dirname), "%s/%s", pci_get_sysfs_path(), e->d_name); + if (pci_scan_one(dirname, &addr) < 0) goto error; } @@ -714,22 +720,6 @@ rte_eal_pci_ioport_unmap(struct rte_pci_ioport *p) return ret; } -/* Init the PCI EAL subsystem */ -int -rte_eal_pci_init(void) -{ - /* for debug purposes, PCI can be disabled */ - if (internal_config.no_pci) - return 0; - - if (rte_eal_pci_scan() < 0) { - RTE_LOG(ERR, EAL, "%s(): Cannot scan PCI bus\n", __func__); - return -1; - } - - return 0; -} - struct rte_pci_bus rte_pci_bus = { .bus = { .scan = rte_eal_pci_scan, diff --git a/lib/librte_eal/linuxapp/eal/rte_eal_version.map b/lib/librte_eal/linuxapp/eal/rte_eal_version.map index d5d05ee..94da1e7 100644 --- a/lib/librte_eal/linuxapp/eal/rte_eal_version.map +++ b/lib/librte_eal/linuxapp/eal/rte_eal_version.map @@ -6,8 +6,6 @@ DPDK_2.0 { eal_parse_sysfs_value; eal_timer_source; lcore_config; - pci_device_list; - pci_driver_list; per_lcore__lcore_id; per_lcore__rte_errno; rte_calloc; -- 2.1.4