From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gaetan.rivet@6wind.com>
Received: from mail-wr0-f179.google.com (mail-wr0-f179.google.com
[209.85.128.179]) by dpdk.org (Postfix) with ESMTP id 7A71F1B1AA
for <dev@dpdk.org>; Mon, 25 Sep 2017 17:24:39 +0200 (CEST)
Received: by mail-wr0-f179.google.com with SMTP id k20so8447406wre.4
for <dev@dpdk.org>; Mon, 25 Sep 2017 08:24:39 -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=B7KPxOdGRiU3Q6S3AFZhhbj3q6UxzchFo0mIL8BAuLs=;
b=wZ7eNMfV+QD07AOpkGRo3WcVUxRhhkAjg+6wd+PP73PcPQQz1UczGhEJhAQ2NHYayO
OghwH0QMXmZIMtnYD23jR8svGDDXv/2SMdmeWFdFKP3BOiTpkGx4rFHPMsgHXml3PZE4
bOarb504gjq88GBlmaVw8fwki27yjgpcZMUrfQNayFB3QO7Z+TvnNRRtKtni6Oe7Ddb4
bwtNtpf5RYkCZOKUsL9UodSVAJUx6usCVmJ+P5B1ydL2xfSOxGw/SrAA8TqZlDRHzJ8Z
IwTXaneFE6Y5HUNZ4de1oOGgsciOBN/Gp0QHsNqMlmmAU5W42JUirEd2VWERJKDufeH5
h3Jw==
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=B7KPxOdGRiU3Q6S3AFZhhbj3q6UxzchFo0mIL8BAuLs=;
b=YIK9pX3mGAxgZrLHLuIc4I55hCcHoREOJWs9yHT7pql0A0tWYX3jdDOnRyKjSxTXHe
d4VQcGROjofL39Cdy1jdWS4oZ0v+1CvKKOAvp4qS0mJteXy0AZ8sWfHgRgLW0CUYKh2O
l0dA3HasFyWSXo+8AfChms0vpFApzXX1dVxpIdOjin0/bc/E1fzTj50cpeeg1eniodBI
UJojxCpxfypJ7+VfhAcA0nASX4h3V3knQ9SUyLm4VvSkU5KD2HTJ2hgcTb88t2fGFBqj
Mfp05P6kAB8b9Kl3fKLwaVNPjQWpAF+fDuYIeTiu84czGc5WeKI3h2SECQDpbFRt1VDE
uZfg==
X-Gm-Message-State: AHPjjUixI+gxXttkZyBMH92SIQ6+hRajhI07YadNNGIJ2OUrqPGq+jMn
ZkCzJlDc7B+KFHddHSXq1Mio/ox7
X-Google-Smtp-Source: AOwi7QAMqqO+fsh+YCe3/ZmqzQGhf/U0ys01jhzYUbXFWYfQsyAHRiZk6s/h1l32EEyotL8SxQzk3w==
X-Received: by 10.223.143.105 with SMTP id p96mr7101202wrb.118.1506353078661;
Mon, 25 Sep 2017 08:24:38 -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 o3sm1058933wmg.3.2017.09.25.08.24.37
(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
Mon, 25 Sep 2017 08:24:37 -0700 (PDT)
From: Gaetan Rivet <gaetan.rivet@6wind.com>
To: dev@dpdk.org
Cc: Gaetan Rivet <gaetan.rivet@6wind.com>
Date: Mon, 25 Sep 2017 17:24:07 +0200
Message-Id: <94513cd757c4a691d6378b366b83485ea46a57e7.1506352672.git.gaetan.rivet@6wind.com>
X-Mailer: git-send-email 2.1.4
In-Reply-To: <cover.1506352670.git.gaetan.rivet@6wind.com>
References: <cover.1505726803.git.gaetan.rivet@6wind.com>
<cover.1506352670.git.gaetan.rivet@6wind.com>
In-Reply-To: <cover.1506352670.git.gaetan.rivet@6wind.com>
References: <cover.1506352670.git.gaetan.rivet@6wind.com>
Subject: [dpdk-dev] [PATCH v3 10/13] pci: avoid inlining functions
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Sep 2017 15:24:39 -0000
Parsing operations should not happen in performance critical sections.
Headers should not propose implementations unless duly required.
Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
---
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 3858e80..09a609a 100644
--- a/lib/librte_pci/include/rte_pci.h
+++ b/lib/librte_pci/include/rte_pci.h
@@ -126,19 +126,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
@@ -152,15 +139,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
@@ -174,16 +153,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
@@ -197,17 +167,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.
*
@@ -220,27 +182,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: *;
};
--
2.1.4