From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f170.google.com (mail-wr0-f170.google.com [209.85.128.170]) by dpdk.org (Postfix) with ESMTP id AAAD1567E for ; Sun, 9 Jul 2017 03:46:04 +0200 (CEST) Received: by mail-wr0-f170.google.com with SMTP id c11so93719966wrc.3 for ; Sat, 08 Jul 2017 18:46:04 -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=rUvIu39NFE5uV5uBKQu2aPWw2Vn6FTf2x0DNMWE5bVA=; b=LqVzfJ9bd6d5kMfns77vda7LtL0XgkCkYaSteg3l3oeHmgcL3FdSyCkBBU73qQpZMB EShxEgrY+iOdP2BFAWTSfG6jFtPvZ08xHf7+kps39CVcEgaOiYfMXXYUyu5RKBR34yW4 qWHrcU3rIDplqWnpWDiAjIijmJ3k0KAsilIfQcLkpMZKP4hRVp7YClyRBDii9dFVgcV5 EJ+yZBNAotaZnHd/1dpyrA+Oq0RWqD40BMbC9Jwzq7yemzx64Qv/yWefRYUUEmNRNRdc Itul7fVjyJk/1oPZHhvZRMRIawk0uy+BXjBz38i6ztsh/VJfTDjhRNh9rfiGiEIle6tb x7Yw== 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=rUvIu39NFE5uV5uBKQu2aPWw2Vn6FTf2x0DNMWE5bVA=; b=ie+3Z6PPlkY7nL+KoNA3nXMWJBD8sPqqTsqzsN7phS037Tmdzs4gQ3nZUw2tHE9wcK QLBF+VZarQHFF47Xx4W5zJxMlOQMblZ6Km04vTn1qI9mN6oAv6EM0mkxsOBY83tZ0Z9j HPzooYMgmCVFD8kPIKzyI36SHYZNFa+0qe4LEpL5PF8W255EwwZiOdxciVZSBX39low5 FtqTAYVcF5u3n9/VaSwbIW4UylIjdbdzeuX52ENobVQmfVMkio+ttS+edvtWb5gL0B03 Z76EWZ86tbSXMWHgFvrsvbNMPT/8uRrmpt/ga0sgqJfr3qHQC2FHv/90QulR/7Gsk909 qQmw== X-Gm-Message-State: AIVw113DUM5ezFVwt2COEx95B85dPZ2GOxUxIcjJexfiHo7eL+ryxKyb LDAzkOSan6Sfsj8zohU= X-Received: by 10.223.133.67 with SMTP id 61mr3883833wrh.30.1499564764064; Sat, 08 Jul 2017 18:46:04 -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 h130sm2430609wmd.34.2017.07.08.18.46.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 08 Jul 2017 18:46:03 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet , stable@dpdk.org Date: Sun, 9 Jul 2017 03:45:41 +0200 Message-Id: <233c21af0c551c2da711297f7dbe67800438dc2d.1499563730.git.gaetan.rivet@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH 5/9] pci: use given name as generic name 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: Sun, 09 Jul 2017 01:46:05 -0000 The PCI device is referenced by other DPDK systems by the name of its parameter, not by the system name. Moreover, this name should be set once and for all, as early as possible. This means linking the rte_devargs associated with the PCI device during its scan, making available other metadatas used afterward upon probing and device search for plugging. Fixes: beec692c5157 ("eal: add name field to generic device") Cc: stable@dpdk.org Signed-off-by: Gaetan Rivet --- lib/librte_eal/bsdapp/eal/eal_pci.c | 4 ++-- lib/librte_eal/common/eal_common_pci.c | 21 ++++++++++++++++----- lib/librte_eal/common/eal_private.h | 5 +++++ lib/librte_eal/linuxapp/eal/eal_pci.c | 4 ++-- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/eal/eal_pci.c index e321461..97a88ec 100644 --- a/lib/librte_eal/bsdapp/eal/eal_pci.c +++ b/lib/librte_eal/bsdapp/eal/eal_pci.c @@ -282,8 +282,7 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf) /* FreeBSD has no NUMA support (yet) */ dev->device.numa_node = 0; - rte_pci_device_name(&dev->addr, dev->name, sizeof(dev->name)); - dev->device.name = dev->name; + pci_name_set(dev); /* FreeBSD has only one pass through driver */ dev->kdrv = RTE_KDRV_NIC_UIO; @@ -334,6 +333,7 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf) } else { /* already registered */ dev2->kdrv = dev->kdrv; dev2->max_vfs = dev->max_vfs; + pci_name_set(dev2); memmove(dev2->mem_resource, dev->mem_resource, sizeof(dev->mem_resource)); diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c index 76bbcc8..b100525 100644 --- a/lib/librte_eal/common/eal_common_pci.c +++ b/lib/librte_eal/common/eal_common_pci.c @@ -88,6 +88,21 @@ static struct rte_devargs *pci_devargs_lookup(struct rte_pci_device *dev) return NULL; } +void +pci_name_set(struct rte_pci_device *dev) +{ + struct rte_devargs *devargs; + + rte_pci_device_name(&dev->addr, + dev->name, sizeof(dev->name)); + devargs = pci_devargs_lookup(dev); + dev->device.devargs = devargs; + if (devargs != NULL) + dev->device.name = dev->device.devargs->name; + else + dev->device.name = dev->name; +} + /* map a particular resource from a file */ void * pci_map_resource(void *requested_addr, int fd, off_t offset, size_t size, @@ -396,11 +411,7 @@ rte_pci_probe(void) FOREACH_DEVICE_ON_PCIBUS(dev) { probed++; - /* set devargs in PCI structure */ - devargs = pci_devargs_lookup(dev); - if (devargs != NULL) - dev->device.devargs = devargs; - + devargs = dev->device.devargs; /* probe all or only whitelisted devices */ if (probe_all) ret = pci_probe_all_drivers(dev); diff --git a/lib/librte_eal/common/eal_private.h b/lib/librte_eal/common/eal_private.h index 0836339..597d82e 100644 --- a/lib/librte_eal/common/eal_private.h +++ b/lib/librte_eal/common/eal_private.h @@ -113,6 +113,11 @@ struct rte_pci_driver; struct rte_pci_device; /** + * Find the name of a PCI device. + */ +void pci_name_set(struct rte_pci_device *dev); + +/** * Add a PCI device to the PCI Bus (append to PCI Device list). This function * also updates the bus references of the PCI Device (and the generic device * object embedded within. diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c index 7d9e1a9..556ae2c 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c @@ -324,8 +324,7 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr) dev->device.numa_node = 0; } - rte_pci_device_name(addr, dev->name, sizeof(dev->name)); - dev->device.name = dev->name; + pci_name_set(dev); /* parse resources */ snprintf(filename, sizeof(filename), "%s/resource", dirname); @@ -373,6 +372,7 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr) } else { /* already registered */ dev2->kdrv = dev->kdrv; dev2->max_vfs = dev->max_vfs; + pci_name_set(dev2); memmove(dev2->mem_resource, dev->mem_resource, sizeof(dev->mem_resource)); free(dev); -- 2.1.4