From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gaetan.rivet@6wind.com>
Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66])
by dpdk.org (Postfix) with ESMTP id 5279A1C0E8
for <dev@dpdk.org>; Fri, 13 Apr 2018 15:23:12 +0200 (CEST)
Received: by mail-wm0-f66.google.com with SMTP id x4so4136142wmh.5
for <dev@dpdk.org>; Fri, 13 Apr 2018 06:23:12 -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=wYMomHa4Vx+2/YtVVHi6U3unZdnjE6KhLSUi5ieIOiU=;
b=g9jjRJxxEJEYerv2SwYHSlFzORpwq7xcrDWwYCrJ/D3q6fW/i0jmYcUYnnpA0++cRB
8rzS/iRIvYM0C9oSFGWRViG0RZP2N4S4mE0Yb80jc/j8lPjnKx+3aKD+hqmjoj4S4+bU
WzdqfB+RnWSNI/g3MoSlc8HXoqRtpTmF52GAsxPXV03SvsQUqP7EqU5pK7lcm3rPr+5/
vYO2k6opOV0tW86TkrWBuhB8NOP6mibyiof14R8zC9za5y9yjNs/benNjDqmCxnwyWpM
G4N1BeGTqenCAVdiie+s43WbJ6ElnaiEVh+kgsUSz4Z8mmPOHeBLV2QwNiXaBzcKT/HH
Dseg==
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=wYMomHa4Vx+2/YtVVHi6U3unZdnjE6KhLSUi5ieIOiU=;
b=ja6vqfNI9AdpuaICGHRuoJuCPbnQgC15v/A1ha9Hiyb4hIJ9uekyNISYyNp7wRcKby
K80qhN3ODOg+mi4gCNA0sLDIc2WUd9rqqul2OJKnTm/9iq5cM/qEXNagfaqFcGvCWRMp
901GDIab+KknIUe97bJQ/s/+njct6aOUElULbJzCVJfTPyenrvcmrvhYiu21Knu/bc22
RvXy9GhIg31N0oHH24pNW40PVrI/4+qBxskpnLWnt97FASR8H/sECFbITKbErwj3uhIN
yGmLVZarEMD9XQdzrF00PS44jLwDyoCWOfKS0+/tSHI1XCwH1zoeeXOxrQer4diplwah
uwrw==
X-Gm-Message-State: ALQs6tBJ7UnX1Gngha73XCv6uKg8mV3I2SdJnY8h9AkOOMsheyMkl1l5
zXW3l1JhJGPYxOOiFXs7/T3V4KDO
X-Google-Smtp-Source: AIpwx4+Eb4H8To5uzMqM+pzFJwop4Uxmi4ZHsv85Ooty5awhK8TIWfL7w3FMWIiQ39wQDsfDo9vZ4Q==
X-Received: by 10.28.4.87 with SMTP id 84mr3470340wme.86.1523625791204;
Fri, 13 Apr 2018 06:23:11 -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 r200sm2377244wmb.9.2018.04.13.06.23.09
(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Fri, 13 Apr 2018 06:23:09 -0700 (PDT)
From: Gaetan Rivet <gaetan.rivet@6wind.com>
To: dev@dpdk.org
Cc: Gaetan Rivet <gaetan.rivet@6wind.com>
Date: Fri, 13 Apr 2018 15:22:26 +0200
Message-Id: <162025838e483e4e8295abdfecf8758c29409edc.1523625525.git.gaetan.rivet@6wind.com>
X-Mailer: git-send-email 2.11.0
In-Reply-To: <cover.1523625523.git.gaetan.rivet@6wind.com>
References: <cover.1521124599.git.gaetan.rivet@6wind.com>
<cover.1523625523.git.gaetan.rivet@6wind.com>
In-Reply-To: <cover.1523625523.git.gaetan.rivet@6wind.com>
References: <cover.1523625523.git.gaetan.rivet@6wind.com>
Subject: [dpdk-dev] [PATCH v6 11/22] eal/dev: implement device iteration
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://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: <https://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Apr 2018 13:23:12 -0000
Use the iteration hooks in the abstraction layers to perform the
requested filtering on the internal device lists.
Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
---
lib/librte_eal/common/eal_common_dev.c | 168 ++++++++++++++++++++++++++++++++
lib/librte_eal/common/include/rte_dev.h | 26 +++++
lib/librte_eal/rte_eal_version.map | 1 +
3 files changed, 195 insertions(+)
diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/common/eal_common_dev.c
index d8e306926..9d180f881 100644
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -45,6 +45,28 @@ static struct dev_event_cb_list dev_event_cbs;
/* spinlock for device callbacks */
static rte_spinlock_t dev_event_lock = RTE_SPINLOCK_INITIALIZER;
+struct dev_next_ctx {
+ struct rte_dev_iterator *it;
+ const char *busstr;
+ const char *clsstr;
+};
+
+#define CTX(it, busstr, clsstr) \
+ (&(const struct dev_next_ctx){ \
+ .it = it, \
+ .busstr = busstr, \
+ .clsstr = clsstr, \
+ })
+
+#define ITCTX(ptr) \
+ (((struct dev_next_ctx *)(intptr_t)ptr)->it)
+
+#define BUSCTX(ptr) \
+ (((struct dev_next_ctx *)(intptr_t)ptr)->busstr)
+
+#define CLSCTX(ptr) \
+ (((struct dev_next_ctx *)(intptr_t)ptr)->clsstr)
+
static int cmp_detached_dev_name(const struct rte_device *dev,
const void *_name)
{
@@ -516,3 +538,149 @@ rte_dev_iterator_init(struct rte_dev_iterator *it,
}
return -rte_errno;
}
+
+static char *
+dev_str_sane_copy(const char *str)
+{
+ size_t end;
+ char *copy;
+
+ end = strcspn(str, ",/");
+ if (str[end] == ',') {
+ copy = strdup(&str[end + 1]);
+ } else {
+ /* '/' or '\0' */
+ copy = strdup("");
+ }
+ if (copy == NULL) {
+ rte_errno = ENOMEM;
+ } else {
+ char *slash;
+
+ slash = strchr(copy, '/');
+ if (slash != NULL)
+ slash[0] = '\0';
+ }
+ return copy;
+}
+
+static int
+class_next_dev_cmp(const struct rte_class *cls,
+ const void *ctx)
+{
+ struct rte_dev_iterator *it;
+ const char *clsstr = NULL;
+ void *dev;
+
+ if (cls->dev_iterate == NULL)
+ return 1;
+ it = ITCTX(ctx);
+ clsstr = CLSCTX(ctx);
+ dev = it->class_device;
+ /* it->clsstr != NULL means a class
+ * was specified in the devstr.
+ */
+ if (it->clsstr != NULL && cls != it->cls)
+ return 1;
+ /* If an error occurred previously,
+ * no need to test further.
+ */
+ if (rte_errno != 0)
+ return -1;
+ dev = cls->dev_iterate(dev, clsstr, it);
+ it->class_device = dev;
+ return dev == NULL;
+}
+
+static int
+bus_next_dev_cmp(const struct rte_bus *bus,
+ const void *ctx)
+{
+ struct rte_device *dev = NULL;
+ struct rte_class *cls = NULL;
+ struct rte_dev_iterator *it;
+ const char *busstr = NULL;
+
+ if (bus->dev_iterate == NULL)
+ return 1;
+ it = ITCTX(ctx);
+ busstr = BUSCTX(ctx);
+ dev = it->device;
+ /* it->busstr != NULL means a bus
+ * was specified in the devstr.
+ */
+ if (it->busstr != NULL && bus != it->bus)
+ return 1;
+ /* If an error occurred previously,
+ * no need to test further.
+ */
+ if (rte_errno != 0)
+ return -1;
+ if (it->clsstr == NULL) {
+ dev = bus->dev_iterate(dev, busstr, it);
+ goto end;
+ }
+ /* clsstr != NULL */
+ if (dev == NULL) {
+next_dev_on_bus:
+ dev = bus->dev_iterate(dev, busstr, it);
+ it->device = dev;
+ }
+ if (dev == NULL)
+ return 1;
+ if (it->cls != NULL)
+ cls = TAILQ_PREV(it->cls, rte_class_list, next);
+ cls = rte_class_find(cls, class_next_dev_cmp, ctx);
+ if (cls != NULL) {
+ it->cls = cls;
+ goto end;
+ }
+ goto next_dev_on_bus;
+end:
+ it->device = dev;
+ return dev == NULL;
+}
+__rte_experimental
+struct rte_device *
+rte_dev_iterator_next(struct rte_dev_iterator *it)
+{
+ struct rte_bus *bus = NULL;
+ int old_errno = rte_errno;
+ char *busstr = NULL;
+ char *clsstr = NULL;
+
+ rte_errno = 0;
+ if (it->busstr == NULL && it->clsstr == NULL) {
+ /* Invalid iterator. */
+ rte_errno = EINVAL;
+ return NULL;
+ }
+ if (it->bus != NULL)
+ bus = TAILQ_PREV(it->bus, rte_bus_list, next);
+ if (it->busstr != NULL) {
+ busstr = dev_str_sane_copy(it->busstr);
+ if (busstr == NULL)
+ goto out;
+ }
+ if (it->clsstr != NULL) {
+ clsstr = dev_str_sane_copy(it->clsstr);
+ if (clsstr == NULL)
+ goto out;
+ }
+ while ((bus = rte_bus_find(bus, bus_next_dev_cmp,
+ CTX(it, busstr, clsstr)))) {
+ if (it->device != NULL) {
+ it->bus = bus;
+ goto out;
+ }
+ if (it->busstr != NULL ||
+ rte_errno != 0)
+ break;
+ }
+ if (rte_errno == 0)
+ rte_errno = old_errno;
+out:
+ free(busstr);
+ free(clsstr);
+ return it->device;
+}
diff --git a/lib/librte_eal/common/include/rte_dev.h b/lib/librte_eal/common/include/rte_dev.h
index eb1ad6182..bfa57287a 100644
--- a/lib/librte_eal/common/include/rte_dev.h
+++ b/lib/librte_eal/common/include/rte_dev.h
@@ -353,6 +353,32 @@ __rte_experimental
int
rte_dev_iterator_init(struct rte_dev_iterator *it, const char *str);
+/**
+ * Iterates on a device iterator.
+ *
+ * Generates a new rte_device handle corresponding to the next element
+ * in the list described in comprehension by the iterator.
+ *
+ * The next object is returned, and the iterator is updated.
+ *
+ * @param it
+ * Device iterator handle.
+ *
+ * @return
+ * An rte_device handle if found.
+ * NULL if an error occurred (rte_errno is set).
+ * NULL if no device could be found (rte_errno is not set).
+ */
+__rte_experimental
+struct rte_device *
+rte_dev_iterator_next(struct rte_dev_iterator *it);
+
+#define RTE_DEV_FOREACH(dev, devstr, it) \
+ for (rte_dev_iterator_init(it, devstr), \
+ dev = rte_dev_iterator_next(it); \
+ dev != NULL; \
+ dev = rte_dev_iterator_next(it))
+
#ifdef __cplusplus
}
#endif
diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map
index 1a41e9413..483ed94c4 100644
--- a/lib/librte_eal/rte_eal_version.map
+++ b/lib/librte_eal/rte_eal_version.map
@@ -224,6 +224,7 @@ EXPERIMENTAL {
rte_class_register;
rte_class_unregister;
rte_dev_iterator_init;
+ rte_dev_iterator_next;
rte_eal_hotplug_add;
rte_eal_hotplug_remove;
rte_eal_mbuf_user_pool_ops;
--
2.11.0