From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id E81887E8E for ; Wed, 29 Oct 2014 17:20:03 +0100 (CET) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP; 29 Oct 2014 09:22:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.04,810,1406617200"; d="scan'208";a="613523267" Received: from bricha3-mobl3.ger.corp.intel.com ([10.237.221.17]) by fmsmga001.fm.intel.com with SMTP; 29 Oct 2014 09:28:50 -0700 Received: by (sSMTP sendmail emulation); Wed, 29 Oct 2014 16:28:50 +0100 Date: Wed, 29 Oct 2014 16:28:49 +0000 From: Bruce Richardson To: Tetsuya Mukawa Message-ID: <20141029162849.GB7084@bricha3-MOBL3> References: <1414572576-21371-1-git-send-email-mukawa@igel.co.jp> <1414572576-21371-4-git-send-email-mukawa@igel.co.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1414572576-21371-4-git-send-email-mukawa@igel.co.jp> Organization: Intel Shannon Ltd. User-Agent: Mutt/1.5.23 (2014-03-12) Cc: dev@dpdk.org, nakajima.yoshihiro@lab.ntt.co.jp, masutani.hitoshi@lab.ntt.co.jp Subject: Re: [dpdk-dev] [RFC PATCH 03/25] eal/pci: Replace pci address comparison code by eal_compare_pci_addr 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: , X-List-Received-Date: Wed, 29 Oct 2014 16:20:05 -0000 On Wed, Oct 29, 2014 at 05:49:14PM +0900, Tetsuya Mukawa wrote: > This patch replaces pci_addr_comparison() and memcmp() of pci addresses by > eal_compare_pci_addr(). > > Signed-off-by: Tetsuya Mukawa Looks like a good cleanup. Acked-by: Bruce Richardson > --- > lib/librte_eal/bsdapp/eal/eal_pci.c | 16 +--------------- > lib/librte_eal/common/eal_common_pci.c | 2 +- > lib/librte_eal/common/include/rte_pci.h | 29 +++++++++++++++++++++++++++++ > lib/librte_eal/linuxapp/eal/eal_pci.c | 16 +--------------- > lib/librte_eal/linuxapp/eal/eal_pci_uio.c | 2 +- > 5 files changed, 33 insertions(+), 32 deletions(-) > > diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/eal/eal_pci.c > index 54fcaf0..2576fa7 100644 > --- a/lib/librte_eal/bsdapp/eal/eal_pci.c > +++ b/lib/librte_eal/bsdapp/eal/eal_pci.c > @@ -270,20 +270,6 @@ pci_uio_map_resource(struct rte_pci_device *dev) > return (0); > } > > -/* Compare two PCI device addresses. */ > -static int > -pci_addr_comparison(struct rte_pci_addr *addr, struct rte_pci_addr *addr2) > -{ > - uint64_t dev_addr = (addr->domain << 24) + (addr->bus << 16) + (addr->devid << 8) + addr->function; > - uint64_t dev_addr2 = (addr2->domain << 24) + (addr2->bus << 16) + (addr2->devid << 8) + addr2->function; > - > - if (dev_addr > dev_addr2) > - return 1; > - else > - return 0; > -} > - > - > /* 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) > @@ -358,7 +344,7 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf) > struct rte_pci_device *dev2 = NULL; > > TAILQ_FOREACH(dev2, &pci_device_list, next) { > - if (pci_addr_comparison(&dev->addr, &dev2->addr)) > + if (eal_compare_pci_addr(&dev->addr, &dev2->addr)) > continue; > else { > TAILQ_INSERT_BEFORE(dev2, dev, next); > diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c > index f3c7f71..f01f258 100644 > --- a/lib/librte_eal/common/eal_common_pci.c > +++ b/lib/librte_eal/common/eal_common_pci.c > @@ -93,7 +93,7 @@ static struct rte_devargs *pci_devargs_lookup(struct rte_pci_device *dev) > if (devargs->type != RTE_DEVTYPE_BLACKLISTED_PCI && > devargs->type != RTE_DEVTYPE_WHITELISTED_PCI) > continue; > - if (!memcmp(&dev->addr, &devargs->pci.addr, sizeof(dev->addr))) > + if (eal_compare_pci_addr(&dev->addr, &devargs->pci.addr)) > return devargs; > } > return NULL; > diff --git a/lib/librte_eal/common/include/rte_pci.h b/lib/librte_eal/common/include/rte_pci.h > index b819539..fe374a8 100644 > --- a/lib/librte_eal/common/include/rte_pci.h > +++ b/lib/librte_eal/common/include/rte_pci.h > @@ -261,6 +261,35 @@ eal_parse_pci_DomBDF(const char *input, struct rte_pci_addr *dev_addr) > } > #undef GET_PCIADDR_FIELD > > +/* Compare two PCI device addresses. */ > +/** > + * Utility function to compare two PCI device addresses. > + * > + * @param addr > + * The PCI Bus-Device-Function address to compare > + * @param addr2 > + * The PCI Bus-Device-Function address to compare > + * @return > + * 0 on equal PCI address. > + * Positive on addr is greater than addr2. > + * Negative on addr is less than addr2. > + */ > +static inline int > +eal_compare_pci_addr(struct rte_pci_addr *addr, struct rte_pci_addr *addr2) > +{ > + uint64_t dev_addr = (addr->domain << 24) + (addr->bus << 16) + > + (addr->devid << 8) + addr->function; > + uint64_t dev_addr2 = (addr2->domain << 24) + (addr2->bus << 16) + > + (addr2->devid << 8) + addr2->function; > + > + if (dev_addr > dev_addr2) > + return 1; > + else if (dev_addr < dev_addr2) > + return -1; > + else > + return 0; > +} > + > /** > * Probe the PCI bus for registered drivers. > * > diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c > index 5fe3961..862b93a 100644 > --- a/lib/librte_eal/linuxapp/eal/eal_pci.c > +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c > @@ -186,20 +186,6 @@ error: > return -1; > } > > -/* Compare two PCI device addresses. */ > -static int > -pci_addr_comparison(struct rte_pci_addr *addr, struct rte_pci_addr *addr2) > -{ > - uint64_t dev_addr = (addr->domain << 24) + (addr->bus << 16) + (addr->devid << 8) + addr->function; > - uint64_t dev_addr2 = (addr2->domain << 24) + (addr2->bus << 16) + (addr2->devid << 8) + addr2->function; > - > - if (dev_addr > dev_addr2) > - return 1; > - else > - return 0; > -} > - > - > /* Scan one pci sysfs entry, and fill the devices list from it. */ > static int > pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus, > @@ -292,7 +278,7 @@ pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus, > struct rte_pci_device *dev2 = NULL; > > TAILQ_FOREACH(dev2, &pci_device_list, next) { > - if (pci_addr_comparison(&dev->addr, &dev2->addr)) > + if (eal_compare_pci_addr(&dev->addr, &dev2->addr) != 0) > continue; > else { > TAILQ_INSERT_BEFORE(dev2, dev, next); > diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c > index 7e62266..f0deeba 100644 > --- a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c > +++ b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c > @@ -120,7 +120,7 @@ pci_uio_map_secondary(struct rte_pci_device *dev) > TAILQ_FOREACH(uio_res, pci_res_list, next) { > > /* skip this element if it doesn't match our PCI address */ > - if (memcmp(&uio_res->pci_addr, &dev->addr, sizeof(dev->addr))) > + if (eal_compare_pci_addr(&uio_res->pci_addr, &dev->addr)) > continue; > > for (i = 0; i != uio_res->nb_maps; i++) { > -- > 1.9.1 >