[dpdk-dev,v4,4/9] bus: add bus helper iterator to find a particular device

Message ID 82d275852b7179929081d005e62d458283d7b304.1497999601.git.gaetan.rivet@6wind.com (mailing list archive)
State Superseded, archived
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Gaëtan Rivet June 20, 2017, 11:29 p.m. UTC
  From: Jan Blunck <jblunck@infradead.org>

Signed-off-by: Jan Blunck <jblunck@infradead.org>
Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
---
 lib/librte_eal/bsdapp/eal/rte_eal_version.map   |  1 +
 lib/librte_eal/common/eal_common_bus.c          | 24 ++++++++++++++++++++++++
 lib/librte_eal/common/include/rte_bus.h         | 23 +++++++++++++++++++++++
 lib/librte_eal/linuxapp/eal/rte_eal_version.map |  1 +
 4 files changed, 49 insertions(+)
  

Comments

Thomas Monjalon June 21, 2017, 12:21 p.m. UTC | #1
21/06/2017 01:29, Gaetan Rivet:
>  /**
> + * Bus iterator to find a particular device.

It should be said that it is iterating over every registered buses.

> + *
> + * If the callback returns non-zero this function will stop iterating over any
> + * more buses and devices. To continue a search the device of a previous search
> + * is passed via the start parameters.
> + *
> + * @param start
> + *	 Start device of the iteration.
> + *
> + * @param cmp
> + *	 Callback function to check device.
> + *
> + * @param data
> + *	 Data to pass to match callback.
> + *
> + * @return
> + *	 A pointer to a rte_bus structure or NULL in case no bus matches.
> + */
> +struct rte_device *
> +rte_bus_find_device(const struct rte_device *start,
> +		    rte_dev_cmp_t cmp, const void *data);

The order of the parameters is different of rte_bus_find():
    struct rte_bus *rte_bus_find(rte_bus_cmp_t cmp,
                                 const void *data,
                                 const struct rte_bus *start);
  

Patch

diff --git a/lib/librte_eal/bsdapp/eal/rte_eal_version.map b/lib/librte_eal/bsdapp/eal/rte_eal_version.map
index f1a0765..21640d6 100644
--- a/lib/librte_eal/bsdapp/eal/rte_eal_version.map
+++ b/lib/librte_eal/bsdapp/eal/rte_eal_version.map
@@ -164,6 +164,7 @@  DPDK_17.05 {
 
 	rte_bus_find;
 	rte_bus_find_by_device;
+	rte_bus_find_device;
 	rte_cpu_is_supported;
 	rte_log_dump;
 	rte_log_register;
diff --git a/lib/librte_eal/common/eal_common_bus.c b/lib/librte_eal/common/eal_common_bus.c
index a38b576..9d84727 100644
--- a/lib/librte_eal/common/eal_common_bus.c
+++ b/lib/librte_eal/common/eal_common_bus.c
@@ -189,3 +189,27 @@  struct rte_bus *rte_bus_find_by_device(const struct rte_device *dev)
 {
 	return rte_bus_find(bus_find_device, (const void *)dev, NULL);
 }
+
+struct rte_device *
+rte_bus_find_device(const struct rte_device *start,
+		    rte_dev_cmp_t cmp, const void *data)
+{
+	struct rte_bus *bus;
+	struct rte_device *dev = NULL;
+	int started = start == NULL;
+
+	TAILQ_FOREACH(bus, &rte_bus_list, next) {
+		if (!bus->find_device)
+			continue;
+		if (!started) {
+			dev = bus->find_device(cmp_rte_device, start);
+			if (dev)
+				started = 1;
+			continue;
+		}
+		dev = bus->find_device(cmp, data);
+		if (dev)
+			break;
+	}
+	return dev;
+}
diff --git a/lib/librte_eal/common/include/rte_bus.h b/lib/librte_eal/common/include/rte_bus.h
index fa12f55..e078c00 100644
--- a/lib/librte_eal/common/include/rte_bus.h
+++ b/lib/librte_eal/common/include/rte_bus.h
@@ -189,6 +189,29 @@  struct rte_bus *rte_bus_find(rte_bus_cmp_t cmp,
 			     const struct rte_bus *start);
 
 /**
+ * Bus iterator to find a particular device.
+ *
+ * If the callback returns non-zero this function will stop iterating over any
+ * more buses and devices. To continue a search the device of a previous search
+ * is passed via the start parameters.
+ *
+ * @param start
+ *	 Start device of the iteration.
+ *
+ * @param cmp
+ *	 Callback function to check device.
+ *
+ * @param data
+ *	 Data to pass to match callback.
+ *
+ * @return
+ *	 A pointer to a rte_bus structure or NULL in case no bus matches.
+ */
+struct rte_device *
+rte_bus_find_device(const struct rte_device *start,
+		    rte_dev_cmp_t cmp, const void *data);
+
+/**
  * Find the registered bus for a particular device.
  */
 struct rte_bus *rte_bus_find_by_device(const struct rte_device *dev);
diff --git a/lib/librte_eal/linuxapp/eal/rte_eal_version.map b/lib/librte_eal/linuxapp/eal/rte_eal_version.map
index 6f77222..e0a056d 100644
--- a/lib/librte_eal/linuxapp/eal/rte_eal_version.map
+++ b/lib/librte_eal/linuxapp/eal/rte_eal_version.map
@@ -168,6 +168,7 @@  DPDK_17.05 {
 
 	rte_bus_find;
 	rte_bus_find_by_device;
+	rte_bus_find_device;
 	rte_cpu_is_supported;
 	rte_intr_free_epoll_fd;
 	rte_log_dump;