From: Thomas Monjalon <thomas.monjalon@6wind.com>
To: Shreyansh Jain <shreyansh.jain@nxp.com>
Cc: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v11 06/13] app/test: check bus probe
Date: Thu, 19 Jan 2017 05:45:10 +0100 [thread overview]
Message-ID: <1484801117-779-7-git-send-email-thomas.monjalon@6wind.com> (raw)
In-Reply-To: <1484801117-779-1-git-send-email-thomas.monjalon@6wind.com>
From: Shreyansh Jain <shreyansh.jain@nxp.com>
Signed-off-by: Shreyansh Jain <shreyansh.jain@nxp.com>
---
app/test/test_bus.c | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 149 insertions(+)
diff --git a/app/test/test_bus.c b/app/test/test_bus.c
index de4f1ab..a3220f3 100644
--- a/app/test/test_bus.c
+++ b/app/test/test_bus.c
@@ -120,12 +120,15 @@ static int scan_fn_for_busB(void);
/* generic implementations wrapped around by above declarations */
static int generic_scan_fn(struct rte_bus *bus);
+static int generic_probe_fn(void);
+static int dummy_match_fn(struct rte_driver *drv, struct rte_device *dev);
struct dummy_bus busA = {
.name = "busA_impl", /* busA */
.bus = {
.name = "busA",
.scan = scan_fn_for_busA,
+ .probe = generic_probe_fn,
},
};
@@ -134,6 +137,7 @@ struct dummy_bus busB = {
.bus = {
.name = "busB",
.scan = scan_fn_for_busB,
+ .probe = generic_probe_fn,
},
};
@@ -283,6 +287,44 @@ generic_scan_fn(struct rte_bus *bus)
return 0;
}
+/* @internal
+ * Obtain bus from driver object. Match the address of rte_device object
+ * with all the devices associated with that bus.
+ *
+ * Being a test function, all this does is validate that device object
+ * provided is available on the same bus to which driver is registered.
+ *
+ * @param drv
+ * driver to match with
+ * @param dev
+ * device object
+ * @return
+ * 0 for successful match
+ * !0 for failed match
+ */
+static int
+dummy_match_fn(struct rte_driver *drv __rte_unused, struct rte_device *dev)
+{
+ struct dummy_device *ddev = NULL;
+ struct dummy_device *ddev_as_arg;
+ struct dummy_bus *dbus = NULL;
+
+ /* Match is based entirely on address of 'dev' and 'dev_p' extracted
+ * from bus->device_list.
+ */
+
+ /* a driver is registered with the bus *before* the scan. */
+ dbus = &busA; /* FIXME: bus cannot be retrieved without knowing the driver */
+ ddev_as_arg = container_of(dev, struct dummy_device, dev);
+
+ TAILQ_FOREACH(ddev, &dbus->device_list, next) {
+ if (ddev == ddev_as_arg)
+ return 0;
+ }
+
+ return 1;
+}
+
int
scan_fn_for_busA(void) {
struct dummy_bus_map *dbm;
@@ -499,6 +541,109 @@ test_bus_scan(void)
return 0;
}
+/*
+ *
+ */
+static int
+generic_probe_fn(void)
+{
+ int ret = 0;
+ int i, j;
+ struct rte_driver *drv;
+ struct rte_device *dev;
+ struct dummy_bus *dbus = NULL;
+ struct dummy_device *ddev = NULL;
+ struct dummy_driver *ddrv = NULL;
+
+ /* In case of this test:
+ * 1. for each bus in rte_bus_list
+ * 2. for each device on that bus (bus specific->device_list)
+ * 3. for each driver on that bus (bus specific->driver_list)
+ * 4. call match
+ * 5. link driver and device
+ * 6. Verify the linkage.
+ */
+ for (i = 0; bus_map[i].name; i++) {
+ /* get bus pointer from bus_map itself */
+ dbus = bus_map[i].dbus;
+
+ /* Looping over all scanned devices */
+ TAILQ_FOREACH(ddev, &dbus->device_list, next) {
+ /* There is a list of drivers within dummy_bus_map.
+ * In case of PMDs, this would be driver registration
+ * APIs/list
+ */
+ for (j = 0; bus_map[i].ddrivers[j]; j++) {
+ ddrv = bus_map[i].ddrivers[j];
+
+ drv = &ddrv->drv;
+ dev = &ddev->dev;
+ ret = dummy_match_fn(drv, dev);
+ if (!ret) {
+ /* As match is generic, it always
+ * results in dev->drv pointing to
+ * first driver entry in bus_map[i]
+ */
+ dev->driver = drv;
+ }
+ /* Else, continue */
+ }
+ }
+ }
+
+ /* Verify the linkage. All devices belonging to a bus_map[i]
+ * should have same driver (first driver entry of bus_map[i])
+ */
+ for (i = 0; bus_map[i].name; i++) {
+ ddrv = bus_map[i].ddrivers[0];
+ drv = &ddrv->drv;
+
+ for (j = 0; bus_map[i].ddevices[j]; j++) {
+ ddev = bus_map[i].ddevices[j];
+ dev = &ddev->dev;
+ if (dev->driver != drv) {
+ printf("Incorrect driver<->device linkage.\n");
+ return -1;
+ }
+ }
+ }
+
+ return 0;
+}
+
+/* @internal
+ * Function to perform 'probe' and link devices and drivers on a bus.
+ * This would work over all the buses registered, and all devices and drivers
+ * registered with it - call match on each pair.
+ *
+ * @param void
+ * @return
+ * 0 for successful probe
+ * !0 for failure in probe
+ *
+ */
+static int
+test_probe_on_bus(void)
+{
+ int ret = 0;
+ int i;
+ struct dummy_bus *dbus;
+ struct rte_bus *bus;
+
+ for (i = 0; bus_map[i].name; i++) {
+ /* get bus pointer from bus_map itself */
+ dbus = bus_map[i].dbus;
+ bus = &dbus->bus;
+ ret = bus->probe();
+ if (ret)
+ printf("Probe for %s failed.\n", bus_map[i].name);
+ }
+
+ printf("Probe on all buses successful.\n");
+ dump_device_tree();
+
+ return 0;
+}
int
test_bus(void)
@@ -513,6 +658,10 @@ test_bus(void)
if (test_bus_scan())
return -1;
+ /* Now that the devices and drivers are registered, perform probe */
+ if (test_probe_on_bus())
+ return -1;
+
if (test_device_unregistration_on_bus())
return -1;
--
2.7.0
next prev parent reply other threads:[~2017-01-19 4:45 UTC|newest]
Thread overview: 146+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-16 15:38 [dpdk-dev] [PATCH v6 0/8] Introducing EAL Bus-Device-Driver Model Shreyansh Jain
2017-01-16 15:38 ` [dpdk-dev] [PATCH v6 1/8] eal/bus: introduce bus abstraction Shreyansh Jain
2017-01-16 15:38 ` [dpdk-dev] [PATCH v6 2/8] test: add basic bus infrastructure tests Shreyansh Jain
2017-01-16 15:38 ` [dpdk-dev] [PATCH v6 3/8] pci: split match and probe function Shreyansh Jain
2017-01-16 18:24 ` Stephen Hemminger
2017-01-17 10:10 ` Shreyansh Jain
2017-01-16 19:53 ` Ferruh Yigit
2017-01-17 4:54 ` Shreyansh Jain
2017-01-17 9:58 ` Ferruh Yigit
2017-01-17 10:14 ` Shreyansh Jain
2017-01-16 15:38 ` [dpdk-dev] [PATCH v6 4/8] eal/bus: support for scanning of bus Shreyansh Jain
2017-01-16 15:38 ` [dpdk-dev] [PATCH v6 5/8] eal: introduce bus scan and probe in EAL Shreyansh Jain
2017-01-16 19:58 ` Ferruh Yigit
2017-01-17 5:03 ` Shreyansh Jain
2017-01-17 23:04 ` Thomas Monjalon
2017-01-17 10:13 ` Shreyansh Jain
2017-01-16 15:38 ` [dpdk-dev] [PATCH v6 6/8] test: update bus and pci unit test cases Shreyansh Jain
2017-01-16 15:38 ` [dpdk-dev] [PATCH v6 7/8] eal: enable PCI bus Shreyansh Jain
2017-01-16 19:58 ` Ferruh Yigit
2017-01-17 5:04 ` Shreyansh Jain
2017-01-17 10:11 ` Shreyansh Jain
2017-01-16 15:38 ` [dpdk-dev] [PATCH v6 8/8] eal: enable hotplugging of devices on bus Shreyansh Jain
2017-01-17 7:24 ` Shreyansh Jain
2017-01-16 18:27 ` [dpdk-dev] [PATCH v6 0/8] Introducing EAL Bus-Device-Driver Model Stephen Hemminger
2017-01-17 5:08 ` Shreyansh Jain
2017-01-17 5:09 ` Shreyansh Jain
2017-01-17 10:09 ` [dpdk-dev] [PATCH v7 0/9] " Shreyansh Jain
2017-01-17 10:09 ` [dpdk-dev] [PATCH v7 1/9] eal/bus: introduce bus abstraction Shreyansh Jain
2017-01-17 10:09 ` [dpdk-dev] [PATCH v7 2/9] test: add basic bus infrastructure tests Shreyansh Jain
2017-01-17 10:09 ` [dpdk-dev] [PATCH v7 3/9] pci: split match and probe function Shreyansh Jain
2017-01-17 10:09 ` [dpdk-dev] [PATCH v7 4/9] eal/bus: support for scanning of bus Shreyansh Jain
2017-01-17 10:09 ` [dpdk-dev] [PATCH v7 5/9] eal/bus: introduce support for bus probing Shreyansh Jain
2017-01-17 10:09 ` [dpdk-dev] [PATCH v7 6/9] eal: integrate bus scan and probe with EAL Shreyansh Jain
2017-01-17 10:09 ` [dpdk-dev] [PATCH v7 7/9] test: update bus and pci unit test cases Shreyansh Jain
2017-01-17 10:09 ` [dpdk-dev] [PATCH v7 8/9] eal: enable PCI bus Shreyansh Jain
2017-01-17 10:09 ` [dpdk-dev] [PATCH v7 9/9] eal: enable hotplugging of devices on bus Shreyansh Jain
2017-01-17 10:47 ` Ferruh Yigit
2017-01-17 11:04 ` Shreyansh Jain
2017-01-17 13:40 ` Shreyansh Jain
2017-01-17 10:50 ` [dpdk-dev] [PATCH v7 0/9] Introducing EAL Bus-Device-Driver Model Ferruh Yigit
2017-01-17 13:37 ` [dpdk-dev] [PATCH v8 " Shreyansh Jain
2017-01-17 13:37 ` [dpdk-dev] [PATCH v8 1/9] eal/bus: introduce bus abstraction Shreyansh Jain
2017-01-17 23:19 ` Thomas Monjalon
2017-01-18 5:12 ` Shreyansh Jain
2017-01-17 13:37 ` [dpdk-dev] [PATCH v8 2/9] test: add basic bus infrastructure tests Shreyansh Jain
2017-01-17 23:23 ` Thomas Monjalon
2017-01-18 5:13 ` Shreyansh Jain
2017-01-18 6:56 ` Shreyansh Jain
2017-01-18 7:28 ` Thomas Monjalon
2017-01-18 8:42 ` Shreyansh Jain
2017-01-17 13:37 ` [dpdk-dev] [PATCH v8 3/9] pci: split match and probe function Shreyansh Jain
2017-01-17 23:31 ` Thomas Monjalon
2017-01-18 6:17 ` Shreyansh Jain
2017-01-18 7:31 ` Thomas Monjalon
2017-01-17 13:37 ` [dpdk-dev] [PATCH v8 4/9] eal/bus: support for scanning of bus Shreyansh Jain
2017-01-17 23:37 ` Thomas Monjalon
2017-01-18 5:15 ` Shreyansh Jain
2017-01-18 7:32 ` Thomas Monjalon
2017-01-17 13:37 ` [dpdk-dev] [PATCH v8 5/9] eal/bus: introduce support for bus probing Shreyansh Jain
2017-01-17 23:38 ` Thomas Monjalon
2017-01-17 13:37 ` [dpdk-dev] [PATCH v8 6/9] eal: integrate bus scan and probe with EAL Shreyansh Jain
2017-01-17 23:44 ` Thomas Monjalon
2017-01-17 13:37 ` [dpdk-dev] [PATCH v8 7/9] test: update bus and pci unit test cases Shreyansh Jain
2017-01-17 23:46 ` Thomas Monjalon
2017-01-17 13:37 ` [dpdk-dev] [PATCH v8 8/9] eal: enable PCI bus Shreyansh Jain
2017-01-17 23:57 ` Thomas Monjalon
2017-01-17 13:37 ` [dpdk-dev] [PATCH v8 9/9] eal: enable hotplugging of devices on bus Shreyansh Jain
2017-01-17 15:17 ` Ferruh Yigit
2017-01-18 10:37 ` [dpdk-dev] [PATCH v9 00/12] Introducing EAL Bus-Device-Driver Model Shreyansh Jain
2017-01-18 10:37 ` [dpdk-dev] [PATCH v9 01/12] eal/bus: introduce bus abstraction Shreyansh Jain
2017-01-18 10:46 ` Thomas Monjalon
2017-01-18 10:52 ` Shreyansh Jain
2017-01-18 10:37 ` [dpdk-dev] [PATCH v9 02/12] test: add basic bus infrastructure tests Shreyansh Jain
2017-01-18 10:37 ` [dpdk-dev] [PATCH v9 03/12] pci: split match and probe function Shreyansh Jain
2017-01-18 10:37 ` [dpdk-dev] [PATCH v9 04/12] eal: remove loop over drivers in device detach Shreyansh Jain
2017-01-18 10:41 ` Shreyansh Jain
2017-01-18 11:12 ` Thomas Monjalon
2017-01-18 12:15 ` Shreyansh Jain
2017-01-18 10:37 ` [dpdk-dev] [PATCH v9 05/12] eal/bus: support for scanning of bus Shreyansh Jain
2017-01-18 10:37 ` [dpdk-dev] [PATCH v9 06/12] eal/bus: introduce support for bus probing Shreyansh Jain
2017-01-18 10:37 ` [dpdk-dev] [PATCH v9 07/12] eal: integrate bus scan and probe with EAL Shreyansh Jain
2017-01-18 10:37 ` [dpdk-dev] [PATCH v9 08/12] eal/pci: add support for PCI bus Shreyansh Jain
2017-01-18 10:37 ` [dpdk-dev] [PATCH v9 09/12] test: add test cases for scan and probe on BUS Shreyansh Jain
2017-01-18 10:37 ` [dpdk-dev] [PATCH v9 10/12] test: add Bus based scan and probe test cases for PCI Shreyansh Jain
2017-01-18 10:37 ` [dpdk-dev] [PATCH v9 11/12] eal: enable PCI bus Shreyansh Jain
2017-01-18 10:38 ` [dpdk-dev] [PATCH v9 12/12] eal: enable hotplugging of devices on bus Shreyansh Jain
2017-01-18 11:10 ` [dpdk-dev] [PATCH v9 00/12] Introducing EAL Bus-Device-Driver Model Thomas Monjalon
2017-01-18 14:05 ` [dpdk-dev] [PATCH v10 00/13] " Shreyansh Jain
2017-01-18 14:05 ` [dpdk-dev] [PATCH v10 01/13] eal/bus: introduce bus abstraction Shreyansh Jain
2017-01-18 14:05 ` [dpdk-dev] [PATCH v10 02/13] test: add basic bus infrastructure tests Shreyansh Jain
2017-01-18 14:05 ` [dpdk-dev] [PATCH v10 03/13] pci: split match and probe function Shreyansh Jain
2017-01-18 14:05 ` [dpdk-dev] [PATCH v10 04/13] eal: remove loop over drivers in device detach Shreyansh Jain
2017-01-18 14:05 ` [dpdk-dev] [PATCH v10 05/13] eal/bus: support for scanning of bus Shreyansh Jain
2017-01-18 14:05 ` [dpdk-dev] [PATCH v10 06/13] eal/bus: introduce support for bus probing Shreyansh Jain
2017-01-18 14:05 ` [dpdk-dev] [PATCH v10 07/13] eal: integrate bus scan and probe with EAL Shreyansh Jain
2017-01-18 14:05 ` [dpdk-dev] [PATCH v10 08/13] eal/pci: add support for PCI bus Shreyansh Jain
2017-01-18 14:05 ` [dpdk-dev] [PATCH v10 09/13] test: add test cases for scan and probe on BUS Shreyansh Jain
2017-01-18 14:05 ` [dpdk-dev] [PATCH v10 10/13] test: add Bus based scan and probe test cases for PCI Shreyansh Jain
2017-01-18 14:05 ` [dpdk-dev] [PATCH v10 11/13] eal: enable PCI bus Shreyansh Jain
2017-01-18 14:05 ` [dpdk-dev] [PATCH v10 12/13] eal: enable hotplugging of devices on bus Shreyansh Jain
2017-01-18 14:05 ` [dpdk-dev] [PATCH v10 13/13] doc: remove deprecation notice for rte_bus Shreyansh Jain
2017-01-19 4:45 ` [dpdk-dev] [PATCH v11 00/13] rte_bus + rte_pci_bus Thomas Monjalon
2017-01-19 4:45 ` [dpdk-dev] [PATCH v11 01/13] bus: introduce bus abstraction Thomas Monjalon
2017-01-19 4:45 ` [dpdk-dev] [PATCH v11 02/13] bus: add scanning Thomas Monjalon
2017-01-19 4:45 ` [dpdk-dev] [PATCH v11 03/13] bus: add probing Thomas Monjalon
2017-01-19 4:45 ` [dpdk-dev] [PATCH v11 04/13] app/test: check bus registration Thomas Monjalon
2017-01-19 4:45 ` [dpdk-dev] [PATCH v11 05/13] app/test: check bus scan Thomas Monjalon
2017-01-19 4:45 ` Thomas Monjalon [this message]
2017-01-19 4:45 ` [dpdk-dev] [PATCH v11 07/13] pci: split match and probe Thomas Monjalon
2017-02-15 10:45 ` Jan Blunck
2017-02-15 11:22 ` Thomas Monjalon
2017-02-15 11:52 ` Shreyansh Jain
2017-02-15 11:30 ` Shreyansh Jain
2017-01-19 4:45 ` [dpdk-dev] [PATCH v11 08/13] pci: remove loop over drivers in device detach Thomas Monjalon
2017-01-19 4:45 ` [dpdk-dev] [PATCH v11 09/13] pci: add bus driver Thomas Monjalon
2017-02-15 10:42 ` Jan Blunck
2017-02-15 11:20 ` Thomas Monjalon
2017-01-19 4:45 ` [dpdk-dev] [PATCH v11 10/13] app/test: add PCI " Thomas Monjalon
2017-01-19 4:45 ` [dpdk-dev] [PATCH v11 11/13] pci: use bus driver for scan/probe Thomas Monjalon
2017-01-19 4:45 ` [dpdk-dev] [PATCH v11 12/13] pci: use bus driver for attach/detach Thomas Monjalon
2017-02-15 11:08 ` Jan Blunck
2017-02-15 11:26 ` Thomas Monjalon
2017-02-15 11:39 ` Jan Blunck
2017-02-15 14:04 ` [dpdk-dev] [RFC] eal: use busname and devargs to attach devices Jan Blunck
2017-01-19 4:45 ` [dpdk-dev] [PATCH v11 13/13] doc: remove deprecation notice for rte_bus Thomas Monjalon
2017-01-19 17:40 ` Mcnamara, John
2017-01-19 4:50 ` [dpdk-dev] [PATCH v11 00/13] rte_bus + rte_pci_bus Thomas Monjalon
2017-04-07 15:28 ` [dpdk-dev] [PATCH v12 0/5] rte_bus_pci Gaetan Rivet
2017-04-07 15:28 ` [dpdk-dev] [PATCH v12 1/5] pci: split match and probe Gaetan Rivet
2017-04-07 15:28 ` [dpdk-dev] [PATCH v12 2/5] pci: remove loop over drivers in device detach Gaetan Rivet
2017-04-07 15:28 ` [dpdk-dev] [PATCH v12 3/5] pci: add bus driver Gaetan Rivet
2017-04-07 15:28 ` [dpdk-dev] [PATCH v12 4/5] pci: use bus driver for scan/probe Gaetan Rivet
2017-04-07 15:28 ` [dpdk-dev] [PATCH v12 5/5] test: remove pci tests Gaetan Rivet
2017-04-11 11:07 ` [dpdk-dev] [PATCH v13 0/7] rte_bus_pci Gaetan Rivet
2017-04-11 11:07 ` [dpdk-dev] [PATCH v13 1/7] test: remove pci tests Gaetan Rivet
2017-04-11 11:07 ` [dpdk-dev] [PATCH v13 2/7] pci: split match and probe Gaetan Rivet
2017-04-11 11:07 ` [dpdk-dev] [PATCH v13 3/7] pci: remove loop over drivers in device detach Gaetan Rivet
2017-04-11 11:07 ` [dpdk-dev] [PATCH v13 4/7] pci: add bus driver Gaetan Rivet
2017-04-11 11:07 ` [dpdk-dev] [PATCH v13 5/7] pci: use bus driver for scan/probe Gaetan Rivet
2017-04-11 11:07 ` [dpdk-dev] [PATCH v13 6/7] pci: use bus driver for attach/detach Gaetan Rivet
2017-04-14 8:43 ` Thomas Monjalon
2017-04-11 11:07 ` [dpdk-dev] [PATCH v13 7/7] doc: remove deprecation notice for rte_bus Gaetan Rivet
2017-04-11 11:32 ` Shreyansh Jain
2017-04-11 11:54 ` Gaëtan Rivet
2017-04-12 16:09 ` [dpdk-dev] [PATCH v13 0/7] rte_bus_pci Stephen Hemminger
2017-04-14 12:16 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1484801117-779-7-git-send-email-thomas.monjalon@6wind.com \
--to=thomas.monjalon@6wind.com \
--cc=dev@dpdk.org \
--cc=shreyansh.jain@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).