From patchwork Tue Apr 28 23:46:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ravi Kerur X-Patchwork-Id: 4491 X-Patchwork-Delegate: thomas@monjalon.net 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 9E307C766; Wed, 29 Apr 2015 01:47:05 +0200 (CEST) Received: from mail-pd0-f172.google.com (mail-pd0-f172.google.com [209.85.192.172]) by dpdk.org (Postfix) with ESMTP id 77F97C732 for ; Wed, 29 Apr 2015 01:46:59 +0200 (CEST) Received: by pdbnk13 with SMTP id nk13so10472130pdb.0 for ; Tue, 28 Apr 2015 16:46:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=So8tVSoXXv+QwS4ulJhwgay8OJYr6lczOCMlzfal3Hs=; b=Hgt/6X36PmpKMeYRdP7XxCIzgMboXkAz56l07L+QdtJiAOLxfkvFEt18yd+SNWto+h SjmZa6WCehjnI2+nD9TsFdl5Lklv+U97UhHK3wptFfz4LhdBzWMzmzGNNKLIf9loP+GB id6JXDPlDxTVanUjH95cGyCeX5GMpbBE4XhIjZcuecHowcup2vGn6tx2RTXEY9gIYnA4 EU3x8CMXw4QNZYBeY6RI7CPT4F1JhoEPeCIBSx3UKZ5db4RmJ2FKkzuvv6+vDSyJmtAD cLGfF8jxXz+tnwjDrlcC8QKNuBc8czbZOUGhmOLPrwwIReh/H3acMTg6yfoK9eBQQO2i OF7w== X-Received: by 10.66.156.198 with SMTP id wg6mr36658458pab.126.1430264818858; Tue, 28 Apr 2015 16:46:58 -0700 (PDT) Received: from user-PC.hsd1.ca.comcast.net (c-98-234-176-9.hsd1.ca.comcast.net. [98.234.176.9]) by mx.google.com with ESMTPSA id xz3sm17508882pbc.13.2015.04.28.16.46.57 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Apr 2015 16:46:58 -0700 (PDT) From: Ravi Kerur To: dev@dpdk.org Date: Tue, 28 Apr 2015 16:46:49 -0700 Message-Id: <1430264809-32599-6-git-send-email-rkerur@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1430264809-32599-1-git-send-email-rkerur@gmail.com> References: <1430264781-32560-1-git-send-email-rkerur@gmail.com> <1430264809-32599-1-git-send-email-rkerur@gmail.com> Subject: [dpdk-dev] [PATCH v8 6/6] Move common functions in eal_pci.c X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Changes in v8 None Changes in v7 Rebase to latest code. Changes in v6 Split changes due to complexity. v6 includes moving rte_eal_pci_probe_one_driver function and its associated utility functions only. Changes in v5 Rebase to latest code. Removed RTE_EXEC_ENV_BSDAPP from earlier changes. Changes in v4 Move common functions in eal_pci.c to librte_eal/common/ eal_common_pci.c file. Following functions are moved to eal_common_pci.c file. void *pci_map_resource(void *requested_addr, const int vfio_fd, const char *devname, off_t offset, size_t size); int pci_addr_comparison(struct rte_pci_addr *addr, struct rte_pci_addr *addr2); int rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *dev); Use RTE_EXEC_ENV_BSDAPP to differentiate minor differences in common function. Fix checkpatch warnings and errors. Changes in v3 N/A Changes in v2 N/A Changes in v1 N/A Signed-off-by: Ravi Kerur --- lib/librte_eal/bsdapp/eal/eal_pci.c | 72 +++++--------------------------- lib/librte_eal/common/eal_common_pci.c | 72 ++++++++++++++++++++++++++++++++ lib/librte_eal/common/eal_private.h | 39 +++++++++++++----- lib/librte_eal/linuxapp/eal/eal_pci.c | 75 +--------------------------------- 4 files changed, 113 insertions(+), 145 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/eal/eal_pci.c index 30f0232..f21b5b6 100644 --- a/lib/librte_eal/bsdapp/eal/eal_pci.c +++ b/lib/librte_eal/bsdapp/eal/eal_pci.c @@ -111,7 +111,7 @@ static struct rte_tailq_elem rte_uio_tailq = { EAL_REGISTER_TAILQ(rte_uio_tailq) /* unbind kernel driver for this device */ -static int +int pci_unbind_kernel_driver(struct rte_pci_device *dev __rte_unused) { RTE_LOG(ERR, EAL, "RTE_PCI_DRV_FORCE_UNBIND flag is not implemented " @@ -274,6 +274,13 @@ pci_uio_map_resource(struct rte_pci_device *dev) return (0); } +/* map the PCI resource of a PCI device in virtual memory */ +int +pci_map_device(struct rte_pci_device *dev) +{ + return pci_uio_map_resource(dev); +} + /* Scan one pci sysfs entry, and fill the devices list from it. */ static int pci_scan_one(int dev_pci_fd, struct pci_conf *conf) @@ -426,68 +433,11 @@ error: } /* - * If vendor/device ID match, call the devinit() function of the - * driver. + * This function is a no-op in BSD. */ -int -rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *dev) +void +pci_config_space_set(struct rte_pci_device *dev __rte_unused) { - struct rte_pci_id *id_table; - int ret; - - for (id_table = dr->id_table ; id_table->vendor_id != 0; id_table++) { - - /* check if device's identifiers match the driver's ones */ - if (id_table->vendor_id != dev->id.vendor_id && - id_table->vendor_id != PCI_ANY_ID) - continue; - if (id_table->device_id != dev->id.device_id && - id_table->device_id != PCI_ANY_ID) - continue; - if (id_table->subsystem_vendor_id != dev->id.subsystem_vendor_id && - id_table->subsystem_vendor_id != PCI_ANY_ID) - continue; - if (id_table->subsystem_device_id != dev->id.subsystem_device_id && - id_table->subsystem_device_id != PCI_ANY_ID) - continue; - - struct rte_pci_addr *loc = &dev->addr; - - RTE_LOG(DEBUG, EAL, "PCI device "PCI_PRI_FMT" on NUMA socket %i\n", - loc->domain, loc->bus, loc->devid, loc->function, - dev->numa_node); - - RTE_LOG(DEBUG, EAL, " probe driver: %x:%x %s\n", dev->id.vendor_id, - dev->id.device_id, dr->name); - - /* no initialization when blacklisted, return without error */ - if (dev->devargs != NULL && - dev->devargs->type == RTE_DEVTYPE_BLACKLISTED_PCI) { - - RTE_LOG(DEBUG, EAL, " Device is blacklisted, not initializing\n"); - return 0; - } - - if (dr->drv_flags & RTE_PCI_DRV_NEED_MAPPING) { - /* map resources for devices that use igb_uio */ - ret = pci_uio_map_resource(dev); - if (ret != 0) - return ret; - } else if (dr->drv_flags & RTE_PCI_DRV_FORCE_UNBIND && - rte_eal_process_type() == RTE_PROC_PRIMARY) { - /* unbind current driver */ - if (pci_unbind_kernel_driver(dev) < 0) - return -1; - } - - /* reference driver structure */ - dev->driver = dr; - - /* call the driver devinit() function */ - return dr->devinit(dr, dev); - } - /* return positive value if driver is not found */ - return 1; } /* Init the PCI EAL subsystem */ diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c index 4229aaf..279063f 100644 --- a/lib/librte_eal/common/eal_common_pci.c +++ b/lib/librte_eal/common/eal_common_pci.c @@ -99,6 +99,78 @@ static struct rte_devargs *pci_devargs_lookup(struct rte_pci_device *dev) } /* + * If vendor/device ID match, call the devinit() function of the + * driver. + */ +static int +rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, + struct rte_pci_device *dev) +{ + int ret; + const struct rte_pci_id *id_table; + + for (id_table = dr->id_table ; id_table->vendor_id != 0; id_table++) { + + /* check if device's identifiers match the driver's ones */ + if (id_table->vendor_id != dev->id.vendor_id && + id_table->vendor_id != PCI_ANY_ID) + continue; + if (id_table->device_id != dev->id.device_id && + id_table->device_id != PCI_ANY_ID) + continue; + if (id_table->subsystem_vendor_id != dev->id.subsystem_vendor_id && + id_table->subsystem_vendor_id != PCI_ANY_ID) + continue; + if (id_table->subsystem_device_id != dev->id.subsystem_device_id && + id_table->subsystem_device_id != PCI_ANY_ID) + continue; + + struct rte_pci_addr *loc = &dev->addr; + + RTE_LOG(DEBUG, EAL, "PCI device "PCI_PRI_FMT" on NUMA socket %i\n", + loc->domain, loc->bus, loc->devid, loc->function, + dev->numa_node); + + RTE_LOG(DEBUG, EAL, " probe driver: %x:%x %s\n", dev->id.vendor_id, + dev->id.device_id, dr->name); + + /* no initialization when blacklisted, return without error */ + if (dev->devargs != NULL && + dev->devargs->type == RTE_DEVTYPE_BLACKLISTED_PCI) { + RTE_LOG(DEBUG, EAL, " Device is blacklisted, not initializing\n"); + return 1; + } + + if (dr->drv_flags & RTE_PCI_DRV_NEED_MAPPING) { +#ifdef RTE_PCI_CONFIG + /* + * Set PCIe config space for high performance. + * Return value can be ignored. + */ + pci_config_space_set(dev); +#endif + /* map resources for devices that use igb_uio */ + ret = pci_map_device(dev); + if (ret != 0) + return ret; + } else if (dr->drv_flags & RTE_PCI_DRV_FORCE_UNBIND && + rte_eal_process_type() == RTE_PROC_PRIMARY) { + /* unbind current driver */ + if (pci_unbind_kernel_driver(dev) < 0) + return -1; + } + + /* reference driver structure */ + dev->driver = dr; + + /* call the driver devinit() function */ + return dr->devinit(dr, dev); + } + /* return positive value if driver is not found */ + return 1; +} + +/* * If vendor/device ID match, call the devinit() function of all * registered driver for the given device. Return -1 if initialization * failed, return 1 if no driver is found for this device. diff --git a/lib/librte_eal/common/eal_private.h b/lib/librte_eal/common/eal_private.h index a51a68e..6a9d13e 100644 --- a/lib/librte_eal/common/eal_private.h +++ b/lib/librte_eal/common/eal_private.h @@ -156,17 +156,6 @@ struct rte_pci_driver; struct rte_pci_device; /** - * Mmap memory for single PCI device - * - * This function is private to EAL. - * - * @return - * 0 on success, negative on error - */ -int rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, - struct rte_pci_device *dev); - -/** * Munmap memory for single PCI device * * This function is private to EAL. @@ -364,4 +353,32 @@ int rte_eal_hugepage_init(void); */ int rte_eal_hugepage_attach(void); +/** + * This function unbinds kernel driver for this device + * + * This function is private to the EAL. + */ +int +pci_unbind_kernel_driver(struct rte_pci_device *dev); + +/** + * This function maps resources for devices + * that use igb_uio on Linux and it's a + * wrapper for pci_uio_map_resource on BSD. + * + * This function is private to the EAL. + */ +int +pci_map_device(struct rte_pci_device *dev); + +/** + * This function sets PCIe config space for + * high performance. + * It's a NO-OP on BSD. + * + * This function is private to the EAL. + */ +void +pci_config_space_set(struct rte_pci_device *dev); + #endif /* _EAL_PRIVATE_H_ */ diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c index d2adc66..7b6378d 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c @@ -57,7 +57,7 @@ */ /* unbind kernel driver for this device */ -static int +int pci_unbind_kernel_driver(struct rte_pci_device *dev) { int n; @@ -563,7 +563,7 @@ pci_config_space_set(struct rte_pci_device *dev) } #endif -static int +int pci_map_device(struct rte_pci_device *dev) { int ret = -1; @@ -616,77 +616,6 @@ pci_unmap_device(struct rte_pci_device *dev) } #endif /* RTE_LIBRTE_EAL_HOTPLUG */ -/* - * If vendor/device ID match, call the devinit() function of the - * driver. - */ -int -rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *dev) -{ - int ret; - const struct rte_pci_id *id_table; - - for (id_table = dr->id_table; id_table->vendor_id != 0; id_table++) { - - /* check if device's identifiers match the driver's ones */ - if (id_table->vendor_id != dev->id.vendor_id && - id_table->vendor_id != PCI_ANY_ID) - continue; - if (id_table->device_id != dev->id.device_id && - id_table->device_id != PCI_ANY_ID) - continue; - if (id_table->subsystem_vendor_id != dev->id.subsystem_vendor_id && - id_table->subsystem_vendor_id != PCI_ANY_ID) - continue; - if (id_table->subsystem_device_id != dev->id.subsystem_device_id && - id_table->subsystem_device_id != PCI_ANY_ID) - continue; - - struct rte_pci_addr *loc = &dev->addr; - - RTE_LOG(DEBUG, EAL, "PCI device "PCI_PRI_FMT" on NUMA socket %i\n", - loc->domain, loc->bus, loc->devid, loc->function, - dev->numa_node); - - RTE_LOG(DEBUG, EAL, " probe driver: %x:%x %s\n", dev->id.vendor_id, - dev->id.device_id, dr->name); - - /* no initialization when blacklisted, return without error */ - if (dev->devargs != NULL && - dev->devargs->type == RTE_DEVTYPE_BLACKLISTED_PCI) { - RTE_LOG(DEBUG, EAL, " Device is blacklisted, not initializing\n"); - return 1; - } - - if (dr->drv_flags & RTE_PCI_DRV_NEED_MAPPING) { -#ifdef RTE_PCI_CONFIG - /* - * Set PCIe config space for high performance. - * Return value can be ignored. - */ - pci_config_space_set(dev); -#endif - /* map resources for devices that use igb_uio */ - ret = pci_map_device(dev); - if (ret != 0) - return ret; - } else if (dr->drv_flags & RTE_PCI_DRV_FORCE_UNBIND && - rte_eal_process_type() == RTE_PROC_PRIMARY) { - /* unbind current driver */ - if (pci_unbind_kernel_driver(dev) < 0) - return -1; - } - - /* reference driver structure */ - dev->driver = dr; - - /* call the driver devinit() function */ - return dr->devinit(dr, dev); - } - /* return positive value if driver is not found */ - return 1; -} - #ifdef RTE_LIBRTE_EAL_HOTPLUG /* * If vendor/device ID match, call the devuninit() function of the