From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-we0-f172.google.com (mail-we0-f172.google.com [74.125.82.172]) by dpdk.org (Postfix) with ESMTP id A296DB645 for ; Tue, 17 Feb 2015 01:44:43 +0100 (CET) Received: by mail-we0-f172.google.com with SMTP id k48so32042876wev.3 for ; Mon, 16 Feb 2015 16:44:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:organization :user-agent:in-reply-to:references:mime-version :content-transfer-encoding:content-type; bh=wP+107a4fAHlDhk/zoS1hJg4p987pMbX4wTB41fmSAg=; b=dzB3VThmIXV1jWRa1mDEyi9vBY8PeObNTgjqliW1KJKLEolLtE2l3v6WOf7CtW1zeh uovkckGJXnY6XZvF9CuRW29ryqbouWhieqL7RhTNDGav5gQEyJDtcgdF5SDnooxDX/6p FP4UWV1jTXrZPDgvOzVuFv62gWYhW1Ew/ns3iR6VSPP+7IDvYNQTt02ob0U39AYMxAoY TUv22GvJ2E3aWrDtPm8pImGHhXPzRlf172WwBDgFb3wvhuxubn6831PjqasRObzkHJWN XDpoMNSuz1/SDPfO0giGkot6kxR8fcDxgX71HWiuQLkobP9gUcWqD2/bbUoqkjflX6te KMPg== X-Gm-Message-State: ALoCoQkWk1ybWfPCb4vKF8aaagnIndTpDzvr45gegjpaGGoq5Mpdi1j6g+V2ggLiuFOo/8lpTHcJ X-Received: by 10.194.118.198 with SMTP id ko6mr54800221wjb.47.1424133883480; Mon, 16 Feb 2015 16:44:43 -0800 (PST) Received: from xps13.localnet (guy78-1-82-235-116-147.fbx.proxad.net. [82.235.116.147]) by mx.google.com with ESMTPSA id ka1sm25063109wjc.2.2015.02.16.16.44.42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Feb 2015 16:44:42 -0800 (PST) From: Thomas Monjalon To: Tetsuya Mukawa Date: Tue, 17 Feb 2015 01:44:10 +0100 Message-ID: <4367974.mVXCMbsChG@xps13> Organization: 6WIND User-Agent: KMail/4.14.4 (Linux/3.18.4-1-ARCH; KDE/4.14.4; x86_64; ; ) In-Reply-To: <1424060073-23484-5-git-send-email-mukawa@igel.co.jp> References: <1423470639-15744-2-git-send-email-mukawa@igel.co.jp> <1424060073-23484-1-git-send-email-mukawa@igel.co.jp> <1424060073-23484-5-git-send-email-mukawa@igel.co.jp> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Cc: dev@dpdk.org Subject: Re: [dpdk-dev] [PATCH v8 04/14] eal/pci: Consolidate pci address comparison APIs 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: Tue, 17 Feb 2015 00:44:43 -0000 2015-02-16 13:14, Tetsuya Mukawa: > This patch replaces pci_addr_comparison() and memcmp() of pci addresses by > eal_compare_pci_addr(). > > v8: > - Fix pci_scan_one() to update sysfs values. > (Thanks to Qiu, Michael and Iremonger, Bernard) > v5: > - Fix pci_scan_one to handle pt_driver correctly. > v4: > - Fix calculation method of eal_compare_pci_addr(). > - Add parameter checking. > > Signed-off-by: Tetsuya Mukawa > --- > lib/librte_eal/bsdapp/eal/eal_pci.c | 29 ++++++++++++-------------- > lib/librte_eal/common/eal_common_pci.c | 2 +- > lib/librte_eal/common/include/rte_pci.h | 34 +++++++++++++++++++++++++++++++ > lib/librte_eal/linuxapp/eal/eal_pci.c | 30 +++++++++++++-------------- > lib/librte_eal/linuxapp/eal/eal_pci_uio.c | 2 +- > 5 files changed, 63 insertions(+), 34 deletions(-) > > diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/eal/eal_pci.c > index 74ecce7..7dbdccd 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) > @@ -356,13 +342,24 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf) > } > else { > struct rte_pci_device *dev2 = NULL; > + int ret; > > TAILQ_FOREACH(dev2, &pci_device_list, next) { > - if (pci_addr_comparison(&dev->addr, &dev2->addr)) > + ret = eal_compare_pci_addr(&dev->addr, &dev2->addr); > + if (ret > 0) > continue; > - else { > + else if (ret < 0) { > TAILQ_INSERT_BEFORE(dev2, dev, next); > return 0; > + } else { /* already registered */ > + /* update pt_driver */ > + dev2->pt_driver = dev->pt_driver; > + dev2->max_vfs = dev->max_vfs; > + memmove(dev2->mem_resource, > + dev->mem_resource, > + sizeof(dev->mem_resource)); > + free(dev); > + return 0; Could you comment this "else part" please? [...] > --- a/lib/librte_eal/common/include/rte_pci.h > +++ b/lib/librte_eal/common/include/rte_pci.h > @@ -269,6 +269,40 @@ 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, or error. > + */ > +static inline int > +eal_compare_pci_addr(struct rte_pci_addr *addr, struct rte_pci_addr *addr2) I think that this function should be prefixed with rte_ [...] > /* 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)) Why memcmp is not sufficient to compare PCI addresses? The only exception I see is endianness for natural sorting. > continue; > > for (i = 0; i != uio_res->nb_maps; i++) { >