From patchwork Thu Oct 12 08:17:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ga=C3=ABtan_Rivet?= X-Patchwork-Id: 30182 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C6E3E1B1EC; Thu, 12 Oct 2017 10:17:57 +0200 (CEST) Received: from mail-wm0-f52.google.com (mail-wm0-f52.google.com [74.125.82.52]) by dpdk.org (Postfix) with ESMTP id 0A59B1AEF6 for ; Thu, 12 Oct 2017 10:17:45 +0200 (CEST) Received: by mail-wm0-f52.google.com with SMTP id l68so10954145wmd.5 for ; Thu, 12 Oct 2017 01:17:45 -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=z0FrpvjolzpmO0GFdQUcTaaPSJq0uDjVsh3Sxaj7T0Y=; b=zdcy6Ah55pELPDmdfD5qQzvoDy4Z1b0FPkwCIDH5IT1cCmKrCLdgezTeurkA9lYvcA ZPaNgnfBo8q3StJcNQre02bO/zeVaEU75seyzVmzwLUvahNT8V1Q8cONGVMWQNdrk9V9 0mmsII78cFUMl30Md8VWEPTQ3DXc7w/WE5+ayx3G2hq1FqNXMJb3f8EZfdtd4TysCdJj oKnN0y36rgk4HR3I1NBBjXkYpWZEKdVmWciT2MRqZG4H9CyGn+h0KifdKho6qzZDf7Fa 4/xRwW9kNssvsDguo5HgE527+TNSjkOjv+QMPqwULP7G29o+SrDWHzz8FBf4WVoNUJzC G7eg== 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=z0FrpvjolzpmO0GFdQUcTaaPSJq0uDjVsh3Sxaj7T0Y=; b=o3nMJMMHNxuBGIBaDV1u0kCvYPJpICPK9hsI/eJL9hUespou6L6GMDNF9ulegQQIKJ JOC7DBzMHyCuFj5f88vm47R5ieXMyFdcjlUv8TdkrORBd3mofZq/fukoKEP+/cJrypke yGcu1DT103G2Iu1HARuV8m5yoW8BXZ7ACIx+CFLRH8ejxyemre497D8TZIZsEEDGN0F7 Fk+l6/KRUIfLFj0D44ovRcMzHw/jbMiw8MJMs3mc3DaJBgJL3PQSO/cy0TcQO6v0AeUE nvwRntsYMC3hOC6g6lfSoBva4EBMgEDy/otAETqA3Oi5vAfJyx2sBhkSnSJdhlFBs34i aBEQ== X-Gm-Message-State: AMCzsaUiiUBMfIgTMsDqVTnYPhpxyYaZw7+d4Dn5HnuM4d+Arc5FcNt1 l82SjAhwCwjuGCvE8/SubEMPVlHP X-Google-Smtp-Source: AOwi7QD9Wz56pbMs5WzFjOysPQr4xB3jXVD10rmcxOXOW47Ye/qH91BzgMhgF8eVw/V0r63DykUHyw== X-Received: by 10.28.232.138 with SMTP id f10mr1100677wmi.130.1507796264076; Thu, 12 Oct 2017 01:17:44 -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 25sm16711227wrv.8.2017.10.12.01.17.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Oct 2017 01:17:43 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Thu, 12 Oct 2017 10:17:10 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v4 10/16] pci: avoid inlining functions 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Parsing operations should not happen in performance critical sections. Headers should not propose implementations unless duly required. Signed-off-by: Gaetan Rivet --- lib/librte_pci/include/rte_pci.h | 69 ++++---------------------------------- lib/librte_pci/rte_pci.c | 65 +++++++++++++++++++++++++++++++++++ lib/librte_pci/rte_pci_version.map | 4 +++ 3 files changed, 75 insertions(+), 63 deletions(-) diff --git a/lib/librte_pci/include/rte_pci.h b/lib/librte_pci/include/rte_pci.h index 2647568..fe4d411 100644 --- a/lib/librte_pci/include/rte_pci.h +++ b/lib/librte_pci/include/rte_pci.h @@ -134,19 +134,6 @@ struct mapped_pci_resource { /** mapped pci device list */ TAILQ_HEAD(mapped_pci_res_list, mapped_pci_resource); -/**< Internal use only - Macro used by pci addr parsing functions **/ -#define GET_PCIADDR_FIELD(in, fd, lim, dlm) \ -do { \ - unsigned long val; \ - char *end; \ - errno = 0; \ - val = strtoul((in), &end, 16); \ - if (errno != 0 || end[0] != (dlm) || val > (lim)) \ - return -EINVAL; \ - (fd) = (typeof (fd))val; \ - (in) = end + 1; \ -} while(0) - /** * Utility function to produce a PCI Bus-Device-Function value * given a string representation. Assumes that the BDF is provided without @@ -160,15 +147,7 @@ do { \ * @return * 0 on success, negative on error. */ -static inline int -eal_parse_pci_BDF(const char *input, struct rte_pci_addr *dev_addr) -{ - dev_addr->domain = 0; - GET_PCIADDR_FIELD(input, dev_addr->bus, UINT8_MAX, ':'); - GET_PCIADDR_FIELD(input, dev_addr->devid, UINT8_MAX, '.'); - GET_PCIADDR_FIELD(input, dev_addr->function, UINT8_MAX, 0); - return 0; -} +int eal_parse_pci_BDF(const char *input, struct rte_pci_addr *dev_addr); /** * Utility function to produce a PCI Bus-Device-Function value @@ -182,16 +161,7 @@ eal_parse_pci_BDF(const char *input, struct rte_pci_addr *dev_addr) * @return * 0 on success, negative on error. */ -static inline int -eal_parse_pci_DomBDF(const char *input, struct rte_pci_addr *dev_addr) -{ - GET_PCIADDR_FIELD(input, dev_addr->domain, UINT16_MAX, ':'); - GET_PCIADDR_FIELD(input, dev_addr->bus, UINT8_MAX, ':'); - GET_PCIADDR_FIELD(input, dev_addr->devid, UINT8_MAX, '.'); - GET_PCIADDR_FIELD(input, dev_addr->function, UINT8_MAX, 0); - return 0; -} -#undef GET_PCIADDR_FIELD +int eal_parse_pci_DomBDF(const char *input, struct rte_pci_addr *dev_addr); /** * Utility function to write a pci device name, this device name can later be @@ -205,17 +175,9 @@ eal_parse_pci_DomBDF(const char *input, struct rte_pci_addr *dev_addr) * @param size * The output buffer size */ -static inline void -rte_pci_device_name(const struct rte_pci_addr *addr, - char *output, size_t size) -{ - RTE_VERIFY(size >= PCI_PRI_STR_SIZE); - RTE_VERIFY(snprintf(output, size, PCI_PRI_FMT, - addr->domain, addr->bus, - addr->devid, addr->function) >= 0); -} +void rte_pci_device_name(const struct rte_pci_addr *addr, + char *output, size_t size); -/* Compare two PCI device addresses. */ /** * Utility function to compare two PCI device addresses. * @@ -228,27 +190,8 @@ rte_pci_device_name(const struct rte_pci_addr *addr, * Positive on addr is greater than addr2. * Negative on addr is less than addr2, or error. */ -static inline int -rte_eal_compare_pci_addr(const struct rte_pci_addr *addr, - const struct rte_pci_addr *addr2) -{ - uint64_t dev_addr, dev_addr2; - - if ((addr == NULL) || (addr2 == NULL)) - return -1; - - dev_addr = ((uint64_t)addr->domain << 24) | - (addr->bus << 16) | (addr->devid << 8) | addr->function; - dev_addr2 = ((uint64_t)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; -} +int rte_eal_compare_pci_addr(const struct rte_pci_addr *addr, + const struct rte_pci_addr *addr2); /** * Map a particular resource from a file. diff --git a/lib/librte_pci/rte_pci.c b/lib/librte_pci/rte_pci.c index 9dfdd3f..8584b55 100644 --- a/lib/librte_pci/rte_pci.c +++ b/lib/librte_pci/rte_pci.c @@ -53,6 +53,71 @@ #include "rte_pci.h" +/* Macro used by pci addr parsing functions. **/ +#define GET_PCIADDR_FIELD(in, fd, lim, dlm) \ +do { \ + unsigned long val; \ + char *end; \ + errno = 0; \ + val = strtoul((in), &end, 16); \ + if (errno != 0 || end[0] != (dlm) || val > (lim)) \ + return -EINVAL; \ + (fd) = (typeof (fd))val; \ + (in) = end + 1; \ +} while(0) + +int +eal_parse_pci_BDF(const char *input, struct rte_pci_addr *dev_addr) +{ + dev_addr->domain = 0; + GET_PCIADDR_FIELD(input, dev_addr->bus, UINT8_MAX, ':'); + GET_PCIADDR_FIELD(input, dev_addr->devid, UINT8_MAX, '.'); + GET_PCIADDR_FIELD(input, dev_addr->function, UINT8_MAX, 0); + return 0; +} + +int +eal_parse_pci_DomBDF(const char *input, struct rte_pci_addr *dev_addr) +{ + GET_PCIADDR_FIELD(input, dev_addr->domain, UINT16_MAX, ':'); + GET_PCIADDR_FIELD(input, dev_addr->bus, UINT8_MAX, ':'); + GET_PCIADDR_FIELD(input, dev_addr->devid, UINT8_MAX, '.'); + GET_PCIADDR_FIELD(input, dev_addr->function, UINT8_MAX, 0); + return 0; +} + +void +rte_pci_device_name(const struct rte_pci_addr *addr, + char *output, size_t size) +{ + RTE_VERIFY(size >= PCI_PRI_STR_SIZE); + RTE_VERIFY(snprintf(output, size, PCI_PRI_FMT, + addr->domain, addr->bus, + addr->devid, addr->function) >= 0); +} + +int +rte_eal_compare_pci_addr(const struct rte_pci_addr *addr, + const struct rte_pci_addr *addr2) +{ + uint64_t dev_addr, dev_addr2; + + if ((addr == NULL) || (addr2 == NULL)) + return -1; + + dev_addr = ((uint64_t)addr->domain << 24) | + (addr->bus << 16) | (addr->devid << 8) | addr->function; + dev_addr2 = ((uint64_t)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; +} + /* map a particular resource from a file */ void * pci_map_resource(void *requested_addr, int fd, off_t offset, size_t size, diff --git a/lib/librte_pci/rte_pci_version.map b/lib/librte_pci/rte_pci_version.map index 64dec54..a940259 100644 --- a/lib/librte_pci/rte_pci_version.map +++ b/lib/librte_pci/rte_pci_version.map @@ -1,8 +1,12 @@ DPDK_17.11 { global: + eal_parse_pci_BDF; + eal_parse_pci_DomBDF; pci_map_resource; pci_unmap_resource; + rte_eal_compare_pci_addr; + rte_pci_device_name; local: *; };