From mboxrd@z Thu Jan 1 00:00:00 1970 From: Declan Doherty Subject: [PATCH v10 3/5] eal: support link bonding device initialization Date: Fri, 27 Jun 2014 11:18:42 +0100 Message-ID: <1403864324-12022-4-git-send-email-declan.doherty@intel.com> References: <1403827075-9192-1-git-send-email-thomas.monjalon@6wind.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable To: dev-VfR2kkLFssw@public.gmane.org Return-path: In-Reply-To: <1403827075-9192-1-git-send-email-thomas.monjalon-pdR9zngts4EAvxtiuMwx3w@public.gmane.org> List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces-VfR2kkLFssw@public.gmane.org Sender: "dev" Updating functionality in EAL to support adding link bonding devices via =E2=80=93vdev option. Link bonding devices will be initialized after all physical devices have been probed and initialized. Signed-off-by: Declan Doherty Acked-by: Pablo de Lara --- lib/librte_eal/bsdapp/eal/eal.c | 10 ++++- lib/librte_eal/common/eal_common_dev.c | 58 ++++++++++++++++++---= ----- lib/librte_eal/common/eal_common_pci.c | 3 + lib/librte_eal/common/include/eal_private.h | 7 --- lib/librte_eal/common/include/rte_dev.h | 14 ++++++- lib/librte_eal/linuxapp/eal/eal.c | 11 +++++- 6 files changed, 74 insertions(+), 29 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/= eal.c index a1f014f..c53f63e 100644 --- a/lib/librte_eal/bsdapp/eal/eal.c +++ b/lib/librte_eal/bsdapp/eal/eal.c @@ -874,7 +874,7 @@ rte_eal_init(int argc, char **argv) =20 rte_eal_mcfg_complete(); =20 - if (rte_eal_dev_init() < 0) + if (rte_eal_dev_init(PMD_INIT_PRE_PCI_PROBE) < 0) rte_panic("Cannot init pmd devices\n"); =20 RTE_LCORE_FOREACH_SLAVE(i) { @@ -906,6 +906,14 @@ rte_eal_init(int argc, char **argv) rte_eal_mp_remote_launch(sync_func, NULL, SKIP_MASTER); rte_eal_mp_wait_lcore(); =20 + /* Probe & Initialize PCI devices */ + if (rte_eal_pci_probe()) + rte_panic("Cannot probe PCI\n"); + + /* Initialize any outstanding devices */ + if (rte_eal_dev_init(PMD_INIT_POST_PCI_PROBE) < 0) + rte_panic("Cannot init pmd devices\n"); + return fctret; } =20 diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/comm= on/eal_common_dev.c index eae5656..1194419 100644 --- a/lib/librte_eal/common/eal_common_dev.c +++ b/lib/librte_eal/common/eal_common_dev.c @@ -62,7 +62,7 @@ rte_eal_driver_unregister(struct rte_driver *driver) } =20 int -rte_eal_dev_init(void) +rte_eal_dev_init(uint8_t init_pri) { struct rte_devargs *devargs; struct rte_driver *driver; @@ -80,30 +80,52 @@ rte_eal_dev_init(void) continue; =20 TAILQ_FOREACH(driver, &dev_driver_list, next) { - if (driver->type !=3D PMD_VDEV) - continue; + /* RTE_DEVTYPE_VIRTUAL can only be a virtual or bonded device, + * virtual devices are initialized pre PCI probing and bonded + * device are post pci probing */ + if ((driver->type =3D=3D PMD_VDEV && init_pri =3D=3D + PMD_INIT_PRE_PCI_PROBE) || + (driver->type =3D=3D PMD_BDEV && init_pri =3D=3D + PMD_INIT_POST_PCI_PROBE)) { =20 - /* search a driver prefix in virtual device name */ - if (!strncmp(driver->name, devargs->virtual.drv_name, - strlen(driver->name))) { - driver->init(devargs->virtual.drv_name, - devargs->args); - break; + /* search a driver prefix in virtual device name */ + if (!strncmp(driver->name, devargs->virtual.drv_name, + strlen(driver->name))) { + printf("init (%u) %s\n", init_pri, devargs->virtual.drv_name); + driver->init(devargs->virtual.drv_name, + devargs->args); + break; + } } } =20 - if (driver =3D=3D NULL) { - rte_panic("no driver found for %s\n", - devargs->virtual.drv_name); + /* If initializing pre PCI probe, then we don't expect a bonded driver + * to be found */ + if (init_pri =3D=3D PMD_INIT_PRE_PCI_PROBE && + strncmp(PMD_BOND_NAME, devargs->virtual.drv_name, + strlen(PMD_BOND_NAME)) !=3D 0) { + if (driver =3D=3D NULL) { + rte_panic("no driver found for virtual device %s\n", + devargs->virtual.drv_name); + } + } else if (init_pri =3D=3D PMD_INIT_POST_PCI_PROBE && + strncmp(PMD_BOND_NAME, devargs->virtual.drv_name, + strlen(PMD_BOND_NAME)) =3D=3D 0) { + if (driver =3D=3D NULL) { + rte_panic("no driver found for bonded device %s\n", + devargs->virtual.drv_name); + } } } =20 - /* Once the vdevs are initalized, start calling all the pdev drivers */ - TAILQ_FOREACH(driver, &dev_driver_list, next) { - if (driver->type !=3D PMD_PDEV) - continue; - /* PDEV drivers don't get passed any parameters */ - driver->init(NULL, NULL); + /* Once the vdevs are initialized, start calling all the pdev drivers *= / + if (init_pri =3D=3D PMD_INIT_PRE_PCI_PROBE) { + TAILQ_FOREACH(driver, &dev_driver_list, next) { + if (driver->type !=3D PMD_PDEV) + continue; + /* PDEV drivers don't get passed any parameters */ + driver->init(NULL, NULL); + } } return 0; } diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/comm= on/eal_common_pci.c index af809a8..c637361 100644 --- a/lib/librte_eal/common/eal_common_pci.c +++ b/lib/librte_eal/common/eal_common_pci.c @@ -150,6 +150,9 @@ rte_eal_pci_probe(void) probe_all =3D 1; =20 TAILQ_FOREACH(dev, &pci_device_list, next) { + /* check if device has already been initialized */ + if (dev->driver !=3D NULL) + continue; =20 /* set devargs in PCI structure */ devargs =3D pci_devargs_lookup(dev); diff --git a/lib/librte_eal/common/include/eal_private.h b/lib/librte_eal= /common/include/eal_private.h index 232fcec..b440ffb 100644 --- a/lib/librte_eal/common/include/eal_private.h +++ b/lib/librte_eal/common/include/eal_private.h @@ -196,11 +196,4 @@ int rte_eal_intr_init(void); */ int rte_eal_alarm_init(void); =20 -/** - * This function initialises any virtual devices - * - * This function is private to the EAL. - */ -int rte_eal_dev_init(void); - #endif /* _EAL_PRIVATE_H_ */ diff --git a/lib/librte_eal/common/include/rte_dev.h b/lib/librte_eal/com= mon/include/rte_dev.h index f7e3a10..d89f1a5 100644 --- a/lib/librte_eal/common/include/rte_dev.h +++ b/lib/librte_eal/common/include/rte_dev.h @@ -62,6 +62,16 @@ typedef int (rte_dev_init_t)(const char *name, const c= har *args); enum pmd_type { PMD_VDEV =3D 0, PMD_PDEV =3D 1, + PMD_BDEV =3D 2, /**< Poll Mode Driver Bonded Device*/ +}; + +#define PMD_BOND_NAME "eth_bond" + +/** + * Driver initialization */ +enum pmd_init_priority { + PMD_INIT_PRE_PCI_PROBE =3D 0, + PMD_INIT_POST_PCI_PROBE =3D 1, }; =20 /** @@ -93,9 +103,9 @@ void rte_eal_driver_register(struct rte_driver *driver= ); void rte_eal_driver_unregister(struct rte_driver *driver); =20 /** - * Initalize all the registered drivers in this process + * Initialize all the registered drivers in this process */ -int rte_eal_dev_init(void); +int rte_eal_dev_init(uint8_t init_priority); =20 #define PMD_REGISTER_DRIVER(d)\ void devinitfn_ ##d(void);\ diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/= eal/eal.c index d204387..573fd06 100644 --- a/lib/librte_eal/linuxapp/eal/eal.c +++ b/lib/librte_eal/linuxapp/eal/eal.c @@ -75,6 +75,7 @@ #include #include #include +#include =20 #include "eal_private.h" #include "eal_thread.h" @@ -1097,7 +1098,7 @@ rte_eal_init(int argc, char **argv) RTE_LOG(DEBUG, EAL, "Master core %u is ready (tid=3D%x)\n", rte_config.master_lcore, (int)thread_id); =20 - if (rte_eal_dev_init() < 0) + if (rte_eal_dev_init(PMD_INIT_PRE_PCI_PROBE) < 0) rte_panic("Cannot init pmd devices\n"); =20 RTE_LCORE_FOREACH_SLAVE(i) { @@ -1127,6 +1128,14 @@ rte_eal_init(int argc, char **argv) rte_eal_mp_remote_launch(sync_func, NULL, SKIP_MASTER); rte_eal_mp_wait_lcore(); =20 + /* Probe & Initialize PCI devices */ + if (rte_eal_pci_probe()) + rte_panic("Cannot probe PCI\n"); + + /* Initialize any outstanding devices */ + if (rte_eal_dev_init(PMD_INIT_POST_PCI_PROBE) < 0) + rte_panic("Cannot init pmd devices\n"); + return fctret; } =20 --=20 1.7.0.7