From: Declan Doherty <declan.doherty@intel.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v4 3/6] EAL support for link bonding device initialization
Date: Mon, 16 Jun 2014 12:18:30 +0100 [thread overview]
Message-ID: <1402917513-19495-4-git-send-email-declan.doherty@intel.com> (raw)
In-Reply-To: <cover.1402662300.git.declan.doherty@intel.com>
Updating functionality in EAL to support adding link bonding
devices via –vdev option. Link bonding devices will be
initialized after all physical devices have been probed and
initialized.
Signed-off-by: Declan Doherty <declan.doherty@intel.com>
---
lib/librte_eal/common/eal_common_dev.c | 66 +++++++++++++++++++++++++--
lib/librte_eal/common/eal_common_pci.c | 6 +++
lib/librte_eal/common/include/eal_private.h | 7 +++
lib/librte_eal/common/include/rte_dev.h | 1 +
4 files changed, 76 insertions(+), 4 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/common/eal_common_dev.c
index eae5656..b50c908 100644
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -75,14 +75,28 @@ rte_eal_dev_init(void)
/* call the init function for each virtual device */
TAILQ_FOREACH(devargs, &devargs_list, next) {
+ uint8_t bdev = 0;
if (devargs->type != RTE_DEVTYPE_VIRTUAL)
continue;
TAILQ_FOREACH(driver, &dev_driver_list, next) {
- if (driver->type != PMD_VDEV)
+ /* RTE_DEVTYPE_VIRTUAL can only be a virtual or bonded device*/
+ if (driver->type != PMD_VDEV && driver->type != PMD_BDEV)
continue;
+ /*
+ * Bonded devices are not initialize here, we do it later in
+ * rte_eal_bonded_dev_init() after all physical devices have been
+ * probed and initialized
+ */
+ if (driver->type == PMD_BDEV &&
+ !strncmp(driver->name, devargs->virtual.drv_name,
+ strlen(driver->name))) {
+ bdev = 1;
+ break;
+ }
+
/* search a driver prefix in virtual device name */
if (!strncmp(driver->name, devargs->virtual.drv_name,
strlen(driver->name))) {
@@ -92,9 +106,9 @@ rte_eal_dev_init(void)
}
}
- if (driver == NULL) {
- rte_panic("no driver found for %s\n",
- devargs->virtual.drv_name);
+ if (driver == NULL && !bdev) {
+ rte_panic("no driver found for %s and is not a bonded vdev %d\n",
+ devargs->virtual.drv_name, bdev);
}
}
@@ -107,3 +121,47 @@ rte_eal_dev_init(void)
}
return 0;
}
+
+#ifdef RTE_LIBRTE_PMD_BOND
+int
+rte_eal_bonded_dev_init(void)
+{
+ struct rte_devargs *devargs;
+ struct rte_driver *driver;
+
+ TAILQ_FOREACH(devargs, &devargs_list, next) {
+ int vdev = 0;
+
+ if (devargs->type != RTE_DEVTYPE_VIRTUAL)
+ continue;
+
+ TAILQ_FOREACH(driver, &dev_driver_list, next) {
+ if (driver->type != PMD_VDEV && driver->type != PMD_BDEV)
+ continue;
+
+ /* Virtual devices have already been initialized so we skip them
+ * here*/
+ if (driver->type == PMD_VDEV &&
+ !strncmp(driver->name, devargs->virtual.drv_name,
+ strlen(driver->name))) {
+ vdev = 1;
+ break;
+ }
+
+ /* search a driver prefix in bonded device name */
+ if (!strncmp(driver->name, devargs->virtual.drv_name,
+ strlen(driver->name))) {
+ driver->init(devargs->virtual.drv_name, devargs->args);
+ break;
+ }
+ }
+
+ if (driver == NULL && !vdev) {
+ rte_panic("no driver found for %s\n",
+ devargs->virtual.drv_name);
+ }
+ }
+ return 0;
+}
+#endif
+
diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c
index 4d877ea..9b584f5 100644
--- a/lib/librte_eal/common/eal_common_pci.c
+++ b/lib/librte_eal/common/eal_common_pci.c
@@ -166,7 +166,13 @@ rte_eal_pci_probe(void)
dev->addr.devid, dev->addr.function);
}
+#ifdef RTE_LIBRTE_PMD_BOND
+ /* After all physical PCI devices have been probed and initialized then we
+ * initialize the bonded devices */
+ return rte_eal_bonded_dev_init();
+#else
return 0;
+#endif
}
/* dump one device */
diff --git a/lib/librte_eal/common/include/eal_private.h b/lib/librte_eal/common/include/eal_private.h
index 232fcec..f6081bb 100644
--- a/lib/librte_eal/common/include/eal_private.h
+++ b/lib/librte_eal/common/include/eal_private.h
@@ -203,4 +203,11 @@ int rte_eal_alarm_init(void);
*/
int rte_eal_dev_init(void);
+#ifdef RTE_LIBRTE_PMD_BOND
+/**
+ * Initialize the bonded devices
+ */
+int rte_eal_bonded_dev_init(void);
+#endif
+
#endif /* _EAL_PRIVATE_H_ */
diff --git a/lib/librte_eal/common/include/rte_dev.h b/lib/librte_eal/common/include/rte_dev.h
index f7e3a10..f0a780a 100644
--- a/lib/librte_eal/common/include/rte_dev.h
+++ b/lib/librte_eal/common/include/rte_dev.h
@@ -62,6 +62,7 @@ typedef int (rte_dev_init_t)(const char *name, const char *args);
enum pmd_type {
PMD_VDEV = 0,
PMD_PDEV = 1,
+ PMD_BDEV = 2, /**< Poll Mode Driver Bonded Device*/
};
/**
--
1.7.0.7
next prev parent reply other threads:[~2014-06-16 11:18 UTC|newest]
Thread overview: 127+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-28 15:32 [dpdk-dev] [PATCH 0/4] Link Bonding Library declan.doherty
2014-05-28 15:32 ` [dpdk-dev] [PATCH 1/4] " declan.doherty
2014-05-28 16:54 ` Shaw, Jeffrey B
2014-05-29 13:32 ` Doherty, Declan
2014-05-28 15:32 ` [dpdk-dev] [PATCH 2/4] Link bonding unit tests declan.doherty
2014-05-28 15:32 ` [dpdk-dev] [PATCH 3/4] Link bonding integration into testpmd declan.doherty
2014-05-28 15:32 ` [dpdk-dev] [PATCH 4/4] Add Link Bonding Library to Doxygen declan.doherty
2014-05-28 17:49 ` [dpdk-dev] [PATCH 0/4] Link Bonding Library Neil Horman
2014-05-29 10:33 ` Doherty, Declan
2014-05-29 11:33 ` Neil Horman
2014-05-29 3:23 ` Cao, Waterman
2014-05-29 10:35 ` Doherty, Declan
2014-06-04 15:18 ` [dpdk-dev] [PATCH v2 " declan.doherty
2014-06-04 15:18 ` [dpdk-dev] [PATCH v2 1/4] " declan.doherty
2014-06-04 15:18 ` declan.doherty
2014-06-05 15:15 ` Stephen Hemminger
2014-06-06 9:07 ` Doherty, Declan
2014-06-06 15:13 ` Stephen Hemminger
2014-06-09 21:11 ` Eric Kinzie
2014-06-13 14:03 ` Doherty, Declan
2014-06-04 15:18 ` [dpdk-dev] [PATCH v2 2/4] Link bonding unit tests, including: - code to generate packet bursts for testing rx and tx functionality of bonded device - virtual/stubbed out ethdev for use as slave ethdev in testing - checkpack fixes declan.doherty
2014-06-04 15:18 ` declan.doherty
2014-06-04 15:18 ` [dpdk-dev] [PATCH v2 0/4] Link Bonding Library declan.doherty
2014-06-04 15:18 ` [dpdk-dev] [PATCH v2 3/4] Adding link bonding support to testpmd. - Includes the ability to create new bonded devices. - Add /remove bonding slave devices. - Interogate bonded device stats/configuration - Change bonding modes and select balance transmit polices declan.doherty
2014-06-04 15:18 ` [dpdk-dev] [PATCH v2 4/4] Add Link Bonding Library to Doxygen declan.doherty
2014-06-04 16:10 ` [dpdk-dev] [PATCH v2 0/4] Link Bonding Library Doherty, Declan
2014-06-05 8:03 ` De Lara Guarch, Pablo
2014-06-05 11:03 ` Neil Horman
2014-06-06 8:23 ` Doherty, Declan
2014-06-06 14:54 ` Neil Horman
2014-06-13 14:56 ` Doherty, Declan
2014-06-13 15:11 ` Neil Horman
2014-06-06 3:26 ` Cao, Waterman
2014-06-11 16:33 ` Thomas Monjalon
2014-06-13 14:08 ` Doherty, Declan
2014-06-13 15:15 ` Thomas Monjalon
2014-06-13 14:41 ` [dpdk-dev] [PATCH v3 0/5] Link Bonding PMD Library Declan Doherty
2014-06-13 14:41 ` [dpdk-dev] [PATCH v3 1/5] " Declan Doherty
2014-06-13 14:41 ` [dpdk-dev] [PATCH v3 2/5] Link Bonding PMD Library (librte_eal/librte_ether link bonding support changes) Declan Doherty
2014-06-13 16:08 ` Neil Horman
2014-06-13 18:34 ` Doherty, Declan
2014-06-13 19:38 ` Neil Horman
2014-06-16 8:59 ` Doherty, Declan
2014-06-16 11:07 ` Neil Horman
2014-06-16 16:17 ` Richardson, Bruce
2014-06-16 17:47 ` Neil Horman
2014-06-16 18:07 ` Richardson, Bruce
2014-06-16 18:09 ` Thomas Monjalon
2014-06-13 21:59 ` Stephen Hemminger
2014-06-16 7:59 ` Doherty, Declan
2014-06-13 14:42 ` [dpdk-dev] [PATCH v3 3/5] Link Bonding PMD Library (Unit Test Suite) Declan Doherty
2014-06-13 14:42 ` [dpdk-dev] [PATCH v3 4/5] Link Bonding PMD Library (testpmd link bonding API support) Declan Doherty
2014-06-13 14:42 ` [dpdk-dev] [PATCH v3 5/5] Link Bonding PMD Library (Doxygen Additions) Declan Doherty
2014-06-13 15:20 ` [dpdk-dev] [PATCH v3 0/5] Link Bonding PMD Library Neil Horman
2014-06-16 11:18 ` [dpdk-dev] [PATCH v4 0/6] Link Bonding Library Declan Doherty
2014-06-18 16:14 ` [dpdk-dev] [PATCH v5 " Declan Doherty
2014-06-18 16:18 ` Neil Horman
2014-06-24 14:52 ` [dpdk-dev] [PATCH v6 " Declan Doherty
2014-06-24 16:03 ` [dpdk-dev] [PATCH v7 " Declan Doherty
2014-06-25 20:07 ` [dpdk-dev] [PATCH v8 " Declan Doherty
2014-06-26 16:02 ` De Lara Guarch, Pablo
2014-06-26 23:57 ` [dpdk-dev] [PATCH v9 0/5] link bonding Thomas Monjalon
2014-06-26 23:57 ` [dpdk-dev] [PATCH v9 1/5] bond: new link bonding library Thomas Monjalon
2014-06-27 0:45 ` Thomas Monjalon
2014-06-26 23:57 ` [dpdk-dev] [PATCH v9 2/5] ethdev: add unique name to devices Thomas Monjalon
2014-06-26 23:57 ` [dpdk-dev] [PATCH v9 3/5] eal: support link bonding device initialization Thomas Monjalon
2014-06-26 23:57 ` [dpdk-dev] [PATCH v9 4/5] bond: unit tests Thomas Monjalon
2014-06-26 23:57 ` [dpdk-dev] [PATCH v9 5/5] bond: testpmd support Thomas Monjalon
2014-06-27 10:18 ` [dpdk-dev] [PATCH v10 0/5] link bonding Declan Doherty
2014-06-27 20:58 ` Thomas Monjalon
2014-06-29 17:49 ` [dpdk-dev] [PATCH v11 0/5] link bonding library Declan Doherty
2014-06-30 9:21 ` Thomas Monjalon
2014-06-30 9:28 ` Doherty, Declan
2014-07-01 22:01 ` Thomas Monjalon
2014-06-29 17:49 ` [dpdk-dev] [PATCH v11 1/5] bond: new " Declan Doherty
2014-06-30 9:13 ` Thomas Monjalon
2014-06-30 22:29 ` Robert Sanford
2014-07-01 14:16 ` Thomas Monjalon
2014-07-01 14:19 ` Doherty, Declan
2014-07-01 14:26 ` Thomas Monjalon
2014-06-29 17:49 ` [dpdk-dev] [PATCH v11 2/5] ethdev: add unique name to devices Declan Doherty
2014-06-29 17:49 ` [dpdk-dev] [PATCH v11 3/5] eal: support link bonding device initialization Declan Doherty
2014-06-29 17:49 ` [dpdk-dev] [PATCH v11 4/5] bond: unit tests Declan Doherty
2014-06-30 8:56 ` Thomas Monjalon
2014-06-29 17:49 ` [dpdk-dev] [PATCH v11 5/5] bond: testpmd support Declan Doherty
2014-06-27 10:18 ` [dpdk-dev] [PATCH v10 1/5] bond: new link bonding library Declan Doherty
2014-06-27 10:18 ` [dpdk-dev] [PATCH v10 2/5] ethdev: add unique name to devices Declan Doherty
2014-06-27 10:18 ` [dpdk-dev] [PATCH v10 3/5] eal: support link bonding device initialization Declan Doherty
2014-06-27 10:18 ` [dpdk-dev] [PATCH v10 4/5] bond: unit tests Declan Doherty
2014-06-27 10:18 ` [dpdk-dev] [PATCH v10 5/5] bond: testpmd support Declan Doherty
2014-06-25 20:07 ` [dpdk-dev] [PATCH v8 1/6] Link Bonding Library (lib/librte_pmd_bond) Declan Doherty
2014-06-25 20:07 ` [dpdk-dev] [PATCH v8 2/6] Support for unique interface naming of pmds Declan Doherty
2014-06-25 20:07 ` [dpdk-dev] [PATCH v8 3/6] EAL support for link bonding device initialization Declan Doherty
2014-06-25 20:07 ` [dpdk-dev] [PATCH v8 4/6] Link bonding Unit Tests Declan Doherty
2014-06-25 20:07 ` [dpdk-dev] [PATCH v8 5/6] testpmd link bonding additions Declan Doherty
2014-06-25 20:07 ` [dpdk-dev] [PATCH v8 6/6] Link Bonding Library doxygen additions Declan Doherty
2014-06-24 16:03 ` [dpdk-dev] [PATCH v7 1/6] Link Bonding Library (lib/librte_pmd_bond) Declan Doherty
2014-06-24 16:03 ` [dpdk-dev] [PATCH v7 2/6] Support for unique interface naming of pmds Declan Doherty
2014-06-24 16:03 ` [dpdk-dev] [PATCH v7 3/6] EAL support for link bonding device initialization Declan Doherty
2014-06-25 13:54 ` Thomas Monjalon
2014-06-25 14:41 ` Doherty, Declan
2014-06-25 16:00 ` Thomas Monjalon
2014-06-25 16:15 ` Richardson, Bruce
2014-06-24 16:03 ` [dpdk-dev] [PATCH v7 4/6] Link bonding Unit Tests Declan Doherty
2014-06-24 16:03 ` [dpdk-dev] [PATCH v7 5/6] testpmd link bonding additions Declan Doherty
2014-06-24 16:03 ` [dpdk-dev] [PATCH v7 6/6] Link Bonding Library doxygen additions Declan Doherty
2014-06-25 13:43 ` Thomas Monjalon
2014-06-25 14:19 ` Doherty, Declan
2014-06-25 14:23 ` Thomas Monjalon
2014-06-24 14:52 ` [dpdk-dev] [PATCH v6 1/6] Link Bonding Library (lib/librte_pmd_bond) Declan Doherty
2014-06-24 14:52 ` [dpdk-dev] [PATCH v6 2/6] Support for unique interface naming of pmds Declan Doherty
2014-06-24 14:52 ` [dpdk-dev] [PATCH v6 3/6] EAL support for link bonding device initialization Declan Doherty
2014-06-24 14:52 ` [dpdk-dev] [PATCH v6 4/6] Link bonding Unit Tests Declan Doherty
2014-06-24 14:52 ` [dpdk-dev] [PATCH v6 5/6] testpmd link bonding additions Declan Doherty
2014-06-24 14:52 ` [dpdk-dev] [PATCH v6 6/6] Link Bonding Library doxygen additions Declan Doherty
2014-06-18 16:14 ` [dpdk-dev] [PATCH v5 1/6] Link Bonding Library (lib/librte_pmd_bond) Declan Doherty
2014-06-18 16:14 ` [dpdk-dev] [PATCH v5 2/6] Support for unique interface naming of pmds Declan Doherty
2014-06-18 16:14 ` [dpdk-dev] [PATCH v5 3/6] EAL support for link bonding device initialization Declan Doherty
2014-06-18 16:14 ` [dpdk-dev] [PATCH v5 4/6] Link bonding Unit Tests Declan Doherty
2014-06-18 16:14 ` [dpdk-dev] [PATCH v5 5/6] testpmd link bonding additions Declan Doherty
2014-06-18 16:14 ` [dpdk-dev] [PATCH v5 6/6] Link Bonding Library doxygen additions Declan Doherty
2014-06-16 11:18 ` [dpdk-dev] [PATCH v4 1/6] Link Bonding Library (lib/librte_pmd_bond) initial release with support for Mode 0 - Round Robin Mode 1 - Active Backup Mode 2 - Balance -> Supports 3 transmit polices (layer 2, layer 2+3, la Mode 3 - Broadcast Declan Doherty
2014-06-16 11:18 ` [dpdk-dev] [PATCH v4 2/6] Support for unique interface naming of pmds Declan Doherty
2014-06-16 11:18 ` Declan Doherty [this message]
2014-06-16 11:18 ` [dpdk-dev] [PATCH v4 4/6] Link bonding Unit Tests Declan Doherty
2014-06-16 11:18 ` [dpdk-dev] [PATCH v4 5/6] testpmd link bonding additions Declan Doherty
2014-06-16 11:18 ` [dpdk-dev] [PATCH v4 6/6] Link Bonding Library doxygen additions Declan Doherty
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=1402917513-19495-4-git-send-email-declan.doherty@intel.com \
--to=declan.doherty@intel.com \
--cc=dev@dpdk.org \
/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).