From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gaetan.rivet@6wind.com>
Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com
[209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 3B7851B5AB
for <dev@dpdk.org>; Wed, 11 Jul 2018 23:45:57 +0200 (CEST)
Received: by mail-wr1-f66.google.com with SMTP id t6-v6so19592044wrn.7
for <dev@dpdk.org>; Wed, 11 Jul 2018 14:45:57 -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=5OM1VqWbunFM8wPdgB3OgPPGvAxoucxEVAX0oAGkDdI=;
b=fDb1wR8JJ0hWYayDypOnJbzrlLMEcga4NCHrsH6d1Pn2afCrjnr13ff1BS2V/3rqBz
RNT/0s2whE0NTs0eAu1k9VrEdjEib2JQYZggj+5sh5aYiFLmKANZVYgpZTJf/36RuoHn
97kobXHhE9V/O0IRPet2+Rty0spbI0Y3KCRGxWMRTPUgz6qrG1wm5loILoB0/mqeWSmz
r+HzHxisQ+d2bXIBsOpxkvzvG3WDKHvMr+PQf+4O4DfzV2B3tk70J0fo5NSvulSg08Ab
DFue68GfEiHPn4W4By4UWTWhi0yLE9ALRGssqGM42+KPL099bE7pF5M7fTnaIvThanX3
LzmQ==
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=5OM1VqWbunFM8wPdgB3OgPPGvAxoucxEVAX0oAGkDdI=;
b=a7+dyMo6rYQ2bQflp1CEhj5chv+Vu2L8X/DJC0MTrhAUmMr2M2WPx0bAsorv+rQ+uR
c4U3s5DewPZyzI6hMD4Ykzc6So95yWPIhIjs5qwNDdVuasw3dhPvHEaZEDUMKmHYTjyq
asvQn9LV03/dnfL6aLfv3dBJ+7ffucMnzx/VzW5N6sqGcv6JrvXd+cvknGq+KWrxoBMe
cYzVNWQF4sWpL9u/FoXT1LwTW2+bS49FtN0JYylsPhrofv/b0LK5vfIKLjtllgFhWps4
2vMBJ/Pxs4X5Gd2tUlXHfrcVj3b6mv4yDyr37XjntHQEuInG4ODo9L488mI6+V/4tPAG
99bA==
X-Gm-Message-State: AOUpUlFPxwzlfHxDkO6U4wo3sTNt/zYuPbGhMQ0Kc5nt8S2oEe6pLgR8
m6EQCdg+6f/2qKOuAu0elWp7vUHJ
X-Google-Smtp-Source: AAOMgpdPEidUFp4JLD6lIhQFXateAIDeUUvAHYH4+qPzCcJl6DJ7sL0Xw66MIVVPJr3Y1Vz34HglJQ==
X-Received: by 2002:a5d:45c1:: with SMTP id b1-v6mr225541wrs.106.1531345556566;
Wed, 11 Jul 2018 14:45:56 -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 h5-v6sm10550936wrr.19.2018.07.11.14.45.55
(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Wed, 11 Jul 2018 14:45:55 -0700 (PDT)
From: Gaetan Rivet <gaetan.rivet@6wind.com>
To: dev@dpdk.org
Cc: Gaetan Rivet <gaetan.rivet@6wind.com>
Date: Wed, 11 Jul 2018 23:45:05 +0200
Message-Id: <f807b70b7413febe69b78f65903cb917452bcf46.1531345404.git.gaetan.rivet@6wind.com>
X-Mailer: git-send-email 2.18.0
In-Reply-To: <cover.1531345404.git.gaetan.rivet@6wind.com>
References: <cover.1531345404.git.gaetan.rivet@6wind.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH v11 15/25] bus/vdev: 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://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: Wed, 11 Jul 2018 21:45:57 -0000
Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
---
drivers/bus/vdev/Makefile | 3 +-
drivers/bus/vdev/meson.build | 5 +++-
drivers/bus/vdev/vdev.c | 10 ++++---
drivers/bus/vdev/vdev_params.c | 51 +++++++++++++++++++++++++++++++++
drivers/bus/vdev/vdev_private.h | 26 +++++++++++++++++
5 files changed, 89 insertions(+), 6 deletions(-)
create mode 100644 drivers/bus/vdev/vdev_params.c
create mode 100644 drivers/bus/vdev/vdev_private.h
diff --git a/drivers/bus/vdev/Makefile b/drivers/bus/vdev/Makefile
index bd0bb8955..1f9cd7ebe 100644
--- a/drivers/bus/vdev/Makefile
+++ b/drivers/bus/vdev/Makefile
@@ -19,8 +19,9 @@ EXPORT_MAP := rte_bus_vdev_version.map
LIBABIVER := 1
SRCS-y += vdev.c
+SRCS-y += vdev_params.c
-LDLIBS += -lrte_eal
+LDLIBS += -lrte_eal -lrte_kvargs
#
# Export include files
diff --git a/drivers/bus/vdev/meson.build b/drivers/bus/vdev/meson.build
index 2ee648b49..12605e5c7 100644
--- a/drivers/bus/vdev/meson.build
+++ b/drivers/bus/vdev/meson.build
@@ -1,7 +1,10 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
-sources = files('vdev.c')
+sources = files('vdev.c',
+ 'vdev_params.c')
install_headers('rte_bus_vdev.h')
allow_experimental_apis = true
+
+deps += ['kvargs']
diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c
index 6139dd551..e8518833d 100644
--- a/drivers/bus/vdev/vdev.c
+++ b/drivers/bus/vdev/vdev.c
@@ -23,6 +23,7 @@
#include "rte_bus_vdev.h"
#include "vdev_logs.h"
+#include "vdev_private.h"
#define VDEV_MP_KEY "bus_vdev_mp"
@@ -493,9 +494,9 @@ vdev_probe(void)
return ret;
}
-static struct rte_device *
-vdev_find_device(const struct rte_device *start, rte_dev_cmp_t cmp,
- const void *data)
+struct rte_device *
+rte_vdev_find_device(const struct rte_device *start, rte_dev_cmp_t cmp,
+ const void *data)
{
const struct rte_vdev_device *vstart;
struct rte_vdev_device *dev;
@@ -532,10 +533,11 @@ vdev_unplug(struct rte_device *dev)
static struct rte_bus rte_vdev_bus = {
.scan = vdev_scan,
.probe = vdev_probe,
- .find_device = vdev_find_device,
+ .find_device = rte_vdev_find_device,
.plug = vdev_plug,
.unplug = vdev_unplug,
.parse = vdev_parse,
+ .dev_iterate = rte_vdev_dev_iterate,
};
RTE_REGISTER_BUS(vdev, rte_vdev_bus);
diff --git a/drivers/bus/vdev/vdev_params.c b/drivers/bus/vdev/vdev_params.c
new file mode 100644
index 000000000..842a4684e
--- /dev/null
+++ b/drivers/bus/vdev/vdev_params.c
@@ -0,0 +1,51 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2018 Gaëtan Rivet
+ */
+
+#include <rte_dev.h>
+#include <rte_bus.h>
+#include <rte_kvargs.h>
+#include <rte_errno.h>
+
+#include "vdev_logs.h"
+#include "vdev_private.h"
+
+enum vdev_params {
+ RTE_VDEV_PARAMS_MAX,
+};
+
+static const char * const vdev_params_keys[] = {
+ [RTE_VDEV_PARAMS_MAX] = NULL,
+};
+
+static int
+vdev_dev_match(const struct rte_device *dev,
+ const void *_kvlist)
+{
+ const struct rte_kvargs *kvlist = _kvlist;
+
+ (void) kvlist;
+ (void) dev;
+ return 0;
+}
+
+void *
+rte_vdev_dev_iterate(const void *start,
+ const char *str,
+ const struct rte_dev_iterator *it __rte_unused)
+{
+ struct rte_kvargs *kvargs = NULL;
+ struct rte_device *dev;
+
+ if (str != NULL) {
+ kvargs = rte_kvargs_parse(str, vdev_params_keys);
+ if (kvargs == NULL) {
+ VDEV_LOG(ERR, "cannot parse argument list\n");
+ rte_errno = EINVAL;
+ return NULL;
+ }
+ }
+ dev = rte_vdev_find_device(start, vdev_dev_match, kvargs);
+ rte_kvargs_free(kvargs);
+ return dev;
+}
diff --git a/drivers/bus/vdev/vdev_private.h b/drivers/bus/vdev/vdev_private.h
new file mode 100644
index 000000000..ba6dc48ff
--- /dev/null
+++ b/drivers/bus/vdev/vdev_private.h
@@ -0,0 +1,26 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2018 Gaëtan Rivet
+ */
+
+#ifndef _VDEV_PRIVATE_H_
+#define _VDEV_PRIVATE_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct rte_device *
+rte_vdev_find_device(const struct rte_device *start,
+ rte_dev_cmp_t cmp,
+ const void *data);
+
+void *
+rte_vdev_dev_iterate(const void *start,
+ const char *str,
+ const struct rte_dev_iterator *it);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _VDEV_PRIVATE_H_ */
--
2.18.0