From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gaetan.rivet@6wind.com>
Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65])
by dpdk.org (Postfix) with ESMTP id 390462BF7
for <dev@dpdk.org>; Thu, 30 Aug 2018 15:42:34 +0200 (CEST)
Received: by mail-wm0-f65.google.com with SMTP id s12-v6so2059146wmc.0
for <dev@dpdk.org>; Thu, 30 Aug 2018 06:42:34 -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
:mime-version:content-transfer-encoding;
bh=P+2HyqC4ZvrPG7gLe4w+bgYhBL0eNkfSbx9QrWWRZQA=;
b=1+qrP+qljLAlSLmnlTgkSLX5Fo7croLWVX4VFJrpWKptqk539tFUpZwPZY1sqE8Sm8
MDWy/GHqVVc3A7IJqlUA3QZpFZRN6r8JqWLRHThWfFbdZ1iQgiyXFtzJ0T1DgtkEokzt
YrMBIywDmSOYSNJCCUHw4fILO6A90EevSMbS5ukLNO+m5ifXo1UuThBb7LxNz75A9Xx6
TCeCfEFNpAzqZYpZe+IQbEHsiQ6nGCXvWwITIxlz3IZczIS7xsoNWacjaeF5wE04AGBR
9p2cN/vn1bSZRwgPxoBk59WGjqzgeXZxMNLtRObEIBXIHjDOp0F1jB5+fMVXcFcJDVKG
4zbQ==
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:mime-version:content-transfer-encoding;
bh=P+2HyqC4ZvrPG7gLe4w+bgYhBL0eNkfSbx9QrWWRZQA=;
b=dDAIfiKipno1pOAEz7TI6ogZbbUZ4X+kCNbg/Z7x/1eabFJB51T01MkIWtjY7tFkfb
RwSMOkRPQKibZEuYDRHbmelqf/gLJU7T72iYvsIBIkNuIVYhgWYv1E709c0mHfxQSxqk
yma7Y5HMBWg6oHk6YjtOy1JkkVM8CzVOhgAv3H3n9tH+jTRluUGNqxQJOLripfXqswT8
kiZPHgtsfRIpAj1usaUNUIKg58nAiFEunjvaSLwhtEsdmaqRksXv7Q9X5Wj6m/kFmiIy
6Xo1Ev4QcIjlPrYojCv1pXxadFiLLhAjIU6vYmbXqzncPKSlxLpi2fqpsw1og4it6bv+
RctQ==
X-Gm-Message-State: APzg51A1+V+HRyFdEu9p3Tw8V0yTVTYN1vd/x4XOhQpycnUPw+58S/WY
nrdFjkAXo8zxoFrPJ7kdeSUPmiW4tvE=
X-Google-Smtp-Source: ANB0VdakmcdaWRYzzaw5eg2/C2e8QvlNk8s0sTVT0sjZQVLnzaaLDKjyz8M3DGUMEiUGQkeFIkOLJw==
X-Received: by 2002:a1c:889:: with SMTP id
131-v6mr1793863wmi.142.1535636553601;
Thu, 30 Aug 2018 06:42:33 -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 w10-v6sm5247731wrp.31.2018.08.30.06.42.32
(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Thu, 30 Aug 2018 06:42:32 -0700 (PDT)
From: Gaetan Rivet <gaetan.rivet@6wind.com>
To: dev@dpdk.org
Cc: Gaetan Rivet <gaetan.rivet@6wind.com>
Date: Thu, 30 Aug 2018 15:41:52 +0200
Message-Id: <e43e97e762d5cf8865f93c202098a970904403ba.1535633784.git.gaetan.rivet@6wind.com>
X-Mailer: git-send-email 2.18.0
In-Reply-To: <cover.1535633783.git.gaetan.rivet@6wind.com>
References: <cover.1535633783.git.gaetan.rivet@6wind.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH v1 01/13] bus/pci: implement device iteration and
comparison
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Aug 2018 13:42:34 -0000
Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
---
drivers/bus/pci/Makefile | 3 +-
drivers/bus/pci/meson.build | 6 +++-
drivers/bus/pci/pci_common.c | 3 +-
drivers/bus/pci/pci_params.c | 53 ++++++++++++++++++++++++++++++++++++
drivers/bus/pci/private.h | 25 +++++++++++++++++
5 files changed, 86 insertions(+), 4 deletions(-)
create mode 100644 drivers/bus/pci/pci_params.c
diff --git a/drivers/bus/pci/Makefile b/drivers/bus/pci/Makefile
index cf373068a..4de953f8f 100644
--- a/drivers/bus/pci/Makefile
+++ b/drivers/bus/pci/Makefile
@@ -26,10 +26,11 @@ CFLAGS += -I$(RTE_SDK)/lib/librte_eal/$(SYSTEM)app/eal
CFLAGS += -DALLOW_EXPERIMENTAL_API
LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_pci
+LDLIBS += -lrte_ethdev -lrte_pci -lrte_kvargs
include $(RTE_SDK)/drivers/bus/pci/$(SYSTEM)/Makefile
SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) := $(addprefix $(SYSTEM)/,$(SRCS))
+SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci_params.c
SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci_common.c
SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci_common_uio.c
diff --git a/drivers/bus/pci/meson.build b/drivers/bus/pci/meson.build
index 72939e598..23d6a5fec 100644
--- a/drivers/bus/pci/meson.build
+++ b/drivers/bus/pci/meson.build
@@ -3,7 +3,9 @@
deps += ['pci']
install_headers('rte_bus_pci.h')
-sources = files('pci_common.c', 'pci_common_uio.c')
+sources = files('pci_common.c',
+ 'pci_common_uio.c',
+ 'pci_params.c')
if host_machine.system() == 'linux'
sources += files('linux/pci.c',
'linux/pci_uio.c',
@@ -17,3 +19,5 @@ endif
# memseg walk is not part of stable API yet
allow_experimental_apis = true
+
+deps += ['kvargs']
diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index 7736b3f9c..c7695d108 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -27,8 +27,6 @@
#include "private.h"
-extern struct rte_pci_bus rte_pci_bus;
-
#define SYSFS_PCI_DEVICES "/sys/bus/pci/devices"
const char *rte_pci_get_sysfs_path(void)
@@ -435,6 +433,7 @@ struct rte_pci_bus rte_pci_bus = {
.unplug = pci_unplug,
.parse = pci_parse,
.get_iommu_class = rte_pci_get_iommu_class,
+ .dev_iterate = rte_pci_dev_iterate,
},
.device_list = TAILQ_HEAD_INITIALIZER(rte_pci_bus.device_list),
.driver_list = TAILQ_HEAD_INITIALIZER(rte_pci_bus.driver_list),
diff --git a/drivers/bus/pci/pci_params.c b/drivers/bus/pci/pci_params.c
new file mode 100644
index 000000000..0fde75803
--- /dev/null
+++ b/drivers/bus/pci/pci_params.c
@@ -0,0 +1,53 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2018 Gaëtan Rivet
+ */
+
+#include <rte_bus.h>
+#include <rte_dev.h>
+#include <rte_errno.h>
+#include <rte_kvargs.h>
+#include <rte_pci.h>
+
+#include "private.h"
+
+enum pci_params {
+ RTE_PCI_PARAMS_MAX,
+};
+
+static const char * const pci_params_keys[] = {
+ [RTE_PCI_PARAMS_MAX] = NULL,
+};
+
+static int
+pci_dev_match(const struct rte_device *dev,
+ const void *_kvlist)
+{
+ const struct rte_kvargs *kvlist = _kvlist;
+
+ (void) dev;
+ (void) kvlist;
+ return 0;
+}
+
+void *
+rte_pci_dev_iterate(const void *start,
+ const char *str,
+ const struct rte_dev_iterator *it __rte_unused)
+{
+ rte_bus_find_device_t find_device;
+ struct rte_kvargs *kvargs = NULL;
+ struct rte_device *dev;
+
+ if (str != NULL) {
+ kvargs = rte_kvargs_parse(str, pci_params_keys);
+ if (kvargs == NULL) {
+ RTE_LOG(ERR, EAL, "cannot parse argument list\n");
+ rte_errno = EINVAL;
+ return NULL;
+ }
+ }
+ find_device = rte_pci_bus.bus.find_device;
+ dev = find_device(start, pci_dev_match, kvargs);
+ rte_kvargs_free(kvargs);
+ return dev;
+}
diff --git a/drivers/bus/pci/private.h b/drivers/bus/pci/private.h
index 8ddd03e16..0e689fa74 100644
--- a/drivers/bus/pci/private.h
+++ b/drivers/bus/pci/private.h
@@ -10,6 +10,8 @@
#include <rte_pci.h>
#include <rte_bus_pci.h>
+extern struct rte_pci_bus rte_pci_bus;
+
struct rte_pci_driver;
struct rte_pci_device;
@@ -166,4 +168,27 @@ rte_pci_match(const struct rte_pci_driver *pci_drv,
enum rte_iova_mode
rte_pci_get_iommu_class(void);
+/*
+ * Iterate over internal devices,
+ * matching any device against the provided
+ * string.
+ *
+ * @param start
+ * Iteration starting point.
+ *
+ * @param str
+ * Device string to match against.
+ *
+ * @param it
+ * (unused) iterator structure.
+ *
+ * @return
+ * A pointer to the next matching device if any.
+ * NULL otherwise.
+ */
+void *
+rte_pci_dev_iterate(const void *start,
+ const char *str,
+ const struct rte_dev_iterator *it);
+
#endif /* _PCI_PRIVATE_H_ */
--
2.18.0