Link Bonding Library
PATCH v8 3/6 EAL support for link bonding device initialization
In reply to a message not in the archiveUpdating 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.
--- 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 | 13 +++++- lib/librte_eal/linuxapp/eal/eal.c | 11 +++++- 6 files changed, 73 insertions(+), 29 deletions(-)
lib/librte_eal/bsdapp/eal/eal.c +9 -1
@@ -874,7 +874,7 @@ rte_eal_init(int argc, char **argv)rte_eal_mcfg_complete (); -if (rte_eal_dev_init () <0 ) +if (rte_eal_dev_init (PMD_INIT_PRE_PCI_PROBE ) <0 )rte_panic ("Cannot init pmd devices\n" );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 (); +/* 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; }
lib/librte_eal/common/eal_common_dev.c +40 -18
77 lines not on this page · raw message
lib/librte_eal/common/eal_common_pci.c +3 -0
@@ -150,6 +150,9 @@ rte_eal_pci_probe(void) probe_all =1 ; TAILQ_FOREACH(dev, &pci_device_list, next) { +/* check if device has already been initialized */ +if (dev->driver !=NULL ) +continue ;/* set devargs in PCI structure */ devargs =pci_devargs_lookup (dev);
lib/librte_eal/common/include/eal_private.h +0 -7
@@ -196,11 +196,4 @@ int rte_eal_intr_init(void);*/ int rte_eal_alarm_init (void ); -/** -* This function initialises any virtual devices -* -* This function is private to the EAL. -*/ -int rte_eal_dev_init (void ); -#endif /* _EAL_PRIVATE_H_ */
lib/librte_eal/common/include/rte_dev.h +11 -2
@@ -62,6 +62,15 @@ 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*/ +}; + +#define RTE_PMD_BOND ("eth_bond") +/** +* Driver initialization */ +enum pmd_init_priority { +PMD_INIT_PRE_PCI_PROBE =0 , +PMD_INIT_POST_PCI_PROBE =1 , };/**
@@ -93,9 +102,9 @@ void rte_eal_driver_register(struct rte_driver *driver);void rte_eal_driver_unregister (struct rte_driver *driver);/** -* 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);#define PMD_REGISTER_DRIVER (d)\ void devinitfn_ ##d(void);\
lib/librte_eal/linuxapp/eal/eal.c +10 -1
@@ -75,6 +75,7 @@#include <rte_atomic.h> #include <malloc_heap.h> #include <rte_eth_ring.h> +#include <rte_dev.h> #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=%x)\n" , rte_config.master_lcore, (int )thread_id); -if (rte_eal_dev_init () <0 ) +if (rte_eal_dev_init (PMD_INIT_PRE_PCI_PROBE ) <0 )rte_panic ("Cannot init pmd devices\n" );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 (); +/* 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; }
Signature · 1 line
1.7.0.7
PATCH v8 4/6 Link bonding Unit Tests
In reply to a message not in the archiveIncluding:
- 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
--- app/test/Makefile | 4 +- app/test/commands.c | 7 + app/test/packet_burst_generator.c | 287 +++ app/test/packet_burst_generator.h | 78 + app/test/test.h | 1 + app/test/test_link_bonding.c | 3958 +++++++++++++++++++++++++++++++++++++ app/test/virtual_pmd.c | 574 ++++++ app/test/virtual_pmd.h | 74 + 8 files changed, 4982 insertions(+), 1 deletions(-) create mode 100644 app/test/packet_burst_generator.c create mode 100644 app/test/packet_burst_generator.h create mode 100644 app/test/test_link_bonding.c create mode 100644 app/test/virtual_pmd.c create mode 100644 app/test/virtual_pmd.h
app/test/Makefile +3 -1
@@ -102,7 +102,9 @@ SRCS-$(CONFIG_RTE_APP_TEST) += test_ivshmem.c SRCS-$(CONFIG_RTE_APP_TEST) += test_distributor.c SRCS-$(CONFIG_RTE_APP_TEST) += test_distributor_perf.c SRCS-$(CONFIG_RTE_APP_TEST) += test_devargs.c - +SRCS-$(CONFIG_RTE_APP_TEST) += virtual_pmd.c +SRCS-$(CONFIG_RTE_APP_TEST) += packet_burst_generator.c +SRCS-$(CONFIG_RTE_APP_TEST) += test_link_bonding.c ifeq ($(CONFIG_RTE_APP_TEST),y) SRCS-$(CONFIG_RTE_LIBRTE_ACL) += test_acl.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_pmd_ring.c
app/test/commands.c +7 -0
@@ -159,6 +159,10 @@ static void cmd_autotest_parsed(void *parsed_result, ret =test_timer ();if (!strcmp (res->autotest,"timer_perf_autotest" )) ret =test_timer_perf (); +#ifdef RTE_LIBRTE_PMD_BOND +if (!strcmp (res->autotest,"link_bonding_autotest" )) + ret =test_link_bonding (); +#endif if (!strcmp (res->autotest,"mempool_autotest" )) ret =test_mempool ();if (!strcmp (res->autotest,"mempool_perf_autotest" ))
@@ -227,6 +231,9 @@ cmdline_parse_token_string_t cmd_autotest_autotest = "alarm_autotest#interrupt_autotest#" "version_autotest#eal_fs_autotest#" "cmdline_autotest#func_reentrancy_autotest#" +#ifdef RTE_LIBRTE_PMD_BOND + "link_bonding_autotest#" +#endif"mempool_perf_autotest#hash_perf_autotest#" "memcpy_perf_autotest#ring_perf_autotest#" "red_autotest#meter_autotest#sched_autotest#"
app/test/packet_burst_generator.c new file +287 -0
287 lines not on this page · raw message
app/test/packet_burst_generator.h new file +78 -0
78 lines not on this page · raw message
app/test/test.h +1 -0
@@ -97,6 +97,7 @@ int test_distributor(void);int test_distributor_perf (void );int test_kvargs (void );int test_devargs (void ); +int test_link_bonding (void );int test_pci_run;
app/test/test_link_bonding.c new file +3958 -0
2,599 lines not on this page · raw message
app/test/virtual_pmd.c new file +574 -0
574 lines not on this page · raw message
app/test/virtual_pmd.h new file +74 -0
74 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.7.0.7
Part of the diff is not shown here. View the raw message.
PATCH v8 5/6 testpmd link bonding additions
In reply to a message not in the archive - 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
--- app/test-pmd/cmdline.c | 579 +++++++++++++++++++++++++++++++++++++++++++++ app/test-pmd/config.c | 4 +- app/test-pmd/parameters.c | 3 + app/test-pmd/testpmd.c | 40 +++- app/test-pmd/testpmd.h | 2 + 5 files changed, 619 insertions(+), 9 deletions(-)
app/test-pmd/cmdline.c +579 -0
@@ -84,6 +84,9 @@#include <cmdline_socket.h> #include <cmdline.h> #include <rte_pci_dev_ids.h> +#ifdef RTE_LIBRTE_PMD_BOND +#include <rte_eth_bond.h> +#endif #include "testpmd.h"
@@ -404,6 +407,31 @@ static void cmd_help_long_parsed(void *parsed_result," Show the bypass configuration for a bypass enabled NIC" " using the lowest port on the NIC.\n\n"#endif +#ifdef RTE_LIBRTE_PMD_BOND +"create bonded device (mode) (socket)\n" +" Create a new bonded device with specific bonding mode and socket.\n\n" + +"add bonding slave (slave_id) (port_id)\n" +" Add a slave device to a bonded device.\n\n" + +"remove bonding slave (slave_id) (port_id)\n" +" Remove a slave device from a bonded device.\n\n" + +"set bonding mode (value) (port_id)\n" +" Set the bonding mode on a bonded device.\n\n" + +"set bonding primary (slave_id) (port_id)\n" +" Set the primary slave for a bonded device.\n\n" + +"show bonding config (port_id)\n" +" Show the bonding config for port_id.\n\n" + +"set bonding mac_addr (port_id) (address)\n" +" Set the MAC address of a bonded device.\n\n" + +"set bonding xmit_balance_policy (port_id) (l2|l23|l34)\n" +" Set the transmit balance policy for bonded device running in balance mode.\n\n" +#endif ,list_pkt_forwarding_modes () );
@@ -3031,6 +3059,547 @@ cmdline_parse_inst_t cmd_show_bypass_config = { };#endif +#ifdef RTE_LIBRTE_PMD_BOND +/* *** SET BONDING MODE *** */ +struct cmd_set_bonding_mode_result { +cmdline_fixed_string_t set; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t mode; +uint8_t value; +uint8_t port_id; +}; + +static void cmd_set_bonding_mode_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_set_bonding_mode_result *res = parsed_result; +portid_t port_id = res->port_id; + +/* Set the bonding mode for the relevant port. */ +if (0 !=rte_eth_bond_mode_set (port_id, res->value)) +printf ("\t Failed to set bonding mode for port = %d.\n" , port_id); +} + +cmdline_parse_token_string_t cmd_setbonding_mode_set = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_mode_result, + set,"set" ); +cmdline_parse_token_string_t cmd_setbonding_mode_bonding = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_mode_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_setbonding_mode_mode = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_mode_result, + mode,"mode" ); +cmdline_parse_token_num_t cmd_setbonding_mode_value = +TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_mode_result, + value,UINT8 ); +cmdline_parse_token_num_t cmd_setbonding_mode_port = +TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_mode_result, + port_id,UINT8 ); + +cmdline_parse_inst_t cmd_set_bonding_mode = { + .f = cmd_set_bonding_mode_parsed, + .help_str ="set bonding mode (mode_value) (port_id): Set the bonding mode for port_id" , + .data =NULL , + .tokens = { + (void *) &cmd_setbonding_mode_set, + (void *) &cmd_setbonding_mode_bonding, + (void *) &cmd_setbonding_mode_mode, + (void *) &cmd_setbonding_mode_value, + (void *) &cmd_setbonding_mode_port, +NULL + } +}; + +/* *** SET BALANCE XMIT POLICY *** */ +struct cmd_set_bonding_balance_xmit_policy_result { +cmdline_fixed_string_t set; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t balance_xmit_policy; +uint8_t port_id; +cmdline_fixed_string_t policy; +}; + +static void cmd_set_bonding_balance_xmit_policy_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_set_bonding_balance_xmit_policy_result *res = parsed_result; +portid_t port_id = res->port_id; +uint8_t policy; + +if (!strcmp (res->policy,"l2" )) { + policy =BALANCE_XMIT_POLICY_LAYER2 ; + }else if (!strcmp (res->policy,"l23" )) { + policy =BALANCE_XMIT_POLICY_LAYER23 ; + }else if (!strcmp (res->policy,"l34" )) { + policy =BALANCE_XMIT_POLICY_LAYER34 ; + }else { +printf ("\t Invalid xmit policy selection" ); +return ; + } + +/* Set the bonding mode for the relevant port. */ +if (0 !=rte_eth_bond_xmit_policy_set (port_id, policy)) { +printf ("\t Failed to set bonding balance xmit policy for port = %d.\n" , + port_id); + } +} + +cmdline_parse_token_string_t cmd_setbonding_balance_xmit_policy_set = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result, + set,"set" ); +cmdline_parse_token_string_t cmd_setbonding_balance_xmit_policy_bonding = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_setbonding_balance_xmit_policy_balance_xmit_policy = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result, + balance_xmit_policy,"balance_xmit_policy" ); +cmdline_parse_token_num_t cmd_setbonding_balance_xmit_policy_port = +TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result, + port_id,UINT8 ); +cmdline_parse_token_string_t cmd_setbonding_balance_xmit_policy_policy = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result, + policy,"l2#l23#l34" ); + +cmdline_parse_inst_t cmd_set_balance_xmit_policy = { + .f = cmd_set_bonding_balance_xmit_policy_parsed, + .help_str ="set bonding balance_xmit_policy (port_id) (policy_value): Set the bonding balance_xmit_policy for port_id" , + .data =NULL , + .tokens = { + (void *)&cmd_setbonding_balance_xmit_policy_set, + (void *)&cmd_setbonding_balance_xmit_policy_bonding, + (void *)&cmd_setbonding_balance_xmit_policy_balance_xmit_policy, + (void *)&cmd_setbonding_balance_xmit_policy_port, + (void *)&cmd_setbonding_balance_xmit_policy_policy, +NULL + } +}; + +/* *** SHOW NIC BONDING CONFIGURATION *** */ +struct cmd_show_bonding_config_result { +cmdline_fixed_string_t show; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t config; +uint8_t port_id; +}; + +static void cmd_show_bonding_config_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_show_bonding_config_result *res = parsed_result; +int bonding_mode; +uint8_t slaves[RTE_MAX_ETHPORTS ]; +int num_slaves, num_active_slaves; +int primary_id; +int i; +portid_t port_id = res->port_id; + +/* Display the bonding mode.*/ + bonding_mode =rte_eth_bond_mode_get (port_id); +if (bonding_mode <0 ) { +printf ("\tFailed to get bonding mode for port = %d\n" , port_id); +return ; + }else +printf ("\tBonding mode: %d\n" , bonding_mode); + +if (bonding_mode ==BONDING_MODE_BALANCE ) { +int balance_xmit_policy; + + balance_xmit_policy =rte_eth_bond_xmit_policy_get (port_id); +if (balance_xmit_policy <0 ) { +printf ("\tFailed to get balance xmit policy for port = %d\n" , + port_id); +return ; + }else { +printf ("\tBalance Xmit Policy: " ); + +switch (balance_xmit_policy) { +case BALANCE_XMIT_POLICY_LAYER2 : +printf ("BALANCE_XMIT_POLICY_LAYER2" ); +break ; +case BALANCE_XMIT_POLICY_LAYER23 : +printf ("BALANCE_XMIT_POLICY_LAYER23" ); +break ; +case BALANCE_XMIT_POLICY_LAYER34 : +printf ("BALANCE_XMIT_POLICY_LAYER34" ); +break ; + } +printf ("\n" ); + } + } + + num_slaves =rte_eth_bond_slaves_get (port_id, slaves,RTE_MAX_ETHPORTS ); + +if (num_slaves <0 ) { +printf ("\tFailed to get slave list for port = %d\n" , port_id); +return ; + } +if (num_slaves >0 ) { +printf ("\tSlaves (%d): [" , num_slaves); +for (i =0 ; i < num_slaves -1 ; i++) +printf ("%d " , slaves[i]); + +printf ("%d]\n" , slaves[num_slaves -1 ]); + }else { +printf ("\tSlaves: []\n" ); + + } + + num_active_slaves =rte_eth_bond_active_slaves_get (port_id, slaves, +RTE_MAX_ETHPORTS ); + +if (num_active_slaves <0 ) { +printf ("\tFailed to get active slave list for port = %d\n" , port_id); +return ; + } +if (num_active_slaves >0 ) { +printf ("\tActive Slaves (%d): [" , num_active_slaves); +for (i =0 ; i < num_active_slaves -1 ; i++) +printf ("%d " , slaves[i]); + +printf ("%d]\n" , slaves[num_active_slaves -1 ]); + + }else { +printf ("\tActive Slaves: []\n" ); + + } + + primary_id =rte_eth_bond_primary_get (port_id); +if (primary_id <0 ) { +printf ("\tFailed to get primary slave for port = %d\n" , port_id); +return ; + }else +printf ("\tPrimary: [%d]\n" , primary_id); + +} + +cmdline_parse_token_string_t cmd_showbonding_config_show = +TOKEN_STRING_INITIALIZER(struct cmd_show_bonding_config_result, + show,"show" ); +cmdline_parse_token_string_t cmd_showbonding_config_bonding = +TOKEN_STRING_INITIALIZER(struct cmd_show_bonding_config_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_showbonding_config_config = +TOKEN_STRING_INITIALIZER(struct cmd_show_bonding_config_result, + config,"config" ); +cmdline_parse_token_num_t cmd_showbonding_config_port = +TOKEN_NUM_INITIALIZER(struct cmd_show_bonding_config_result, + port_id,UINT8 ); + +cmdline_parse_inst_t cmd_show_bonding_config = { + .f = cmd_show_bonding_config_parsed, + .help_str ="show bonding config (port_id): Show the bonding config for port_id" , + .data =NULL , + .tokens = { + (void *)&cmd_showbonding_config_show, + (void *)&cmd_showbonding_config_bonding, + (void *)&cmd_showbonding_config_config, + (void *)&cmd_showbonding_config_port, +NULL + } +}; + +/* *** SET BONDING PRIMARY *** */ +struct cmd_set_bonding_primary_result { +cmdline_fixed_string_t set; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t primary; +uint8_t slave_id; +uint8_t port_id; +}; + +static void cmd_set_bonding_primary_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_set_bonding_primary_result *res = parsed_result; +portid_t master_port_id = res->port_id; +portid_t slave_port_id = res->slave_id; + +/* Set the primary slave for a bonded device. */ +if (0 !=rte_eth_bond_primary_set (master_port_id, slave_port_id)) { +printf ("\t Failed to set primary slave for port = %d.\n" , + master_port_id); +return ; + } +init_port_config (); +} + +cmdline_parse_token_string_t cmd_setbonding_primary_set = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_primary_result, + set,"set" ); +cmdline_parse_token_string_t cmd_setbonding_primary_bonding = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_primary_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_setbonding_primary_primary = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_primary_result, + primary,"primary" ); +cmdline_parse_token_num_t cmd_setbonding_primary_slave = +TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_primary_result, + slave_id,UINT8 ); +cmdline_parse_token_num_t cmd_setbonding_primary_port = +TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_primary_result, + port_id,UINT8 ); + +cmdline_parse_inst_t cmd_set_bonding_primary = { + .f = cmd_set_bonding_primary_parsed, + .help_str ="set bonding primary (slave_id) (port_id): Set the primary slave for port_id" , + .data =NULL , + .tokens = { + (void *)&cmd_setbonding_primary_set, + (void *)&cmd_setbonding_primary_bonding, + (void *)&cmd_setbonding_primary_primary, + (void *)&cmd_setbonding_primary_slave, + (void *)&cmd_setbonding_primary_port, +NULL + } +}; + +/* *** ADD SLAVE *** */ +struct cmd_add_bonding_slave_result { +cmdline_fixed_string_t add; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t slave; +uint8_t slave_id; +uint8_t port_id; +}; + +static void cmd_add_bonding_slave_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_add_bonding_slave_result *res = parsed_result; +portid_t master_port_id = res->port_id; +portid_t slave_port_id = res->slave_id; + +/* Set the primary slave for a bonded device. */ +if (0 !=rte_eth_bond_slave_add (master_port_id, slave_port_id)) { +printf ("\t Failed to add slave %d to master port = %d.\n" , + slave_port_id, master_port_id); +return ; + } +init_port_config (); +} + +cmdline_parse_token_string_t cmd_addbonding_slave_add = +TOKEN_STRING_INITIALIZER(struct cmd_add_bonding_slave_result, + add,"add" ); +cmdline_parse_token_string_t cmd_addbonding_slave_bonding = +TOKEN_STRING_INITIALIZER(struct cmd_add_bonding_slave_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_addbonding_slave_slave = +TOKEN_STRING_INITIALIZER(struct cmd_add_bonding_slave_result, + slave,"slave" ); +cmdline_parse_token_num_t cmd_addbonding_slave_slaveid = +TOKEN_NUM_INITIALIZER(struct cmd_add_bonding_slave_result, + slave_id,UINT8 ); +cmdline_parse_token_num_t cmd_addbonding_slave_port = +TOKEN_NUM_INITIALIZER(struct cmd_add_bonding_slave_result, + port_id,UINT8 ); + +cmdline_parse_inst_t cmd_add_bonding_slave = { + .f = cmd_add_bonding_slave_parsed, + .help_str ="add bonding slave (slave_id) (port_id): Add a slave device to a bonded device" , + .data =NULL , + .tokens = { + (void *)&cmd_addbonding_slave_add, + (void *)&cmd_addbonding_slave_bonding, + (void *)&cmd_addbonding_slave_slave, + (void *)&cmd_addbonding_slave_slaveid, + (void *)&cmd_addbonding_slave_port, +NULL + } +}; + +/* *** REMOVE SLAVE *** */ +struct cmd_remove_bonding_slave_result { +cmdline_fixed_string_t remove; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t slave; +uint8_t slave_id; +uint8_t port_id; +}; + +static void cmd_remove_bonding_slave_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_remove_bonding_slave_result *res = parsed_result; +portid_t master_port_id = res->port_id; +portid_t slave_port_id = res->slave_id; + +/* Set the primary slave for a bonded device. */ +if (0 !=rte_eth_bond_slave_remove (master_port_id, slave_port_id)) { +printf ("\t Failed to remove slave %d from master port = %d.\n" , + slave_port_id, master_port_id); +return ; + } +init_port_config (); +} + +cmdline_parse_token_string_t cmd_removebonding_slave_remove = + TOKEN_STRING_INITIALIZER(struct cmd_remove_bonding_slave_result, + remove,"remove" ); +cmdline_parse_token_string_t cmd_removebonding_slave_bonding = + TOKEN_STRING_INITIALIZER(struct cmd_remove_bonding_slave_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_removebonding_slave_slave = + TOKEN_STRING_INITIALIZER(struct cmd_remove_bonding_slave_result, + slave,"slave" ); +cmdline_parse_token_num_t cmd_removebonding_slave_slaveid = + TOKEN_NUM_INITIALIZER(struct cmd_remove_bonding_slave_result, + slave_id,UINT8 ); +cmdline_parse_token_num_t cmd_removebonding_slave_port = + TOKEN_NUM_INITIALIZER(struct cmd_remove_bonding_slave_result, + port_id,UINT8 ); + +cmdline_parse_inst_t cmd_remove_bonding_slave = { + .f = cmd_remove_bonding_slave_parsed, + .help_str ="remove bonding slave (slave_id) (port_id): Remove a slave device from a bonded device" , + .data =NULL , + .tokens = { + (void *)&cmd_removebonding_slave_remove, + (void *)&cmd_removebonding_slave_bonding, + (void *)&cmd_removebonding_slave_slave, + (void *)&cmd_removebonding_slave_slaveid, + (void *)&cmd_removebonding_slave_port, +NULL + } +}; + +/* *** CREATE BONDED DEVICE *** */ +struct cmd_create_bonded_device_result { +cmdline_fixed_string_t create; +cmdline_fixed_string_t bonded; +cmdline_fixed_string_t device; +uint8_t mode; +uint8_t socket; +}; + +static int bond_dev_num =0 ; + +static void cmd_create_bonded_device_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_create_bonded_device_result *res = parsed_result; +char ethdev_name[RTE_ETH_NAME_MAX_LEN ]; +int port_id; + +if (test_done ==0 ) { +printf ("Please stop forwarding first\n" ); +return ; + } + +rte_snprintf (ethdev_name,RTE_ETH_NAME_MAX_LEN ,"eth_bond_testpmd_%d" , + bond_dev_num++); + +/* Create a new bonded device. */ + port_id =rte_eth_bond_create (ethdev_name, res->mode, res->socket); +if (port_id <0 ) { +printf ("\t Failed to create bonded device.\n" ); +return ; + }else { +printf ("Created new bonded device %s on (port %d).\n" , ethdev_name, + port_id); + +/* Update number of ports */ + nb_ports =rte_eth_dev_count (); +reconfig (port_id); +rte_eth_promiscuous_enable (port_id); + } + +} + +cmdline_parse_token_string_t cmd_createbonded_device_create = + TOKEN_STRING_INITIALIZER(struct cmd_create_bonded_device_result, + create,"create" ); +cmdline_parse_token_string_t cmd_createbonded_device_bonded = + TOKEN_STRING_INITIALIZER(struct cmd_create_bonded_device_result, + bonded,"bonded" ); +cmdline_parse_token_string_t cmd_createbonded_device_device = + TOKEN_STRING_INITIALIZER(struct cmd_create_bonded_device_result, + device,"device" ); +cmdline_parse_token_num_t cmd_createbonded_device_mode = + TOKEN_NUM_INITIALIZER(struct cmd_create_bonded_device_result, + mode,UINT8 ); +cmdline_parse_token_num_t cmd_createbonded_device_socket = + TOKEN_NUM_INITIALIZER(struct cmd_create_bonded_device_result, + socket,UINT8 ); + +cmdline_parse_inst_t cmd_create_bonded_device = { + .f = cmd_create_bonded_device_parsed, + .help_str ="create bonded device (mode) (socket): Create a new bonded device with specific bonding mode and socket" , + .data =NULL , + .tokens = { + (void *)&cmd_createbonded_device_create, + (void *)&cmd_createbonded_device_bonded, + (void *)&cmd_createbonded_device_device, + (void *)&cmd_createbonded_device_mode, + (void *)&cmd_createbonded_device_socket, +NULL + } +}; + +/* *** SET MAC ADDRESS IN BONDED DEVICE *** */ +struct cmd_set_bond_mac_addr_result { +cmdline_fixed_string_t set; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t mac_addr; +uint8_t port_num; +struct ether_addr address; +}; + +static void cmd_set_bond_mac_addr_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_set_bond_mac_addr_result *res = parsed_result; +int ret; + +if (res->port_num >= nb_ports) { +printf ("Port id %d must be less than %d\n" , res->port_num, nb_ports); +return ; + } + + ret =rte_eth_bond_mac_address_set (res->port_num, &res->address); + +/* check the return value and print it if is < 0 */ +if (ret <0 ) +printf ("set_bond_mac_addr error: (%s)\n" ,strerror (-ret)); +} + +cmdline_parse_token_string_t cmd_set_bond_mac_addr_set = + TOKEN_STRING_INITIALIZER(struct cmd_set_bond_mac_addr_result, set, "set"); +cmdline_parse_token_string_t cmd_set_bond_mac_addr_bonding = + TOKEN_STRING_INITIALIZER(struct cmd_set_bond_mac_addr_result, bonding, +"bonding" ); +cmdline_parse_token_string_t cmd_set_bond_mac_addr_mac = + TOKEN_STRING_INITIALIZER(struct cmd_set_bond_mac_addr_result, mac_addr, +"mac_addr" ); +cmdline_parse_token_num_t cmd_set_bond_mac_addr_portnum = + TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mac_addr_result, port_num, UINT8); +cmdline_parse_token_etheraddr_t cmd_set_bond_mac_addr_addr = + TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_bond_mac_addr_result, address); + +cmdline_parse_inst_t cmd_set_bond_mac_addr = { + .f = cmd_set_bond_mac_addr_parsed, + .data = (void *)0 , + .help_str ="set bonding mac_addr (port_id) (address): " , + .tokens = { + (void *)&cmd_set_bond_mac_addr_set, + (void *)&cmd_set_bond_mac_addr_bonding, + (void *)&cmd_set_bond_mac_addr_mac, + (void *)&cmd_set_bond_mac_addr_portnum, + (void *)&cmd_set_bond_mac_addr_addr, +NULL + } +}; + +#endif /* RTE_LIBRTE_PMD_BOND */ +/* *** SET FORWARDING MODE *** */ struct cmd_set_fwd_mode_result {cmdline_fixed_string_t set;
@@ -6572,6 +7141,16 @@ cmdline_parse_ctx_t main_ctx[] = { (cmdline_parse_inst_t *)&cmd_set_bypass_timeout, (cmdline_parse_inst_t *)&cmd_show_bypass_config, #endif +#ifdef RTE_LIBRTE_PMD_BOND + (cmdline_parse_inst_t *) &cmd_set_bonding_mode, + (cmdline_parse_inst_t *) &cmd_show_bonding_config, + (cmdline_parse_inst_t *) &cmd_set_bonding_primary, + (cmdline_parse_inst_t *) &cmd_add_bonding_slave, + (cmdline_parse_inst_t *) &cmd_remove_bonding_slave, + (cmdline_parse_inst_t *) &cmd_create_bonded_device, + (cmdline_parse_inst_t *) &cmd_set_bond_mac_addr, + (cmdline_parse_inst_t *) &cmd_set_balance_xmit_policy, +#endif (cmdline_parse_inst_t *)&cmd_vlan_offload, (cmdline_parse_inst_t *)&cmd_vlan_tpid, (cmdline_parse_inst_t *)&cmd_rx_vlan_filter_all,
app/test-pmd/config.c +3 -1
@@ -252,6 +252,7 @@ void port_infos_display(portid_t port_id) {struct rte_port *port; +struct ether_addr mac_addr;struct rte_eth_link link;int vlan_offload;struct rte_mempool * mp;
@@ -265,7 +266,8 @@ port_infos_display(portid_t port_id)rte_eth_link_get_nowait (port_id, &link);printf ("\n%s Infos for port %-2d %s\n" , info_border, port_id, info_border); -print_ethaddr ("MAC address: " , &port->eth_addr); +rte_eth_macaddr_get (port_id, &mac_addr); +print_ethaddr ("MAC address: " , &mac_addr);printf ("\nConnect to socket: %u" , port->socket_id);if (port_numa[port_id] !=NUMA_NO_CONFIG ) {
app/test-pmd/parameters.c +3 -0
@@ -75,6 +75,9 @@#include <cmdline_parse.h> #include <cmdline_parse_etheraddr.h> #endif +#ifdef RTE_LIBRTE_PMD_BOND +#include <rte_eth_bond.h> +#endif #include "testpmd.h"
app/test-pmd/testpmd.c +32 -8
@@ -300,7 +300,7 @@ struct rte_fdir_conf fdir_conf = { .drop_queue = 127, }; -static volatile int test_done =1 ;/* stop packet forwarding when set to 1. */ +volatile int test_done =1 ;/* stop packet forwarding when set to 1. */ struct queue_stats_mappings tx_queue_stats_mappings_array[MAX_TX_QUEUE_STATS_MAPPINGS ];struct queue_stats_mappings rx_queue_stats_mappings_array[MAX_RX_QUEUE_STATS_MAPPINGS ];
@@ -625,6 +625,32 @@ init_config(void)rte_exit (EXIT_FAILURE ,"FAIL from init_fwd_streams()\n" ); } + +void +reconfig (portid_t new_port_id) +{ +struct rte_port *port; + +/* Reconfiguration of Ethernet ports. */ + ports =rte_realloc (ports, +sizeof (struct rte_port ) * nb_ports, +CACHE_LINE_SIZE ); +if (ports ==NULL ) { +rte_exit (EXIT_FAILURE ,"rte_realloc(%d struct rte_port) failed\n" , + nb_ports); + } + + port = &ports[new_port_id]; +rte_eth_dev_info_get (new_port_id, &port->dev_info); + +/* set flag to initialize port/queue */ + port->need_reconfig =1 ; + port->need_reconfig_queues =1 ; + +init_port_config (); +} + +int init_fwd_streams (void ) {
@@ -1252,7 +1278,7 @@ start_port(portid_t pid)portid_t pi;queueid_t qi;struct rte_port *port; -uint8_t *mac_addr; +struct ether_addr mac_addr;if (test_done ==0 ) {printf ("Please stop forwarding first\n" );
@@ -1380,10 +1406,11 @@ start_port(portid_t pid) RTE_PORT_HANDLING, RTE_PORT_STARTED) == 0)printf ("Port %d can not be set into started\n" , pi); - mac_addr = port->eth_addr.addr_bytes; +rte_eth_macaddr_get (pi, &mac_addr);printf ("Port %d: %02X:%02X:%02X:%02X:%02X:%02X\n" , pi, - mac_addr[0 ], mac_addr[1 ], mac_addr[2 ], - mac_addr[3 ], mac_addr[4 ], mac_addr[5 ]); + mac_addr.addr_bytes[0 ], mac_addr.addr_bytes[1 ], + mac_addr.addr_bytes[2 ], mac_addr.addr_bytes[3 ], + mac_addr.addr_bytes[4 ], mac_addr.addr_bytes[5 ]);/* at least one port started, need checking link status */ need_check_link_status =1 ;
@@ -1826,9 +1853,6 @@ main(int argc, char** argv)if (diag <0 )rte_panic ("Cannot init EAL\n" ); -if (rte_eal_pci_probe ()) -rte_panic ("Cannot probe PCI\n" ); - nb_ports = (portid_t )rte_eth_dev_count ();if (nb_ports ==0 ) rte_exit(EXIT_FAILURE, "No probed ethernet devices - "
app/test-pmd/testpmd.h +2 -0
@@ -279,6 +279,7 @@ extern uint16_t port_topology; /**< set by "--port-topology" parameter */extern uint8_t no_flush_rx;/**<set by "--no-flush-rx" parameter */ extern uint8_t mp_anon;/**< set by "--mp-anon" parameter */ extern uint8_t no_link_check;/**<set by "--disable-link-check" parameter */ +extern volatile int test_done;/* stop packet forwarding when set to 1. */ #ifdef RTE_NIC_BYPASS extern uint32_t bypass_timeout;/**< Store the NIC bypass watchdog timeout */
@@ -452,6 +453,7 @@ void fwd_config_display(void);void rxtx_config_display (void );void fwd_config_setup (void );void set_def_fwd_config (void ); +void reconfig (portid_t new_port_id);int init_fwd_streams (void );void port_mtu_set (portid_t port_id,uint16_t mtu);
Signature · 1 line
1.7.0.7
PATCH v8 6/6 Link Bonding Library doxygen additions
In reply to a message not in the archive--- doc/doxy-api-index.md | 1 + doc/doxy-api.conf | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
doc/doxy-api-index.md +1 -0
@@ -36,6 +36,7 @@ API {#index} There are many libraries, so their headers may be grouped by topics: - **device**: + [bond] (@ref rte_eth_bond.h), [ethdev] (@ref rte_ethdev.h), [devargs] (@ref rte_devargs.h), [KNI] (@ref rte_kni.h),
doc/doxy-api.conf +1 -0
@@ -30,6 +30,7 @@ PROJECT_NAME = DPDK INPUT = doc/doxy-api-index.md \ + lib/librte_pmd_bond \ lib/librte_eal/common/include \ lib/librte_acl \ lib/librte_distributor \
Signature · 1 line
1.7.0.7
PATCH v7 1/6 Link Bonding Library (lib/librte_pmd_bond)
In reply to a message not in the archiveInitial release with support for
Mode 0 - Round Robin
Mode 1 - Active Backup
Mode 2 - Balance -> Supports 3 transmit polices (layer 2, layer 2+3, layer 3+4) Mode 3 - Broadcast
--- config/common_bsdapp | 5 + config/common_linuxapp | 5 + lib/Makefile | 1 + lib/librte_pmd_bond/Makefile | 32 + lib/librte_pmd_bond/rte_eth_bond.c | 2142 ++++++++++++++++++++++++++++++++++++ lib/librte_pmd_bond/rte_eth_bond.h | 255 +++++ mk/rte.app.mk | 5 + 7 files changed, 2445 insertions(+), 0 deletions(-) create mode 100644 lib/librte_pmd_bond/Makefile create mode 100644 lib/librte_pmd_bond/rte_eth_bond.c create mode 100644 lib/librte_pmd_bond/rte_eth_bond.h
config/common_bsdapp +5 -0
@@ -206,6 +206,11 @@ CONFIG_RTE_PMD_RING_MAX_TX_RINGS=16 CONFIG_RTE_LIBRTE_PMD_PCAP=y # +# Compile link bonding pmd library +# +CONFIG_RTE_LIBRTE_PMD_BOND=y + +# # Do prefetch of packet data within PMD driver receive function # CONFIG_RTE_PMD_PACKET_PREFETCH=y
config/common_linuxapp +5 -0
@@ -244,6 +244,11 @@ CONFIG_RTE_PMD_RING_MAX_TX_RINGS=16 CONFIG_RTE_LIBRTE_PMD_PCAP=n # +# Compile link bonding pmd library +# +CONFIG_RTE_LIBRTE_PMD_BOND=y + +# # Compile Xen PMD # CONFIG_RTE_LIBRTE_PMD_XENVIRT=n
lib/Makefile +1 -0
@@ -49,6 +49,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += librte_pmd_pcap DIRS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += librte_pmd_virtio DIRS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += librte_pmd_vmxnet3 DIRS-$(CONFIG_RTE_LIBRTE_PMD_XENVIRT) += librte_pmd_xenvirt +DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += librte_pmd_bond DIRS-$(CONFIG_RTE_LIBRTE_HASH) += librte_hash DIRS-$(CONFIG_RTE_LIBRTE_LPM) += librte_lpm DIRS-$(CONFIG_RTE_LIBRTE_ACL) += librte_acl
lib/librte_pmd_bond/Makefile new file +32 -0
@@ -0,0 +1,32 @@ +# <COPYRIGHT_TAG> + +include $(RTE_SDK)/mk/rte.vars.mk + +# +# library name +# +LIB = librte_pmd_bond.a + +CFLAGS += -O3 +CFLAGS += $(WERROR_FLAGS) + +# +# all source are stored in SRCS-y +# +SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond.c + + +# +# Export include files +# +SYMLINK-y-include += rte_eth_bond.h + + +# this lib depends upon: +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += lib/librte_mbuf +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += lib/librte_ether +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += lib/librte_malloc +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += lib/librte_eal +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += lib/librte_kvargs + +include $(RTE_SDK)/mk/rte.lib.mk
lib/librte_pmd_bond/rte_eth_bond.c new file +2142 -0
2,142 lines not on this page · raw message
lib/librte_pmd_bond/rte_eth_bond.h new file +255 -0
255 lines not on this page · raw message
mk/rte.app.mk +5 -0
@@ -205,8 +205,13 @@ ifeq ($(CONFIG_RTE_LIBRTE_PMD_PCAP),y) LDLIBS += -lrte_pmd_pcap -lpcap endif +ifeq ($(CONFIG_RTE_LIBRTE_PMD_BOND),y) +LDLIBS += -lrte_pmd_bond endif +endif + + LDLIBS += $(EXECENV_LDLIBS) LDLIBS += --end-group
Signature · 1 line
1.7.0.7
PATCH v7 2/6 Support for unique interface naming of pmds
In reply to a message not in the archiveAdding support to rte_eth_dev_data structure to support unique name identifier for ethdevs to support adding slave ethdevs (specifically virtual devices which have no public unique identifier) to a link bonding device. This changes the API rte_eth_dev_allocate() to require a const char *name when allocating a ethdev, which also verifies that the name is unique and hasn’t been already used by an existed allocated rte_eth_dev. Also contains updates to virtual pmd’s to now call the API with a name parameter.
--- lib/librte_ether/rte_ethdev.c | 33 +++++++++++++++++++++++++++-- lib/librte_ether/rte_ethdev.h | 7 +++++- lib/librte_pmd_pcap/rte_eth_pcap.c | 22 ++++++++++---------- lib/librte_pmd_ring/rte_eth_ring.c | 32 +++++++++++++++------------- lib/librte_pmd_ring/rte_eth_ring.h | 3 +- lib/librte_pmd_xenvirt/rte_eth_xenvirt.c | 2 +- 6 files changed, 67 insertions(+), 32 deletions(-)
lib/librte_ether/rte_ethdev.c +30 -3
@@ -65,6 +65,7 @@#include <rte_mbuf.h> #include <rte_errno.h> #include <rte_spinlock.h> +#include <rte_string_fns.h> #include "rte_ether.h" #include "rte_ethdev.h"
@@ -153,21 +154,41 @@ rte_eth_dev_data_alloc(void) RTE_MAX_ETHPORTS * sizeof(*rte_eth_dev_data)); } +static struct rte_eth_dev * +rte_eth_dev_allocated (const char *name) +{ +unsigned i; + +for (i =0 ; i < nb_ports; i++) { +if (strcmp (rte_eth_devices[i].data->name, name) ==0 ) +return &rte_eth_devices[i]; + } +return NULL ; +} +struct rte_eth_dev * -rte_eth_dev_allocate (void ) +rte_eth_dev_allocate (const char *name) {struct rte_eth_dev *eth_dev;if (nb_ports ==RTE_MAX_ETHPORTS ) { -PMD_DEBUG_TRACE ("Reached maximum number of ethernet ports\n" ); +PMD_DEBUG_TRACE ("Reached maximum number of Ethernet ports\n" );return NULL ; }if (rte_eth_dev_data ==NULL )rte_eth_dev_data_alloc (); +if (rte_eth_dev_allocated (name) !=NULL ) { +PMD_DEBUG_TRACE ("Ethernet Device with name %s already allocated!\n" , + name); +return NULL ; + } + eth_dev = &rte_eth_devices[nb_ports]; eth_dev->data = &rte_eth_dev_data[nb_ports]; +rte_snprintf (eth_dev->data->name,sizeof (eth_dev->data->name), +"%s" , name); eth_dev->data->port_id = nb_ports++;return eth_dev; }
@@ -178,11 +199,17 @@ rte_eth_dev_init(struct rte_pci_driver *pci_drv, {struct eth_driver *eth_drv;struct rte_eth_dev *eth_dev; +char ethdev_name[RTE_ETH_NAME_MAX_LEN ]; +int diag; eth_drv = (struct eth_driver *)pci_drv; - eth_dev =rte_eth_dev_allocate (); +/* Create unique Ethernet device name using PCI address */ +rte_snprintf (ethdev_name,RTE_ETH_NAME_MAX_LEN ,"%d:%d.%d" , + pci_dev->addr.bus, pci_dev->addr.devid, pci_dev->addr.function); + + eth_dev =rte_eth_dev_allocate (ethdev_name);if (eth_dev ==NULL )return -ENOMEM ;
lib/librte_ether/rte_ethdev.h +6 -1
@@ -1497,6 +1497,8 @@ struct rte_eth_dev_sriov { };#define RTE_ETH_DEV_SRIOV (dev) ((dev)->data->sriov) +#define RTE_ETH_NAME_MAX_LEN (32) +/** * @internal * The data part, with no function pointers, associated with each ethernet device.
@@ -1505,6 +1507,8 @@ struct rte_eth_dev_sriov {* processes in a multi-process configuration. */ struct rte_eth_dev_data { +char name[RTE_ETH_NAME_MAX_LEN ];/**< Unique identifier name */ +void **rx_queues;/**< Array of pointers to RX queues. */ void **tx_queues;/**< Array of pointers to TX queues. */ uint16_t nb_rx_queues;/**< Number of RX queues. */
@@ -1560,10 +1564,11 @@ extern uint8_t rte_eth_dev_count(void);* Allocates a new ethdev slot for an ethernet device and returns the pointer * to that slot for the driver to use. * +* @param name Unique identifier name for each Ethernet device * @return * - Slot in the rte_dev_devices array for a new device; */ -struct rte_eth_dev *rte_eth_dev_allocate (void ); +struct rte_eth_dev *rte_eth_dev_allocate (const char *name);struct eth_driver ;/**
lib/librte_pmd_pcap/rte_eth_pcap.c +11 -11
@@ -534,7 +534,7 @@ open_tx_iface(const char *key __rte_unused, const char *value, void *extra_args) static int -rte_pmd_init_internals(const unsigned nb_rx_queues, +rte_pmd_init_internals(const char *name, const unsigned nb_rx_queues, const unsigned nb_tx_queues, const unsigned numa_node, struct pmd_internals **internals,
@@ -558,20 +558,20 @@ rte_pmd_init_internals(const unsigned nb_rx_queues,/* now do all data allocation - for eth_dev structure, dummy pci driver * and internal (private) data */ - data =rte_zmalloc_socket (NULL ,sizeof (*data),0 , numa_node); + data =rte_zmalloc_socket (name,sizeof (*data),0 , numa_node);if (data ==NULL ) goto error; - pci_dev =rte_zmalloc_socket (NULL ,sizeof (*pci_dev),0 , numa_node); + pci_dev =rte_zmalloc_socket (name,sizeof (*pci_dev),0 , numa_node);if (pci_dev ==NULL ) goto error; - *internals =rte_zmalloc_socket (NULL ,sizeof (**internals),0 , numa_node); + *internals =rte_zmalloc_socket (name,sizeof (**internals),0 , numa_node);if (*internals ==NULL ) goto error;/* reserve an ethdev entry */ - *eth_dev =rte_eth_dev_allocate (); + *eth_dev =rte_eth_dev_allocate (name);if (*eth_dev ==NULL ) goto error;
@@ -617,7 +617,7 @@ rte_pmd_init_internals(const unsigned nb_rx_queues, } static int -rte_eth_from_pcaps_n_dumpers(pcap_t * const rx_queues[], +rte_eth_from_pcaps_n_dumpers(const char *name, pcap_t * const rx_queues[], const unsigned nb_rx_queues, pcap_dumper_t * const tx_queues[], const unsigned nb_tx_queues,
@@ -634,7 +634,7 @@ rte_eth_from_pcaps_n_dumpers(pcap_t * const rx_queues[],if (tx_queues ==NULL && nb_tx_queues >0 )return -1 ; -if (rte_pmd_init_internals (nb_rx_queues, nb_tx_queues, numa_node, +if (rte_pmd_init_internals (name, nb_rx_queues, nb_tx_queues, numa_node, &internals, ð_dev, kvlist) <0 )return -1 ;
@@ -652,7 +652,7 @@ rte_eth_from_pcaps_n_dumpers(pcap_t * const rx_queues[], } static int -rte_eth_from_pcaps(pcap_t * const rx_queues[], +rte_eth_from_pcaps(const char *name, pcap_t * const rx_queues[], const unsigned nb_rx_queues, pcap_t * const tx_queues[], const unsigned nb_tx_queues,
@@ -669,7 +669,7 @@ rte_eth_from_pcaps(pcap_t * const rx_queues[],if (tx_queues ==NULL && nb_tx_queues >0 )return -1 ; -if (rte_pmd_init_internals (nb_rx_queues, nb_tx_queues, numa_node, +if (rte_pmd_init_internals (name, nb_rx_queues, nb_tx_queues, numa_node, &internals, ð_dev, kvlist) <0 )return -1 ;
@@ -760,10 +760,10 @@ rte_pmd_pcap_devinit(const char *name, const char *params)return -1 ;if (using_dumpers) -return rte_eth_from_pcaps_n_dumpers (pcaps.pcaps, pcaps.num_of_rx, +return rte_eth_from_pcaps_n_dumpers (name, pcaps.pcaps, pcaps.num_of_rx, dumpers.dumpers, dumpers.num_of_tx, numa_node, kvlist); -return rte_eth_from_pcaps (pcaps.pcaps, pcaps.num_of_rx, dumpers.pcaps, +return rte_eth_from_pcaps (name, pcaps.pcaps, pcaps.num_of_rx, dumpers.pcaps, dumpers.num_of_tx, numa_node, kvlist); }
lib/librte_pmd_ring/rte_eth_ring.c +17 -15
@@ -219,7 +219,7 @@ static struct eth_dev_ops ops = { }; int -rte_eth_from_rings(struct rte_ring *const rx_queues[], +rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[], const unsigned nb_rx_queues, struct rte_ring *const tx_queues[], const unsigned nb_tx_queues,
@@ -243,20 +243,20 @@ rte_eth_from_rings(struct rte_ring *const rx_queues[],/* now do all data allocation - for eth_dev structure, dummy pci driver * and internal (private) data */ - data =rte_zmalloc_socket (NULL ,sizeof (*data),0 , numa_node); + data =rte_zmalloc_socket (name,sizeof (*data),0 , numa_node);if (data ==NULL ) goto error; - pci_dev =rte_zmalloc_socket (NULL ,sizeof (*pci_dev),0 , numa_node); + pci_dev =rte_zmalloc_socket (name,sizeof (*pci_dev),0 , numa_node);if (pci_dev ==NULL ) goto error; - internals =rte_zmalloc_socket (NULL ,sizeof (*internals),0 , numa_node); + internals =rte_zmalloc_socket (name,sizeof (*internals),0 , numa_node);if (internals ==NULL ) goto error;/* reserve an ethdev entry */ - eth_dev =rte_eth_dev_allocate (); + eth_dev =rte_eth_dev_allocate (name);if (eth_dev ==NULL ) goto error;
@@ -335,7 +335,7 @@ eth_dev_ring_create(const char *name, const unsigned numa_node,return -1 ; } -if (rte_eth_from_rings (rxtx, num_rings, rxtx, num_rings, numa_node)) +if (rte_eth_from_rings (name, rxtx, num_rings, rxtx, num_rings, numa_node))return -1 ;return 0 ;
@@ -352,29 +352,31 @@ eth_dev_ring_pair_create(const char *name, const unsigned numa_node,struct rte_ring *rx[RTE_PMD_RING_MAX_RX_RINGS ];struct rte_ring *tx[RTE_PMD_RING_MAX_TX_RINGS ];unsigned i; -char rng_name[RTE_RING_NAMESIZE ]; +char rx_rng_name[RTE_RING_NAMESIZE ]; +char tx_rng_name[RTE_RING_NAMESIZE ];unsigned num_rings =RTE_MIN (RTE_PMD_RING_MAX_RX_RINGS ,RTE_PMD_RING_MAX_TX_RINGS );for (i =0 ; i < num_rings; i++) { -rte_snprintf (rng_name,sizeof (rng_name),"ETH_RX%u_%s" , i, name); +rte_snprintf (rx_rng_name,sizeof (rx_rng_name),"ETH_RX%u_%s" , i, name); rx[i] = (action ==DEV_CREATE ) ? -rte_ring_create (rng_name,1024 , numa_node, +rte_ring_create (rx_rng_name,1024 , numa_node,RING_F_SP_ENQ |RING_F_SC_DEQ ) : -rte_ring_lookup (rng_name); +rte_ring_lookup (rx_rng_name);if (rx[i] ==NULL )return -1 ; -rte_snprintf (rng_name,sizeof (rng_name),"ETH_TX%u_%s" , i, name); +rte_snprintf (tx_rng_name,sizeof (tx_rng_name),"ETH_TX%u_%s" , i, name); tx[i] = (action ==DEV_CREATE ) ? -rte_ring_create (rng_name,1024 , numa_node, +rte_ring_create (tx_rng_name,1024 , numa_node,RING_F_SP_ENQ |RING_F_SC_DEQ ): -rte_ring_lookup (rng_name); +rte_ring_lookup (tx_rng_name);if (tx[i] ==NULL )return -1 ; } -if (rte_eth_from_rings (rx, num_rings, tx, num_rings, numa_node) || -rte_eth_from_rings (tx, num_rings, rx, num_rings, numa_node) ) +if (rte_eth_from_rings (rx_rng_name, rx, num_rings, tx, num_rings, + numa_node) ||rte_eth_from_rings (tx_rng_name, tx, num_rings, rx, + num_rings, numa_node))return -1 ;return 0 ;
lib/librte_pmd_ring/rte_eth_ring.h +2 -1
@@ -40,7 +40,8 @@ extern "C" {#include <rte_ring.h> -int rte_eth_from_rings(struct rte_ring * const rx_queues[], +int rte_eth_from_rings(const char *name, + struct rte_ring * const rx_queues[], const unsigned nb_rx_queues, struct rte_ring *const tx_queues[], const unsigned nb_tx_queues,
lib/librte_pmd_xenvirt/rte_eth_xenvirt.c +1 -1
@@ -647,7 +647,7 @@ eth_dev_xenvirt_create(const char *name, const char *params, goto err;/* reserve an ethdev entry */ - eth_dev =rte_eth_dev_allocate (); + eth_dev =rte_eth_dev_allocate (name);if (eth_dev ==NULL ) goto err;
Signature · 1 line
1.7.0.7
PATCH v7 3/6 EAL support for link bonding device initialization
In reply to a message not in the archiveUpdating 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.
--- 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 | 13 +++++- lib/librte_eal/linuxapp/eal/eal.c | 11 +++++- 6 files changed, 73 insertions(+), 29 deletions(-)
lib/librte_eal/bsdapp/eal/eal.c +9 -1
@@ -874,7 +874,7 @@ rte_eal_init(int argc, char **argv)rte_eal_mcfg_complete (); -if (rte_eal_dev_init () <0 ) +if (rte_eal_dev_init (PMD_INIT_PRE_PCI_PROBE ) <0 )rte_panic ("Cannot init pmd devices\n" );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 (); +/* 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; }
lib/librte_eal/common/eal_common_dev.c +40 -18
77 lines not on this page · raw message
lib/librte_eal/common/eal_common_pci.c +3 -0
@@ -150,6 +150,9 @@ rte_eal_pci_probe(void) probe_all =1 ; TAILQ_FOREACH(dev, &pci_device_list, next) { +/* check if device has already been initialized */ +if (dev->driver !=NULL ) +continue ;/* set devargs in PCI structure */ devargs =pci_devargs_lookup (dev);
lib/librte_eal/common/include/eal_private.h +0 -7
@@ -196,11 +196,4 @@ int rte_eal_intr_init(void);*/ int rte_eal_alarm_init (void ); -/** -* This function initialises any virtual devices -* -* This function is private to the EAL. -*/ -int rte_eal_dev_init (void ); -#endif /* _EAL_PRIVATE_H_ */
lib/librte_eal/common/include/rte_dev.h +11 -2
@@ -62,6 +62,15 @@ 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*/ +}; + +#define RTE_PMD_BOND ("eth_bond") +/** +* Driver initialization */ +enum pmd_init_priority { +PMD_INIT_PRE_PCI_PROBE =0 , +PMD_INIT_POST_PCI_PROBE =1 , };/**
@@ -93,9 +102,9 @@ void rte_eal_driver_register(struct rte_driver *driver);void rte_eal_driver_unregister (struct rte_driver *driver);/** -* 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);#define PMD_REGISTER_DRIVER (d)\ void devinitfn_ ##d(void);\
lib/librte_eal/linuxapp/eal/eal.c +10 -1
@@ -75,6 +75,7 @@#include <rte_atomic.h> #include <malloc_heap.h> #include <rte_eth_ring.h> +#include <rte_dev.h> #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=%x)\n" , rte_config.master_lcore, (int )thread_id); -if (rte_eal_dev_init () <0 ) +if (rte_eal_dev_init (PMD_INIT_PRE_PCI_PROBE ) <0 )rte_panic ("Cannot init pmd devices\n" );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 (); +/* 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; }
Signature · 1 line
1.7.0.7
A message that is not in the archive (sent off-list or not yet received): 1403625828-20956-4-git-send-email-declan.doherty-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org
Re: [PATCH v7 3/6] EAL support for link bonding device initialization
Hi Declan,
2014-06-24 17:03, Declan Doherty:
Quoted 4 lines
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.
[...]
Quoted 37 lines
lib/librte_eal/common/eal_common_dev.c +13
-9@@ -62,7 +62,7 @@ rte_eal_driver_unregister(struct rte_driver *driver) }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 ; TAILQ_FOREACH(driver, &dev_driver_list, next) { -if (driver->type !=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 ==PMD_VDEV && init_pri == +PMD_INIT_PRE_PCI_PROBE ) || + (driver->type ==PMD_BDEV && init_pri == +PMD_INIT_POST_PCI_PROBE )) { -/* 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,
lib/librte_eal/common/eal_common_dev.c rte_eal_dev_init(void) · line 103
Quoted 10 lines
lib/librte_eal/common/eal_common_dev.c +4
-3+ devargs->args); +break ; + } } } -if (driver ==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
Quoted 35 lines
lib/librte_eal/common/eal_common_dev.c +23
-6+* to be found */ +if (init_pri ==PMD_INIT_PRE_PCI_PROBE && +strncmp (RTE_PMD_BOND , devargs->virtual.drv_name, +strlen (RTE_PMD_BOND )) !=0 ) { +if (driver ==NULL ) { +rte_panic ("no driver found for virtual device %s\n" , + devargs->virtual.drv_name); + } + }else if (init_pri ==PMD_INIT_POST_PCI_PROBE && +strncmp (RTE_PMD_BOND , devargs->virtual.drv_name, +strlen (RTE_PMD_BOND )) ==0 ) { +if (driver ==NULL ) { +rte_panic ("no driver found for bonded device %s\n" , + devargs->virtual.drv_name); + } } } -/* Once the vdevs are initalized, start calling all the pdev drivers */ - TAILQ_FOREACH(driver, &dev_driver_list, next) { -if (driver->type !=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 ==PMD_INIT_PRE_PCI_PROBE ) { + TAILQ_FOREACH(driver, &dev_driver_list, next) { +if (driver->type !=PMD_PDEV ) +continue ; +/* PDEV drivers don't get passed any parameters */ + driver->init (NULL ,NULL ); + } }return 0 ;}
[...]
Quoted 23 lines
lib/librte_eal/linuxapp/eal/eal.c +2
-1@@ -75,6 +75,7 @@#include <rte_atomic.h> #include <malloc_heap.h> #include <rte_eth_ring.h> +#include <rte_dev.h> #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=%x)\n" , rte_config.master_lcore, (int )thread_id); -if (rte_eal_dev_init () <0 ) +if (rte_eal_dev_init (PMD_INIT_PRE_PCI_PROBE ) <0 )rte_panic ("Cannot init pmd devices\n" );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 ();
lib/librte_eal/linuxapp/eal/eal.c rte_eal_init(int argc, char **argv) · line 1140
Quoted 10 lines
lib/librte_eal/linuxapp/eal/eal.c +8
-0+/* 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; }
Not sure to understand why you need to split rte_eal_dev_init() in 2 steps. Should it be possible to keep existing rte_eal_dev_init() behaviour and makes further initialization when calling rte_eth_dev_configure()?
I've seen it's empty for bonding device:
static intbond_ethdev_configure(struct rte_eth_dev *dev __rte_unused)
{
return 0;
}Thanks
Signature · 1 line
Thomas
Re: [PATCH v7 3/6] EAL support for link bonding device initialization
Quoted 25 lines
-----Original Message-----
From: Thomas Monjalon [mailto:[email protected]]
Sent: Wednesday, June 25, 2014 2:55 PM
To: Doherty, Declan
Cc: [email protected]
Subject: Re: [PATCH v7 3/6] EAL support for link bonding device initializationHi Declan,
2014-06-24 17:03, Declan Doherty:
Quoted 4 lines
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.
[...]
Not sure to understand why you need to split
rte_eal_dev_init()in 2 steps. Should it be possible to keep existingrte_eal_dev_init()behaviour and makes further initialization when callingrte_eth_dev_configure()?
I've seen it's empty for bonding device:
Quoted 3 lines
Thanks
--
Thomas
Hi Thomas, that need to split rte_eal_dev_init into 2 steps doesn't come explicitly from the bonded device itself, as a bonded device could be created at any time during initialization, the issue arises from the fact that none of physical devices are allocated/initialized until after pci_probe_all_drivers() is called, this puts an explicit constraint on when it is possible to create a bonded device which has physical devices as slaves, as the phyiscal devices don't exist at the initial call to rte_eal_dev_init() and therefore can't be added as slaves to the bonded device.
It isn't possible to keep the rte_eal_dev_init() behavior and use rte_eth_dev_configure() to complete initialization without radically changing the behavior of the bonding library, and the current functionality of
rte_eth_bond_slave_add(), as this would need to no longer actually add a slave,
but to save the name of a slave to be retrieved at some point in the future to be added as a slave to the bonded device.
Declan
A message that is not in the archive (sent off-list or not yet received): 345C63BAECC1AD42A2EC8C63AFFC3ADC272FB41C-kPTMFJFq+rF9qrmMLTLiibfspsVTdybXVpNB7YpNyf8@public.gmane.org
Re: [PATCH v7 3/6] EAL support for link bonding device initialization
2014-06-25 14:41, Doherty, Declan:
Quoted 8 lines
From: Thomas Monjalon [mailto:[email protected]]
Quoted 6 lines
Not sure to understand why you need to split
rte_eal_dev_init()in 2 steps.
Should it be possible to keep existingrte_eal_dev_init()behaviour and makes further initialization when callingrte_eth_dev_configure()?
I've seen it's empty for bonding device:
Quoted 15 lines
Hi Thomas, that need to split
rte_eal_dev_initinto 2 steps doesn't come explicitly from the bonded device itself, as a bonded device could be created at any time during initialization, the issue arises from the fact that none of physical devices are allocated/initialized until afterpci_probe_all_drivers()is called, this puts an explicit constraint on when it is possible to create a bonded device which has physical devices as slaves, as the phyiscal devices don't exist at the initial call torte_eal_dev_init()and therefore can't be added as slaves to the bonded device.
It isn't possible to keep therte_eal_dev_init()behavior and userte_eth_dev_configure()to complete initialization without radically changing the behavior of the bonding library, and the current functionality ofrte_eth_bond_slave_add(), as this would need to no longer actually add a slave, but to save the name of a slave to be retrieved at some point in the future to be added as a slave to the bonded device.
I'm sure it would be much cleaner if you split rte_eth_bond_slave_add() instead of splitting rte_eal_dev_init().
If I understand well, you should first save kvargs for slaves and add them at configure time.
Then you could remove PMD_BDEV type and use PMD_VDEV.
I know it's an additional work but API cleaning really deserves it.
Thanks
Signature · 1 line
Thomas
Re: [PATCH v7 3/6] EAL support for link bonding device initialization
Quoted 33 lines
-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Thomas Monjalon
Sent: Wednesday, June 25, 2014 9:01 AM
To: Doherty, Declan
Cc: [email protected]
Subject: Re: [dpdk-dev] [PATCH v7 3/6] EAL support for link bonding device initialization2014-06-25 14:41, Doherty, Declan:
Quoted 8 lines
From: Thomas Monjalon [mailto:[email protected]]
Quoted 6 lines
Not sure to understand why you need to split
rte_eal_dev_init()in 2 steps.
Should it be possible to keep existingrte_eal_dev_init()behaviour and makes further initialization when callingrte_eth_dev_configure()?
I've seen it's empty for bonding device:Quoted 15 lines
Hi Thomas, that need to split
rte_eal_dev_initinto 2 steps doesn't come explicitly from the bonded device itself, as a bonded device could be created at any time during initialization, the issue arises from the fact that none of physical devices are allocated/initialized until afterpci_probe_all_drivers()is called, this puts an explicit constraint on when it is possible to create a bonded device which has physical devices as slaves, as the phyiscal devices don't exist at the initial call torte_eal_dev_init()and therefore can't be added as slaves to the bonded device.
It isn't possible to keep therte_eal_dev_init()behavior and userte_eth_dev_configure()to complete initialization without radically changing the behavior of the bonding library, and the current functionality ofrte_eth_bond_slave_add(), as this would need to no longer actually add a slave, but to save the name of a slave to be retrieved at some point in the future to be added as a slave to the bonded device.
Quoted 9 lines
I'm sure it would be much cleaner if you split
rte_eth_bond_slave_add()instead of splittingrte_eal_dev_init().
If I understand well, you should first save kvargs for slaves and add them at configure time.Then you could remove
PMD_BDEVtype and usePMD_VDEV.I know it's an additional work but API cleaning really deserves it.
Or else we could just go back to the earlier versions of the submission and accept the fact that some types of devices are designed to be used from code via an API and that we don't need to be able to set up every type of device via the application command-line. The code for this feature and rework to EAL has just got continually more complicated every time due to the need to continually workaround gotchas when trying to enable this for second-level ethdevs.
/Bruce
PATCH v7 4/6 Link bonding Unit Tests
In reply to a message not in the archiveIncluding:
- 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
--- app/test/Makefile | 4 +- app/test/commands.c | 7 + app/test/packet_burst_generator.c | 287 +++ app/test/packet_burst_generator.h | 78 + app/test/test.h | 1 + app/test/test_link_bonding.c | 3958 +++++++++++++++++++++++++++++++++++++ app/test/virtual_pmd.c | 574 ++++++ app/test/virtual_pmd.h | 74 + 8 files changed, 4982 insertions(+), 1 deletions(-) create mode 100644 app/test/packet_burst_generator.c create mode 100644 app/test/packet_burst_generator.h create mode 100644 app/test/test_link_bonding.c create mode 100644 app/test/virtual_pmd.c create mode 100644 app/test/virtual_pmd.h
app/test/Makefile +3 -1
@@ -102,7 +102,9 @@ SRCS-$(CONFIG_RTE_APP_TEST) += test_ivshmem.c SRCS-$(CONFIG_RTE_APP_TEST) += test_distributor.c SRCS-$(CONFIG_RTE_APP_TEST) += test_distributor_perf.c SRCS-$(CONFIG_RTE_APP_TEST) += test_devargs.c - +SRCS-$(CONFIG_RTE_APP_TEST) += virtual_pmd.c +SRCS-$(CONFIG_RTE_APP_TEST) += packet_burst_generator.c +SRCS-$(CONFIG_RTE_APP_TEST) += test_link_bonding.c ifeq ($(CONFIG_RTE_APP_TEST),y) SRCS-$(CONFIG_RTE_LIBRTE_ACL) += test_acl.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_pmd_ring.c
app/test/commands.c +7 -0
@@ -159,6 +159,10 @@ static void cmd_autotest_parsed(void *parsed_result, ret =test_timer ();if (!strcmp (res->autotest,"timer_perf_autotest" )) ret =test_timer_perf (); +#ifdef RTE_LIBRTE_PMD_BOND +if (!strcmp (res->autotest,"link_bonding_autotest" )) + ret =test_link_bonding (); +#endif if (!strcmp (res->autotest,"mempool_autotest" )) ret =test_mempool ();if (!strcmp (res->autotest,"mempool_perf_autotest" ))
@@ -227,6 +231,9 @@ cmdline_parse_token_string_t cmd_autotest_autotest = "alarm_autotest#interrupt_autotest#" "version_autotest#eal_fs_autotest#" "cmdline_autotest#func_reentrancy_autotest#" +#ifdef RTE_LIBRTE_PMD_BOND + "link_bonding_autotest#" +#endif"mempool_perf_autotest#hash_perf_autotest#" "memcpy_perf_autotest#ring_perf_autotest#" "red_autotest#meter_autotest#sched_autotest#"
app/test/packet_burst_generator.c new file +287 -0
287 lines not on this page · raw message
app/test/packet_burst_generator.h new file +78 -0
78 lines not on this page · raw message
app/test/test.h +1 -0
@@ -97,6 +97,7 @@ int test_distributor(void);int test_distributor_perf (void );int test_kvargs (void );int test_devargs (void ); +int test_link_bonding (void );int test_pci_run;
app/test/test_link_bonding.c new file +3958 -0
2,599 lines not on this page · raw message
app/test/virtual_pmd.c new file +574 -0
574 lines not on this page · raw message
app/test/virtual_pmd.h new file +74 -0
74 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.7.0.7
Part of the diff is not shown here. View the raw message.
PATCH v7 5/6 testpmd link bonding additions
In reply to a message not in the archive - 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
--- app/test-pmd/cmdline.c | 579 +++++++++++++++++++++++++++++++++++++++++++++ app/test-pmd/config.c | 4 +- app/test-pmd/parameters.c | 3 + app/test-pmd/testpmd.c | 40 +++- app/test-pmd/testpmd.h | 2 + 5 files changed, 619 insertions(+), 9 deletions(-)
app/test-pmd/cmdline.c +579 -0
@@ -84,6 +84,9 @@#include <cmdline_socket.h> #include <cmdline.h> #include <rte_pci_dev_ids.h> +#ifdef RTE_LIBRTE_PMD_BOND +#include <rte_eth_bond.h> +#endif #include "testpmd.h"
@@ -404,6 +407,31 @@ static void cmd_help_long_parsed(void *parsed_result," Show the bypass configuration for a bypass enabled NIC" " using the lowest port on the NIC.\n\n"#endif +#ifdef RTE_LIBRTE_PMD_BOND +"create bonded device (mode) (socket)\n" +" Create a new bonded device with specific bonding mode and socket.\n\n" + +"add bonding slave (slave_id) (port_id)\n" +" Add a slave device to a bonded device.\n\n" + +"remove bonding slave (slave_id) (port_id)\n" +" Remove a slave device from a bonded device.\n\n" + +"set bonding mode (value) (port_id)\n" +" Set the bonding mode on a bonded device.\n\n" + +"set bonding primary (slave_id) (port_id)\n" +" Set the primary slave for a bonded device.\n\n" + +"show bonding config (port_id)\n" +" Show the bonding config for port_id.\n\n" + +"set bonding mac_addr (port_id) (address)\n" +" Set the MAC address of a bonded device.\n\n" + +"set bonding xmit_balance_policy (port_id) (l2|l23|l34)\n" +" Set the transmit balance policy for bonded device running in balance mode.\n\n" +#endif ,list_pkt_forwarding_modes () );
@@ -3031,6 +3059,547 @@ cmdline_parse_inst_t cmd_show_bypass_config = { };#endif +#ifdef RTE_LIBRTE_PMD_BOND +/* *** SET BONDING MODE *** */ +struct cmd_set_bonding_mode_result { +cmdline_fixed_string_t set; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t mode; +uint8_t value; +uint8_t port_id; +}; + +static void cmd_set_bonding_mode_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_set_bonding_mode_result *res = parsed_result; +portid_t port_id = res->port_id; + +/* Set the bonding mode for the relevant port. */ +if (0 !=rte_eth_bond_mode_set (port_id, res->value)) +printf ("\t Failed to set bonding mode for port = %d.\n" , port_id); +} + +cmdline_parse_token_string_t cmd_setbonding_mode_set = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_mode_result, + set,"set" ); +cmdline_parse_token_string_t cmd_setbonding_mode_bonding = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_mode_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_setbonding_mode_mode = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_mode_result, + mode,"mode" ); +cmdline_parse_token_num_t cmd_setbonding_mode_value = +TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_mode_result, + value,UINT8 ); +cmdline_parse_token_num_t cmd_setbonding_mode_port = +TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_mode_result, + port_id,UINT8 ); + +cmdline_parse_inst_t cmd_set_bonding_mode = { + .f = cmd_set_bonding_mode_parsed, + .help_str ="set bonding mode (mode_value) (port_id): Set the bonding mode for port_id" , + .data =NULL , + .tokens = { + (void *) &cmd_setbonding_mode_set, + (void *) &cmd_setbonding_mode_bonding, + (void *) &cmd_setbonding_mode_mode, + (void *) &cmd_setbonding_mode_value, + (void *) &cmd_setbonding_mode_port, +NULL + } +}; + +/* *** SET BALANCE XMIT POLICY *** */ +struct cmd_set_bonding_balance_xmit_policy_result { +cmdline_fixed_string_t set; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t balance_xmit_policy; +uint8_t port_id; +cmdline_fixed_string_t policy; +}; + +static void cmd_set_bonding_balance_xmit_policy_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_set_bonding_balance_xmit_policy_result *res = parsed_result; +portid_t port_id = res->port_id; +uint8_t policy; + +if (!strcmp (res->policy,"l2" )) { + policy =BALANCE_XMIT_POLICY_LAYER2 ; + }else if (!strcmp (res->policy,"l23" )) { + policy =BALANCE_XMIT_POLICY_LAYER23 ; + }else if (!strcmp (res->policy,"l34" )) { + policy =BALANCE_XMIT_POLICY_LAYER34 ; + }else { +printf ("\t Invalid xmit policy selection" ); +return ; + } + +/* Set the bonding mode for the relevant port. */ +if (0 !=rte_eth_bond_xmit_policy_set (port_id, policy)) { +printf ("\t Failed to set bonding balance xmit policy for port = %d.\n" , + port_id); + } +} + +cmdline_parse_token_string_t cmd_setbonding_balance_xmit_policy_set = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result, + set,"set" ); +cmdline_parse_token_string_t cmd_setbonding_balance_xmit_policy_bonding = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_setbonding_balance_xmit_policy_balance_xmit_policy = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result, + balance_xmit_policy,"balance_xmit_policy" ); +cmdline_parse_token_num_t cmd_setbonding_balance_xmit_policy_port = +TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result, + port_id,UINT8 ); +cmdline_parse_token_string_t cmd_setbonding_balance_xmit_policy_policy = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result, + policy,"l2#l23#l34" ); + +cmdline_parse_inst_t cmd_set_balance_xmit_policy = { + .f = cmd_set_bonding_balance_xmit_policy_parsed, + .help_str ="set bonding balance_xmit_policy (port_id) (policy_value): Set the bonding balance_xmit_policy for port_id" , + .data =NULL , + .tokens = { + (void *)&cmd_setbonding_balance_xmit_policy_set, + (void *)&cmd_setbonding_balance_xmit_policy_bonding, + (void *)&cmd_setbonding_balance_xmit_policy_balance_xmit_policy, + (void *)&cmd_setbonding_balance_xmit_policy_port, + (void *)&cmd_setbonding_balance_xmit_policy_policy, +NULL + } +}; + +/* *** SHOW NIC BONDING CONFIGURATION *** */ +struct cmd_show_bonding_config_result { +cmdline_fixed_string_t show; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t config; +uint8_t port_id; +}; + +static void cmd_show_bonding_config_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_show_bonding_config_result *res = parsed_result; +int bonding_mode; +uint8_t slaves[RTE_MAX_ETHPORTS ]; +int num_slaves, num_active_slaves; +int primary_id; +int i; +portid_t port_id = res->port_id; + +/* Display the bonding mode.*/ + bonding_mode =rte_eth_bond_mode_get (port_id); +if (bonding_mode <0 ) { +printf ("\tFailed to get bonding mode for port = %d\n" , port_id); +return ; + }else +printf ("\tBonding mode: %d\n" , bonding_mode); + +if (bonding_mode ==BONDING_MODE_BALANCE ) { +int balance_xmit_policy; + + balance_xmit_policy =rte_eth_bond_xmit_policy_get (port_id); +if (balance_xmit_policy <0 ) { +printf ("\tFailed to get balance xmit policy for port = %d\n" , + port_id); +return ; + }else { +printf ("\tBalance Xmit Policy: " ); + +switch (balance_xmit_policy) { +case BALANCE_XMIT_POLICY_LAYER2 : +printf ("BALANCE_XMIT_POLICY_LAYER2" ); +break ; +case BALANCE_XMIT_POLICY_LAYER23 : +printf ("BALANCE_XMIT_POLICY_LAYER23" ); +break ; +case BALANCE_XMIT_POLICY_LAYER34 : +printf ("BALANCE_XMIT_POLICY_LAYER34" ); +break ; + } +printf ("\n" ); + } + } + + num_slaves =rte_eth_bond_slaves_get (port_id, slaves,RTE_MAX_ETHPORTS ); + +if (num_slaves <0 ) { +printf ("\tFailed to get slave list for port = %d\n" , port_id); +return ; + } +if (num_slaves >0 ) { +printf ("\tSlaves (%d): [" , num_slaves); +for (i =0 ; i < num_slaves -1 ; i++) +printf ("%d " , slaves[i]); + +printf ("%d]\n" , slaves[num_slaves -1 ]); + }else { +printf ("\tSlaves: []\n" ); + + } + + num_active_slaves =rte_eth_bond_active_slaves_get (port_id, slaves, +RTE_MAX_ETHPORTS ); + +if (num_active_slaves <0 ) { +printf ("\tFailed to get active slave list for port = %d\n" , port_id); +return ; + } +if (num_active_slaves >0 ) { +printf ("\tActive Slaves (%d): [" , num_active_slaves); +for (i =0 ; i < num_active_slaves -1 ; i++) +printf ("%d " , slaves[i]); + +printf ("%d]\n" , slaves[num_active_slaves -1 ]); + + }else { +printf ("\tActive Slaves: []\n" ); + + } + + primary_id =rte_eth_bond_primary_get (port_id); +if (primary_id <0 ) { +printf ("\tFailed to get primary slave for port = %d\n" , port_id); +return ; + }else +printf ("\tPrimary: [%d]\n" , primary_id); + +} + +cmdline_parse_token_string_t cmd_showbonding_config_show = +TOKEN_STRING_INITIALIZER(struct cmd_show_bonding_config_result, + show,"show" ); +cmdline_parse_token_string_t cmd_showbonding_config_bonding = +TOKEN_STRING_INITIALIZER(struct cmd_show_bonding_config_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_showbonding_config_config = +TOKEN_STRING_INITIALIZER(struct cmd_show_bonding_config_result, + config,"config" ); +cmdline_parse_token_num_t cmd_showbonding_config_port = +TOKEN_NUM_INITIALIZER(struct cmd_show_bonding_config_result, + port_id,UINT8 ); + +cmdline_parse_inst_t cmd_show_bonding_config = { + .f = cmd_show_bonding_config_parsed, + .help_str ="show bonding config (port_id): Show the bonding config for port_id" , + .data =NULL , + .tokens = { + (void *)&cmd_showbonding_config_show, + (void *)&cmd_showbonding_config_bonding, + (void *)&cmd_showbonding_config_config, + (void *)&cmd_showbonding_config_port, +NULL + } +}; + +/* *** SET BONDING PRIMARY *** */ +struct cmd_set_bonding_primary_result { +cmdline_fixed_string_t set; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t primary; +uint8_t slave_id; +uint8_t port_id; +}; + +static void cmd_set_bonding_primary_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_set_bonding_primary_result *res = parsed_result; +portid_t master_port_id = res->port_id; +portid_t slave_port_id = res->slave_id; + +/* Set the primary slave for a bonded device. */ +if (0 !=rte_eth_bond_primary_set (master_port_id, slave_port_id)) { +printf ("\t Failed to set primary slave for port = %d.\n" , + master_port_id); +return ; + } +init_port_config (); +} + +cmdline_parse_token_string_t cmd_setbonding_primary_set = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_primary_result, + set,"set" ); +cmdline_parse_token_string_t cmd_setbonding_primary_bonding = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_primary_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_setbonding_primary_primary = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_primary_result, + primary,"primary" ); +cmdline_parse_token_num_t cmd_setbonding_primary_slave = +TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_primary_result, + slave_id,UINT8 ); +cmdline_parse_token_num_t cmd_setbonding_primary_port = +TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_primary_result, + port_id,UINT8 ); + +cmdline_parse_inst_t cmd_set_bonding_primary = { + .f = cmd_set_bonding_primary_parsed, + .help_str ="set bonding primary (slave_id) (port_id): Set the primary slave for port_id" , + .data =NULL , + .tokens = { + (void *)&cmd_setbonding_primary_set, + (void *)&cmd_setbonding_primary_bonding, + (void *)&cmd_setbonding_primary_primary, + (void *)&cmd_setbonding_primary_slave, + (void *)&cmd_setbonding_primary_port, +NULL + } +}; + +/* *** ADD SLAVE *** */ +struct cmd_add_bonding_slave_result { +cmdline_fixed_string_t add; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t slave; +uint8_t slave_id; +uint8_t port_id; +}; + +static void cmd_add_bonding_slave_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_add_bonding_slave_result *res = parsed_result; +portid_t master_port_id = res->port_id; +portid_t slave_port_id = res->slave_id; + +/* Set the primary slave for a bonded device. */ +if (0 !=rte_eth_bond_slave_add (master_port_id, slave_port_id)) { +printf ("\t Failed to add slave %d to master port = %d.\n" , + slave_port_id, master_port_id); +return ; + } +init_port_config (); +} + +cmdline_parse_token_string_t cmd_addbonding_slave_add = +TOKEN_STRING_INITIALIZER(struct cmd_add_bonding_slave_result, + add,"add" ); +cmdline_parse_token_string_t cmd_addbonding_slave_bonding = +TOKEN_STRING_INITIALIZER(struct cmd_add_bonding_slave_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_addbonding_slave_slave = +TOKEN_STRING_INITIALIZER(struct cmd_add_bonding_slave_result, + slave,"slave" ); +cmdline_parse_token_num_t cmd_addbonding_slave_slaveid = +TOKEN_NUM_INITIALIZER(struct cmd_add_bonding_slave_result, + slave_id,UINT8 ); +cmdline_parse_token_num_t cmd_addbonding_slave_port = +TOKEN_NUM_INITIALIZER(struct cmd_add_bonding_slave_result, + port_id,UINT8 ); + +cmdline_parse_inst_t cmd_add_bonding_slave = { + .f = cmd_add_bonding_slave_parsed, + .help_str ="add bonding slave (slave_id) (port_id): Add a slave device to a bonded device" , + .data =NULL , + .tokens = { + (void *)&cmd_addbonding_slave_add, + (void *)&cmd_addbonding_slave_bonding, + (void *)&cmd_addbonding_slave_slave, + (void *)&cmd_addbonding_slave_slaveid, + (void *)&cmd_addbonding_slave_port, +NULL + } +}; + +/* *** REMOVE SLAVE *** */ +struct cmd_remove_bonding_slave_result { +cmdline_fixed_string_t remove; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t slave; +uint8_t slave_id; +uint8_t port_id; +}; + +static void cmd_remove_bonding_slave_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_remove_bonding_slave_result *res = parsed_result; +portid_t master_port_id = res->port_id; +portid_t slave_port_id = res->slave_id; + +/* Set the primary slave for a bonded device. */ +if (0 !=rte_eth_bond_slave_remove (master_port_id, slave_port_id)) { +printf ("\t Failed to remove slave %d from master port = %d.\n" , + slave_port_id, master_port_id); +return ; + } +init_port_config (); +} + +cmdline_parse_token_string_t cmd_removebonding_slave_remove = + TOKEN_STRING_INITIALIZER(struct cmd_remove_bonding_slave_result, + remove,"remove" ); +cmdline_parse_token_string_t cmd_removebonding_slave_bonding = + TOKEN_STRING_INITIALIZER(struct cmd_remove_bonding_slave_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_removebonding_slave_slave = + TOKEN_STRING_INITIALIZER(struct cmd_remove_bonding_slave_result, + slave,"slave" ); +cmdline_parse_token_num_t cmd_removebonding_slave_slaveid = + TOKEN_NUM_INITIALIZER(struct cmd_remove_bonding_slave_result, + slave_id,UINT8 ); +cmdline_parse_token_num_t cmd_removebonding_slave_port = + TOKEN_NUM_INITIALIZER(struct cmd_remove_bonding_slave_result, + port_id,UINT8 ); + +cmdline_parse_inst_t cmd_remove_bonding_slave = { + .f = cmd_remove_bonding_slave_parsed, + .help_str ="remove bonding slave (slave_id) (port_id): Remove a slave device from a bonded device" , + .data =NULL , + .tokens = { + (void *)&cmd_removebonding_slave_remove, + (void *)&cmd_removebonding_slave_bonding, + (void *)&cmd_removebonding_slave_slave, + (void *)&cmd_removebonding_slave_slaveid, + (void *)&cmd_removebonding_slave_port, +NULL + } +}; + +/* *** CREATE BONDED DEVICE *** */ +struct cmd_create_bonded_device_result { +cmdline_fixed_string_t create; +cmdline_fixed_string_t bonded; +cmdline_fixed_string_t device; +uint8_t mode; +uint8_t socket; +}; + +static int bond_dev_num =0 ; + +static void cmd_create_bonded_device_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_create_bonded_device_result *res = parsed_result; +char ethdev_name[RTE_ETH_NAME_MAX_LEN ]; +int port_id; + +if (test_done ==0 ) { +printf ("Please stop forwarding first\n" ); +return ; + } + +rte_snprintf (ethdev_name,RTE_ETH_NAME_MAX_LEN ,"eth_bond_testpmd_%d" , + bond_dev_num++); + +/* Create a new bonded device. */ + port_id =rte_eth_bond_create (ethdev_name, res->mode, res->socket); +if (port_id <0 ) { +printf ("\t Failed to create bonded device.\n" ); +return ; + }else { +printf ("Created new bonded device %s on (port %d).\n" , ethdev_name, + port_id); + +/* Update number of ports */ + nb_ports =rte_eth_dev_count (); +reconfig (port_id); +rte_eth_promiscuous_enable (port_id); + } + +} + +cmdline_parse_token_string_t cmd_createbonded_device_create = + TOKEN_STRING_INITIALIZER(struct cmd_create_bonded_device_result, + create,"create" ); +cmdline_parse_token_string_t cmd_createbonded_device_bonded = + TOKEN_STRING_INITIALIZER(struct cmd_create_bonded_device_result, + bonded,"bonded" ); +cmdline_parse_token_string_t cmd_createbonded_device_device = + TOKEN_STRING_INITIALIZER(struct cmd_create_bonded_device_result, + device,"device" ); +cmdline_parse_token_num_t cmd_createbonded_device_mode = + TOKEN_NUM_INITIALIZER(struct cmd_create_bonded_device_result, + mode,UINT8 ); +cmdline_parse_token_num_t cmd_createbonded_device_socket = + TOKEN_NUM_INITIALIZER(struct cmd_create_bonded_device_result, + socket,UINT8 ); + +cmdline_parse_inst_t cmd_create_bonded_device = { + .f = cmd_create_bonded_device_parsed, + .help_str ="create bonded device (mode) (socket): Create a new bonded device with specific bonding mode and socket" , + .data =NULL , + .tokens = { + (void *)&cmd_createbonded_device_create, + (void *)&cmd_createbonded_device_bonded, + (void *)&cmd_createbonded_device_device, + (void *)&cmd_createbonded_device_mode, + (void *)&cmd_createbonded_device_socket, +NULL + } +}; + +/* *** SET MAC ADDRESS IN BONDED DEVICE *** */ +struct cmd_set_bond_mac_addr_result { +cmdline_fixed_string_t set; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t mac_addr; +uint8_t port_num; +struct ether_addr address; +}; + +static void cmd_set_bond_mac_addr_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_set_bond_mac_addr_result *res = parsed_result; +int ret; + +if (res->port_num >= nb_ports) { +printf ("Port id %d must be less than %d\n" , res->port_num, nb_ports); +return ; + } + + ret =rte_eth_bond_mac_address_set (res->port_num, &res->address); + +/* check the return value and print it if is < 0 */ +if (ret <0 ) +printf ("set_bond_mac_addr error: (%s)\n" ,strerror (-ret)); +} + +cmdline_parse_token_string_t cmd_set_bond_mac_addr_set = + TOKEN_STRING_INITIALIZER(struct cmd_set_bond_mac_addr_result, set, "set"); +cmdline_parse_token_string_t cmd_set_bond_mac_addr_bonding = + TOKEN_STRING_INITIALIZER(struct cmd_set_bond_mac_addr_result, bonding, +"bonding" ); +cmdline_parse_token_string_t cmd_set_bond_mac_addr_mac = + TOKEN_STRING_INITIALIZER(struct cmd_set_bond_mac_addr_result, mac_addr, +"mac_addr" ); +cmdline_parse_token_num_t cmd_set_bond_mac_addr_portnum = + TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mac_addr_result, port_num, UINT8); +cmdline_parse_token_etheraddr_t cmd_set_bond_mac_addr_addr = + TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_bond_mac_addr_result, address); + +cmdline_parse_inst_t cmd_set_bond_mac_addr = { + .f = cmd_set_bond_mac_addr_parsed, + .data = (void *)0 , + .help_str ="set bonding mac_addr (port_id) (address): " , + .tokens = { + (void *)&cmd_set_bond_mac_addr_set, + (void *)&cmd_set_bond_mac_addr_bonding, + (void *)&cmd_set_bond_mac_addr_mac, + (void *)&cmd_set_bond_mac_addr_portnum, + (void *)&cmd_set_bond_mac_addr_addr, +NULL + } +}; + +#endif /* RTE_LIBRTE_PMD_BOND */ +/* *** SET FORWARDING MODE *** */ struct cmd_set_fwd_mode_result {cmdline_fixed_string_t set;
@@ -6572,6 +7141,16 @@ cmdline_parse_ctx_t main_ctx[] = { (cmdline_parse_inst_t *)&cmd_set_bypass_timeout, (cmdline_parse_inst_t *)&cmd_show_bypass_config, #endif +#ifdef RTE_LIBRTE_PMD_BOND + (cmdline_parse_inst_t *) &cmd_set_bonding_mode, + (cmdline_parse_inst_t *) &cmd_show_bonding_config, + (cmdline_parse_inst_t *) &cmd_set_bonding_primary, + (cmdline_parse_inst_t *) &cmd_add_bonding_slave, + (cmdline_parse_inst_t *) &cmd_remove_bonding_slave, + (cmdline_parse_inst_t *) &cmd_create_bonded_device, + (cmdline_parse_inst_t *) &cmd_set_bond_mac_addr, + (cmdline_parse_inst_t *) &cmd_set_balance_xmit_policy, +#endif (cmdline_parse_inst_t *)&cmd_vlan_offload, (cmdline_parse_inst_t *)&cmd_vlan_tpid, (cmdline_parse_inst_t *)&cmd_rx_vlan_filter_all,
app/test-pmd/config.c +3 -1
@@ -252,6 +252,7 @@ void port_infos_display(portid_t port_id) {struct rte_port *port; +struct ether_addr mac_addr;struct rte_eth_link link;int vlan_offload;struct rte_mempool * mp;
@@ -265,7 +266,8 @@ port_infos_display(portid_t port_id)rte_eth_link_get_nowait (port_id, &link);printf ("\n%s Infos for port %-2d %s\n" , info_border, port_id, info_border); -print_ethaddr ("MAC address: " , &port->eth_addr); +rte_eth_macaddr_get (port_id, &mac_addr); +print_ethaddr ("MAC address: " , &mac_addr);printf ("\nConnect to socket: %u" , port->socket_id);if (port_numa[port_id] !=NUMA_NO_CONFIG ) {
app/test-pmd/parameters.c +3 -0
@@ -75,6 +75,9 @@#include <cmdline_parse.h> #include <cmdline_parse_etheraddr.h> #endif +#ifdef RTE_LIBRTE_PMD_BOND +#include <rte_eth_bond.h> +#endif #include "testpmd.h"
app/test-pmd/testpmd.c +32 -8
@@ -300,7 +300,7 @@ struct rte_fdir_conf fdir_conf = { .drop_queue = 127, }; -static volatile int test_done =1 ;/* stop packet forwarding when set to 1. */ +volatile int test_done =1 ;/* stop packet forwarding when set to 1. */ struct queue_stats_mappings tx_queue_stats_mappings_array[MAX_TX_QUEUE_STATS_MAPPINGS ];struct queue_stats_mappings rx_queue_stats_mappings_array[MAX_RX_QUEUE_STATS_MAPPINGS ];
@@ -625,6 +625,32 @@ init_config(void)rte_exit (EXIT_FAILURE ,"FAIL from init_fwd_streams()\n" ); } + +void +reconfig (portid_t new_port_id) +{ +struct rte_port *port; + +/* Reconfiguration of Ethernet ports. */ + ports =rte_realloc (ports, +sizeof (struct rte_port ) * nb_ports, +CACHE_LINE_SIZE ); +if (ports ==NULL ) { +rte_exit (EXIT_FAILURE ,"rte_realloc(%d struct rte_port) failed\n" , + nb_ports); + } + + port = &ports[new_port_id]; +rte_eth_dev_info_get (new_port_id, &port->dev_info); + +/* set flag to initialize port/queue */ + port->need_reconfig =1 ; + port->need_reconfig_queues =1 ; + +init_port_config (); +} + +int init_fwd_streams (void ) {
@@ -1252,7 +1278,7 @@ start_port(portid_t pid)portid_t pi;queueid_t qi;struct rte_port *port; -uint8_t *mac_addr; +struct ether_addr mac_addr;if (test_done ==0 ) {printf ("Please stop forwarding first\n" );
@@ -1380,10 +1406,11 @@ start_port(portid_t pid) RTE_PORT_HANDLING, RTE_PORT_STARTED) == 0)printf ("Port %d can not be set into started\n" , pi); - mac_addr = port->eth_addr.addr_bytes; +rte_eth_macaddr_get (pi, &mac_addr);printf ("Port %d: %02X:%02X:%02X:%02X:%02X:%02X\n" , pi, - mac_addr[0 ], mac_addr[1 ], mac_addr[2 ], - mac_addr[3 ], mac_addr[4 ], mac_addr[5 ]); + mac_addr.addr_bytes[0 ], mac_addr.addr_bytes[1 ], + mac_addr.addr_bytes[2 ], mac_addr.addr_bytes[3 ], + mac_addr.addr_bytes[4 ], mac_addr.addr_bytes[5 ]);/* at least one port started, need checking link status */ need_check_link_status =1 ;
@@ -1826,9 +1853,6 @@ main(int argc, char** argv)if (diag <0 )rte_panic ("Cannot init EAL\n" ); -if (rte_eal_pci_probe ()) -rte_panic ("Cannot probe PCI\n" ); - nb_ports = (portid_t )rte_eth_dev_count ();if (nb_ports ==0 ) rte_exit(EXIT_FAILURE, "No probed ethernet devices - "
app/test-pmd/testpmd.h +2 -0
@@ -279,6 +279,7 @@ extern uint16_t port_topology; /**< set by "--port-topology" parameter */extern uint8_t no_flush_rx;/**<set by "--no-flush-rx" parameter */ extern uint8_t mp_anon;/**< set by "--mp-anon" parameter */ extern uint8_t no_link_check;/**<set by "--disable-link-check" parameter */ +extern volatile int test_done;/* stop packet forwarding when set to 1. */ #ifdef RTE_NIC_BYPASS extern uint32_t bypass_timeout;/**< Store the NIC bypass watchdog timeout */
@@ -452,6 +453,7 @@ void fwd_config_display(void);void rxtx_config_display (void );void fwd_config_setup (void );void set_def_fwd_config (void ); +void reconfig (portid_t new_port_id);int init_fwd_streams (void );void port_mtu_set (portid_t port_id,uint16_t mtu);
Signature · 1 line
1.7.0.7
PATCH v7 6/6 Link Bonding Library doxygen additions
In reply to a message not in the archive--- doc/doxy-api-index.md | 1 + doc/doxy-api.conf | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
doc/doxy-api-index.md +1 -0
@@ -36,6 +36,7 @@ API {#index} There are many libraries, so their headers may be grouped by topics: - **device**: + [bond] (@ref rte_eth_bond.h), [ethdev] (@ref rte_ethdev.h), [devargs] (@ref rte_devargs.h), [KNI] (@ref rte_kni.h),
doc/doxy-api.conf +1 -0
@@ -30,6 +30,7 @@ PROJECT_NAME = DPDK INPUT = doc/doxy-api-index.md \ + lib/librte_pmd_bond \ lib/librte_eal/common/include \ lib/librte_acl \ lib/librte_distributor \
Signature · 1 line
1.7.0.7
A message that is not in the archive (sent off-list or not yet received): 1403625828-20956-7-git-send-email-declan.doherty-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org
Re: [PATCH v7 6/6] Link Bonding Library doxygen additions
Hi Declan,
Since bonding library is a PMD, there should have no need of integrate it in the API documentation.
I hadn't time to review it yet, so I would miss something.
Do you mean it can be used directly by the application with a specific API? In this case, you could explain it in the commit log.
2014-06-24 17:03, Declan Doherty:
doc/doxy-api-index.md API {#index} · line 42
Quoted 10 lines
doc/doxy-api-index.md +1
-0@@ -36,6 +36,7 @@ API {#index} There are many libraries, so their headers may be grouped by topics: - **device**: + [bond] (@ref rte_eth_bond.h), [ethdev] (@ref rte_ethdev.h), [devargs] (@ref rte_devargs.h), [KNI] (@ref rte_kni.h),
ethdev should be first in this list.
doc/doxy-api.conf line 36
Quoted 10 lines
doc/doxy-api.conf +1
-0@@ -30,6 +30,7 @@ PROJECT_NAME = DPDK INPUT = doc/doxy-api-index.md \ + lib/librte_pmd_bond \ lib/librte_eal/common/include \ lib/librte_acl \ lib/librte_distributor \
Libraries should be in alphabetical order here.
Thanks
Signature · 1 line
Thomas
Re: [PATCH v7 6/6] Link Bonding Library doxygen additions
Quoted 7 lines
-----Original Message-----
From: Thomas Monjalon [mailto:[email protected]]
Sent: Wednesday, June 25, 2014 2:44 PM
To: Doherty, Declan
Cc: [email protected]
Subject: Re: [PATCH v7 6/6] Link Bonding Library doxygen additions
Quoted 8 lines
Hi Declan,
Since bonding library is a PMD, there should have no need of integrate it in the API documentation.
I hadn't time to review it yet, so I would miss something.
Do you mean it can be used directly by the application with a specific API? In this case, you could explain it in the commit log.
Hi Thomas, the bonding library has a API which supports creation and management of bonded devices directly from within applications, but more importantly provides the APIs required to dynamically add and remove slaves from a bonded device, this functionality will be required to support live migration of VMs using bonded ports in a future releases.
A message that is not in the archive (sent off-list or not yet received): 345C63BAECC1AD42A2EC8C63AFFC3ADC272FA3EA-kPTMFJFq+rF9qrmMLTLiibfspsVTdybXVpNB7YpNyf8@public.gmane.org
Re: [PATCH v7 6/6] Link Bonding Library doxygen additions
2014-06-25 14:19, Doherty, Declan:
Quoted 16 lines
Quoted 7 lines
-----Original Message-----
From: Thomas Monjalon [mailto:[email protected]]
Sent: Wednesday, June 25, 2014 2:44 PM
To: Doherty, Declan
Cc: [email protected]
Subject: Re: [PATCH v7 6/6] Link Bonding Library doxygen additionsQuoted 8 lines
Hi Declan,
Since bonding library is a PMD, there should have no need of integrate it in the API documentation.
I hadn't time to review it yet, so I would miss something.
Do you mean it can be used directly by the application with a specific API?
In this case, you could explain it in the commit log.
Quoted 5 lines
Hi Thomas, the bonding library has a API which supports creation and management of bonded devices directly from within applications, but more importantly provides the APIs required to dynamically add and remove slaves from a bonded device, this functionality will be required to support live migration of VMs using bonded ports in a future releases.
OK. Could I suggest to split rte_eth_bond.c in 2 files?
1 file for the library matching the API and 1 file for the PMD layer? I feel it would be easier to read and maintain.
Thanks
Signature · 1 line
Thomas
PATCH v6 1/6 Link Bonding Library (lib/librte_pmd_bond)
In reply to a message not in the archiveInitial release with support for
Mode 0 - Round Robin
Mode 1 - Active Backup
Mode 2 - Balance -> Supports 3 transmit polices (layer 2, layer 2+3, layer 3+4) Mode 3 - Broadcast
--- config/common_bsdapp | 5 + config/common_linuxapp | 5 + lib/Makefile | 1 + lib/librte_pmd_bond/Makefile | 32 + lib/librte_pmd_bond/rte_eth_bond.c | 2142 ++++++++++++++++++++++++++++++++++++ lib/librte_pmd_bond/rte_eth_bond.h | 255 +++++ mk/rte.app.mk | 5 + 7 files changed, 2445 insertions(+), 0 deletions(-) create mode 100644 lib/librte_pmd_bond/Makefile create mode 100644 lib/librte_pmd_bond/rte_eth_bond.c create mode 100644 lib/librte_pmd_bond/rte_eth_bond.h
config/common_bsdapp +5 -0
@@ -206,6 +206,11 @@ CONFIG_RTE_PMD_RING_MAX_TX_RINGS=16 CONFIG_RTE_LIBRTE_PMD_PCAP=y # +# Compile link bonding pmd library +# +CONFIG_RTE_LIBRTE_PMD_BOND=y + +# # Do prefetch of packet data within PMD driver receive function # CONFIG_RTE_PMD_PACKET_PREFETCH=y
config/common_linuxapp +5 -0
@@ -244,6 +244,11 @@ CONFIG_RTE_PMD_RING_MAX_TX_RINGS=16 CONFIG_RTE_LIBRTE_PMD_PCAP=n # +# Compile link bonding pmd library +# +CONFIG_RTE_LIBRTE_PMD_BOND=y + +# # Compile Xen PMD # CONFIG_RTE_LIBRTE_PMD_XENVIRT=n
lib/Makefile +1 -0
@@ -49,6 +49,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += librte_pmd_pcap DIRS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += librte_pmd_virtio DIRS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += librte_pmd_vmxnet3 DIRS-$(CONFIG_RTE_LIBRTE_PMD_XENVIRT) += librte_pmd_xenvirt +DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += librte_pmd_bond DIRS-$(CONFIG_RTE_LIBRTE_HASH) += librte_hash DIRS-$(CONFIG_RTE_LIBRTE_LPM) += librte_lpm DIRS-$(CONFIG_RTE_LIBRTE_ACL) += librte_acl
lib/librte_pmd_bond/Makefile new file +32 -0
@@ -0,0 +1,32 @@ +# <COPYRIGHT_TAG> + +include $(RTE_SDK)/mk/rte.vars.mk + +# +# library name +# +LIB = librte_pmd_bond.a + +CFLAGS += -O3 +CFLAGS += $(WERROR_FLAGS) + +# +# all source are stored in SRCS-y +# +SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond.c + + +# +# Export include files +# +SYMLINK-y-include += rte_eth_bond.h + + +# this lib depends upon: +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += lib/librte_mbuf +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += lib/librte_ether +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += lib/librte_malloc +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += lib/librte_eal +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += lib/librte_kvargs + +include $(RTE_SDK)/mk/rte.lib.mk
lib/librte_pmd_bond/rte_eth_bond.c new file +2142 -0
2,142 lines not on this page · raw message
lib/librte_pmd_bond/rte_eth_bond.h new file +255 -0
255 lines not on this page · raw message
mk/rte.app.mk +5 -0
@@ -205,8 +205,13 @@ ifeq ($(CONFIG_RTE_LIBRTE_PMD_PCAP),y) LDLIBS += -lrte_pmd_pcap -lpcap endif +ifeq ($(CONFIG_RTE_LIBRTE_PMD_BOND),y) +LDLIBS += -lrte_pmd_bond endif +endif + + LDLIBS += $(EXECENV_LDLIBS) LDLIBS += --end-group
Signature · 1 line
1.7.0.7
PATCH v6 2/6 Support for unique interface naming of pmds
In reply to a message not in the archiveAdding support to rte_eth_dev_data structure to support unique name identifier for ethdevs to support adding slave ethdevs (specifically virtual devices which have no public unique identifier) to a link bonding device. This changes the API rte_eth_dev_allocate() to require a const char *name when allocating a ethdev, which also verifies that the name is unique and hasn’t been already used by an existed allocated rte_eth_dev. Also contains updates to virtual pmd’s to now call the API with a name parameter.
--- lib/librte_ether/rte_ethdev.c | 32 +++++++++++++++++++++++++++-- lib/librte_ether/rte_ethdev.h | 7 +++++- lib/librte_pmd_pcap/rte_eth_pcap.c | 22 ++++++++++---------- lib/librte_pmd_ring/rte_eth_ring.c | 32 +++++++++++++++-------------- lib/librte_pmd_ring/rte_eth_ring.h | 3 +- lib/librte_pmd_xenvirt/rte_eth_xenvirt.c | 2 +- 6 files changed, 66 insertions(+), 32 deletions(-)
lib/librte_ether/rte_ethdev.c +29 -3
@@ -65,6 +65,7 @@#include <rte_mbuf.h> #include <rte_errno.h> #include <rte_spinlock.h> +#include <rte_string_fns.h> #include "rte_ether.h" #include "rte_ethdev.h"
@@ -153,21 +154,40 @@ rte_eth_dev_data_alloc(void) RTE_MAX_ETHPORTS * sizeof(*rte_eth_dev_data)); } +static struct rte_eth_dev * +rte_eth_dev_allocated (const char *name) +{ +unsigned i; + +for (i =0 ; i < nb_ports; i++) { +if (strcmp (rte_eth_devices[i].data->name, name) ==0 ) +return &rte_eth_devices[i]; + } +return NULL ; +} +struct rte_eth_dev * -rte_eth_dev_allocate (void ) +rte_eth_dev_allocate (const char *name) {struct rte_eth_dev *eth_dev;if (nb_ports ==RTE_MAX_ETHPORTS ) { -PMD_DEBUG_TRACE ("Reached maximum number of ethernet ports\n" ); +PMD_DEBUG_TRACE ("Reached maximum number of Ethernet ports\n" );return NULL ; }if (rte_eth_dev_data ==NULL )rte_eth_dev_data_alloc (); +if (rte_eth_dev_allocated (name) !=NULL ) { +PMD_DEBUG_TRACE ("Ethernet Device with name %s already allocated!\n" ); +return NULL ; + } + eth_dev = &rte_eth_devices[nb_ports]; eth_dev->data = &rte_eth_dev_data[nb_ports]; +rte_snprintf (eth_dev->data->name,sizeof (eth_dev->data->name), +"%s" , name); eth_dev->data->port_id = nb_ports++;return eth_dev; }
@@ -178,11 +198,17 @@ rte_eth_dev_init(struct rte_pci_driver *pci_drv, {struct eth_driver *eth_drv;struct rte_eth_dev *eth_dev; +char ethdev_name[RTE_ETH_NAME_MAX_LEN ]; +int diag; eth_drv = (struct eth_driver *)pci_drv; - eth_dev =rte_eth_dev_allocate (); +/* Create unique Ethernet device name using PCI address */ +rte_snprintf (ethdev_name,RTE_ETH_NAME_MAX_LEN ,"%d:%d.%d" , + pci_dev->addr.bus, pci_dev->addr.devid, pci_dev->addr.function); + + eth_dev =rte_eth_dev_allocate (ethdev_name);if (eth_dev ==NULL )return -ENOMEM ;
lib/librte_ether/rte_ethdev.h +6 -1
@@ -1497,6 +1497,8 @@ struct rte_eth_dev_sriov { };#define RTE_ETH_DEV_SRIOV (dev) ((dev)->data->sriov) +#define RTE_ETH_NAME_MAX_LEN (32) +/** * @internal * The data part, with no function pointers, associated with each ethernet device.
@@ -1505,6 +1507,8 @@ struct rte_eth_dev_sriov {* processes in a multi-process configuration. */ struct rte_eth_dev_data { +char name[RTE_ETH_NAME_MAX_LEN ];/**< Unique identifier name */ +void **rx_queues;/**< Array of pointers to RX queues. */ void **tx_queues;/**< Array of pointers to TX queues. */ uint16_t nb_rx_queues;/**< Number of RX queues. */
@@ -1560,10 +1564,11 @@ extern uint8_t rte_eth_dev_count(void);* Allocates a new ethdev slot for an ethernet device and returns the pointer * to that slot for the driver to use. * +* @param name Unique identifier name for each Ethernet device * @return * - Slot in the rte_dev_devices array for a new device; */ -struct rte_eth_dev *rte_eth_dev_allocate (void ); +struct rte_eth_dev *rte_eth_dev_allocate (const char *name);struct eth_driver ;/**
lib/librte_pmd_pcap/rte_eth_pcap.c +11 -11
@@ -534,7 +534,7 @@ open_tx_iface(const char *key __rte_unused, const char *value, void *extra_args) static int -rte_pmd_init_internals(const unsigned nb_rx_queues, +rte_pmd_init_internals(const char *name, const unsigned nb_rx_queues, const unsigned nb_tx_queues, const unsigned numa_node, struct pmd_internals **internals,
@@ -558,20 +558,20 @@ rte_pmd_init_internals(const unsigned nb_rx_queues,/* now do all data allocation - for eth_dev structure, dummy pci driver * and internal (private) data */ - data =rte_zmalloc_socket (NULL ,sizeof (*data),0 , numa_node); + data =rte_zmalloc_socket (name,sizeof (*data),0 , numa_node);if (data ==NULL ) goto error; - pci_dev =rte_zmalloc_socket (NULL ,sizeof (*pci_dev),0 , numa_node); + pci_dev =rte_zmalloc_socket (name,sizeof (*pci_dev),0 , numa_node);if (pci_dev ==NULL ) goto error; - *internals =rte_zmalloc_socket (NULL ,sizeof (**internals),0 , numa_node); + *internals =rte_zmalloc_socket (name,sizeof (**internals),0 , numa_node);if (*internals ==NULL ) goto error;/* reserve an ethdev entry */ - *eth_dev =rte_eth_dev_allocate (); + *eth_dev =rte_eth_dev_allocate (name);if (*eth_dev ==NULL ) goto error;
@@ -617,7 +617,7 @@ rte_pmd_init_internals(const unsigned nb_rx_queues, } static int -rte_eth_from_pcaps_n_dumpers(pcap_t * const rx_queues[], +rte_eth_from_pcaps_n_dumpers(const char *name, pcap_t * const rx_queues[], const unsigned nb_rx_queues, pcap_dumper_t * const tx_queues[], const unsigned nb_tx_queues,
@@ -634,7 +634,7 @@ rte_eth_from_pcaps_n_dumpers(pcap_t * const rx_queues[],if (tx_queues ==NULL && nb_tx_queues >0 )return -1 ; -if (rte_pmd_init_internals (nb_rx_queues, nb_tx_queues, numa_node, +if (rte_pmd_init_internals (name, nb_rx_queues, nb_tx_queues, numa_node, &internals, ð_dev, kvlist) <0 )return -1 ;
@@ -652,7 +652,7 @@ rte_eth_from_pcaps_n_dumpers(pcap_t * const rx_queues[], } static int -rte_eth_from_pcaps(pcap_t * const rx_queues[], +rte_eth_from_pcaps(const char *name, pcap_t * const rx_queues[], const unsigned nb_rx_queues, pcap_t * const tx_queues[], const unsigned nb_tx_queues,
@@ -669,7 +669,7 @@ rte_eth_from_pcaps(pcap_t * const rx_queues[],if (tx_queues ==NULL && nb_tx_queues >0 )return -1 ; -if (rte_pmd_init_internals (nb_rx_queues, nb_tx_queues, numa_node, +if (rte_pmd_init_internals (name, nb_rx_queues, nb_tx_queues, numa_node, &internals, ð_dev, kvlist) <0 )return -1 ;
@@ -760,10 +760,10 @@ rte_pmd_pcap_devinit(const char *name, const char *params)return -1 ;if (using_dumpers) -return rte_eth_from_pcaps_n_dumpers (pcaps.pcaps, pcaps.num_of_rx, +return rte_eth_from_pcaps_n_dumpers (name, pcaps.pcaps, pcaps.num_of_rx, dumpers.dumpers, dumpers.num_of_tx, numa_node, kvlist); -return rte_eth_from_pcaps (pcaps.pcaps, pcaps.num_of_rx, dumpers.pcaps, +return rte_eth_from_pcaps (name, pcaps.pcaps, pcaps.num_of_rx, dumpers.pcaps, dumpers.num_of_tx, numa_node, kvlist); }
lib/librte_pmd_ring/rte_eth_ring.c +17 -15
@@ -219,7 +219,7 @@ static struct eth_dev_ops ops = { }; int -rte_eth_from_rings(struct rte_ring *const rx_queues[], +rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[], const unsigned nb_rx_queues, struct rte_ring *const tx_queues[], const unsigned nb_tx_queues,
@@ -243,20 +243,20 @@ rte_eth_from_rings(struct rte_ring *const rx_queues[],/* now do all data allocation - for eth_dev structure, dummy pci driver * and internal (private) data */ - data =rte_zmalloc_socket (NULL ,sizeof (*data),0 , numa_node); + data =rte_zmalloc_socket (name,sizeof (*data),0 , numa_node);if (data ==NULL ) goto error; - pci_dev =rte_zmalloc_socket (NULL ,sizeof (*pci_dev),0 , numa_node); + pci_dev =rte_zmalloc_socket (name,sizeof (*pci_dev),0 , numa_node);if (pci_dev ==NULL ) goto error; - internals =rte_zmalloc_socket (NULL ,sizeof (*internals),0 , numa_node); + internals =rte_zmalloc_socket (name,sizeof (*internals),0 , numa_node);if (internals ==NULL ) goto error;/* reserve an ethdev entry */ - eth_dev =rte_eth_dev_allocate (); + eth_dev =rte_eth_dev_allocate (name);if (eth_dev ==NULL ) goto error;
@@ -335,7 +335,7 @@ eth_dev_ring_create(const char *name, const unsigned numa_node,return -1 ; } -if (rte_eth_from_rings (rxtx, num_rings, rxtx, num_rings, numa_node)) +if (rte_eth_from_rings (name, rxtx, num_rings, rxtx, num_rings, numa_node))return -1 ;return 0 ;
@@ -352,29 +352,31 @@ eth_dev_ring_pair_create(const char *name, const unsigned numa_node,struct rte_ring *rx[RTE_PMD_RING_MAX_RX_RINGS ];struct rte_ring *tx[RTE_PMD_RING_MAX_TX_RINGS ];unsigned i; -char rng_name[RTE_RING_NAMESIZE ]; +char rx_rng_name[RTE_RING_NAMESIZE ]; +char tx_rng_name[RTE_RING_NAMESIZE ];unsigned num_rings =RTE_MIN (RTE_PMD_RING_MAX_RX_RINGS ,RTE_PMD_RING_MAX_TX_RINGS );for (i =0 ; i < num_rings; i++) { -rte_snprintf (rng_name,sizeof (rng_name),"ETH_RX%u_%s" , i, name); +rte_snprintf (rx_rng_name,sizeof (rx_rng_name),"ETH_RX%u_%s" , i, name); rx[i] = (action ==DEV_CREATE ) ? -rte_ring_create (rng_name,1024 , numa_node, +rte_ring_create (rx_rng_name,1024 , numa_node,RING_F_SP_ENQ |RING_F_SC_DEQ ) : -rte_ring_lookup (rng_name); +rte_ring_lookup (rx_rng_name);if (rx[i] ==NULL )return -1 ; -rte_snprintf (rng_name,sizeof (rng_name),"ETH_TX%u_%s" , i, name); +rte_snprintf (tx_rng_name,sizeof (tx_rng_name),"ETH_TX%u_%s" , i, name); tx[i] = (action ==DEV_CREATE ) ? -rte_ring_create (rng_name,1024 , numa_node, +rte_ring_create (tx_rng_name,1024 , numa_node,RING_F_SP_ENQ |RING_F_SC_DEQ ): -rte_ring_lookup (rng_name); +rte_ring_lookup (tx_rng_name);if (tx[i] ==NULL )return -1 ; } -if (rte_eth_from_rings (rx, num_rings, tx, num_rings, numa_node) || -rte_eth_from_rings (tx, num_rings, rx, num_rings, numa_node) ) +if (rte_eth_from_rings (rx_rng_name, rx, num_rings, tx, num_rings, + numa_node) ||rte_eth_from_rings (tx_rng_name, tx, num_rings, rx, + num_rings, numa_node))return -1 ;return 0 ;
lib/librte_pmd_ring/rte_eth_ring.h +2 -1
@@ -40,7 +40,8 @@ extern "C" {#include <rte_ring.h> -int rte_eth_from_rings(struct rte_ring * const rx_queues[], +int rte_eth_from_rings(const char *name, + struct rte_ring * const rx_queues[], const unsigned nb_rx_queues, struct rte_ring *const tx_queues[], const unsigned nb_tx_queues,
lib/librte_pmd_xenvirt/rte_eth_xenvirt.c +1 -1
@@ -647,7 +647,7 @@ eth_dev_xenvirt_create(const char *name, const char *params, goto err;/* reserve an ethdev entry */ - eth_dev =rte_eth_dev_allocate (); + eth_dev =rte_eth_dev_allocate (name);if (eth_dev ==NULL ) goto err;
Signature · 1 line
1.7.0.7
PATCH v6 3/6 EAL support for link bonding device initialization
In reply to a message not in the archiveUpdating 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.
--- 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 | 13 +++++- lib/librte_eal/linuxapp/eal/eal.c | 11 +++++- 6 files changed, 73 insertions(+), 29 deletions(-)
lib/librte_eal/bsdapp/eal/eal.c +9 -1
@@ -874,7 +874,7 @@ rte_eal_init(int argc, char **argv)rte_eal_mcfg_complete (); -if (rte_eal_dev_init () <0 ) +if (rte_eal_dev_init (PMD_INIT_PRE_PCI_PROBE ) <0 )rte_panic ("Cannot init pmd devices\n" );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 (); +/* 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; }
lib/librte_eal/common/eal_common_dev.c +40 -18
77 lines not on this page · raw message
lib/librte_eal/common/eal_common_pci.c +3 -0
@@ -150,6 +150,9 @@ rte_eal_pci_probe(void) probe_all =1 ; TAILQ_FOREACH(dev, &pci_device_list, next) { +/* check if device has already been initialized */ +if (dev->driver !=NULL ) +continue ;/* set devargs in PCI structure */ devargs =pci_devargs_lookup (dev);
lib/librte_eal/common/include/eal_private.h +0 -7
@@ -196,11 +196,4 @@ int rte_eal_intr_init(void);*/ int rte_eal_alarm_init (void ); -/** -* This function initialises any virtual devices -* -* This function is private to the EAL. -*/ -int rte_eal_dev_init (void ); -#endif /* _EAL_PRIVATE_H_ */
lib/librte_eal/common/include/rte_dev.h +11 -2
@@ -62,6 +62,15 @@ 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*/ +}; + +#define RTE_PMD_BOND ("eth_bond") +/** +* Driver initialization */ +enum pmd_init_priority { +PMD_INIT_PRE_PCI_PROBE =0 , +PMD_INIT_POST_PCI_PROBE =1 , };/**
@@ -93,9 +102,9 @@ void rte_eal_driver_register(struct rte_driver *driver);void rte_eal_driver_unregister (struct rte_driver *driver);/** -* 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);#define PMD_REGISTER_DRIVER (d)\ void devinitfn_ ##d(void);\
lib/librte_eal/linuxapp/eal/eal.c +10 -1
@@ -75,6 +75,7 @@#include <rte_atomic.h> #include <malloc_heap.h> #include <rte_eth_ring.h> +#include <rte_dev.h> #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=%x)\n" , rte_config.master_lcore, (int )thread_id); -if (rte_eal_dev_init () <0 ) +if (rte_eal_dev_init (PMD_INIT_PRE_PCI_PROBE ) <0 )rte_panic ("Cannot init pmd devices\n" );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 (); +/* 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; }
Signature · 1 line
1.7.0.7
PATCH v6 4/6 Link bonding Unit Tests
In reply to a message not in the archiveIncluding:
- 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
--- app/test/Makefile | 4 +- app/test/commands.c | 7 + app/test/packet_burst_generator.c | 287 +++ app/test/packet_burst_generator.h | 78 + app/test/test.h | 1 + app/test/test_link_bonding.c | 3958 +++++++++++++++++++++++++++++++++++++ app/test/virtual_pmd.c | 574 ++++++ app/test/virtual_pmd.h | 74 + 8 files changed, 4982 insertions(+), 1 deletions(-) create mode 100644 app/test/packet_burst_generator.c create mode 100644 app/test/packet_burst_generator.h create mode 100644 app/test/test_link_bonding.c create mode 100644 app/test/virtual_pmd.c create mode 100644 app/test/virtual_pmd.h
app/test/Makefile +3 -1
@@ -102,7 +102,9 @@ SRCS-$(CONFIG_RTE_APP_TEST) += test_ivshmem.c SRCS-$(CONFIG_RTE_APP_TEST) += test_distributor.c SRCS-$(CONFIG_RTE_APP_TEST) += test_distributor_perf.c SRCS-$(CONFIG_RTE_APP_TEST) += test_devargs.c - +SRCS-$(CONFIG_RTE_APP_TEST) += virtual_pmd.c +SRCS-$(CONFIG_RTE_APP_TEST) += packet_burst_generator.c +SRCS-$(CONFIG_RTE_APP_TEST) += test_link_bonding.c ifeq ($(CONFIG_RTE_APP_TEST),y) SRCS-$(CONFIG_RTE_LIBRTE_ACL) += test_acl.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_pmd_ring.c
app/test/commands.c +7 -0
@@ -159,6 +159,10 @@ static void cmd_autotest_parsed(void *parsed_result, ret =test_timer ();if (!strcmp (res->autotest,"timer_perf_autotest" )) ret =test_timer_perf (); +#ifdef RTE_LIBRTE_PMD_BOND +if (!strcmp (res->autotest,"link_bonding_autotest" )) + ret =test_link_bonding (); +#endif if (!strcmp (res->autotest,"mempool_autotest" )) ret =test_mempool ();if (!strcmp (res->autotest,"mempool_perf_autotest" ))
@@ -227,6 +231,9 @@ cmdline_parse_token_string_t cmd_autotest_autotest = "alarm_autotest#interrupt_autotest#" "version_autotest#eal_fs_autotest#" "cmdline_autotest#func_reentrancy_autotest#" +#ifdef RTE_LIBRTE_PMD_BOND + "link_bonding_autotest#" +#endif"mempool_perf_autotest#hash_perf_autotest#" "memcpy_perf_autotest#ring_perf_autotest#" "red_autotest#meter_autotest#sched_autotest#"
app/test/packet_burst_generator.c new file +287 -0
287 lines not on this page · raw message
app/test/packet_burst_generator.h new file +78 -0
78 lines not on this page · raw message
app/test/test.h +1 -0
@@ -97,6 +97,7 @@ int test_distributor(void);int test_distributor_perf (void );int test_kvargs (void );int test_devargs (void ); +int test_link_bonding (void );int test_pci_run;
app/test/test_link_bonding.c new file +3958 -0
2,599 lines not on this page · raw message
app/test/virtual_pmd.c new file +574 -0
574 lines not on this page · raw message
app/test/virtual_pmd.h new file +74 -0
74 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.7.0.7
Part of the diff is not shown here. View the raw message.
PATCH v6 5/6 testpmd link bonding additions
In reply to a message not in the archive - 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
--- app/test-pmd/cmdline.c | 579 +++++++++++++++++++++++++++++++++++++++++++++ app/test-pmd/config.c | 4 +- app/test-pmd/parameters.c | 3 + app/test-pmd/testpmd.c | 40 +++- app/test-pmd/testpmd.h | 2 + 5 files changed, 619 insertions(+), 9 deletions(-)
app/test-pmd/cmdline.c +579 -0
@@ -84,6 +84,9 @@#include <cmdline_socket.h> #include <cmdline.h> #include <rte_pci_dev_ids.h> +#ifdef RTE_LIBRTE_PMD_BOND +#include <rte_eth_bond.h> +#endif #include "testpmd.h"
@@ -404,6 +407,31 @@ static void cmd_help_long_parsed(void *parsed_result," Show the bypass configuration for a bypass enabled NIC" " using the lowest port on the NIC.\n\n"#endif +#ifdef RTE_LIBRTE_PMD_BOND +"create bonded device (mode) (socket)\n" +" Create a new bonded device with specific bonding mode and socket.\n\n" + +"add bonding slave (slave_id) (port_id)\n" +" Add a slave device to a bonded device.\n\n" + +"remove bonding slave (slave_id) (port_id)\n" +" Remove a slave device from a bonded device.\n\n" + +"set bonding mode (value) (port_id)\n" +" Set the bonding mode on a bonded device.\n\n" + +"set bonding primary (slave_id) (port_id)\n" +" Set the primary slave for a bonded device.\n\n" + +"show bonding config (port_id)\n" +" Show the bonding config for port_id.\n\n" + +"set bonding mac_addr (port_id) (address)\n" +" Set the MAC address of a bonded device.\n\n" + +"set bonding xmit_balance_policy (port_id) (l2|l23|l34)\n" +" Set the transmit balance policy for bonded device running in balance mode.\n\n" +#endif ,list_pkt_forwarding_modes () );
@@ -3031,6 +3059,547 @@ cmdline_parse_inst_t cmd_show_bypass_config = { };#endif +#ifdef RTE_LIBRTE_PMD_BOND +/* *** SET BONDING MODE *** */ +struct cmd_set_bonding_mode_result { +cmdline_fixed_string_t set; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t mode; +uint8_t value; +uint8_t port_id; +}; + +static void cmd_set_bonding_mode_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_set_bonding_mode_result *res = parsed_result; +portid_t port_id = res->port_id; + +/* Set the bonding mode for the relevant port. */ +if (0 !=rte_eth_bond_mode_set (port_id, res->value)) +printf ("\t Failed to set bonding mode for port = %d.\n" , port_id); +} + +cmdline_parse_token_string_t cmd_setbonding_mode_set = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_mode_result, + set,"set" ); +cmdline_parse_token_string_t cmd_setbonding_mode_bonding = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_mode_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_setbonding_mode_mode = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_mode_result, + mode,"mode" ); +cmdline_parse_token_num_t cmd_setbonding_mode_value = +TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_mode_result, + value,UINT8 ); +cmdline_parse_token_num_t cmd_setbonding_mode_port = +TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_mode_result, + port_id,UINT8 ); + +cmdline_parse_inst_t cmd_set_bonding_mode = { + .f = cmd_set_bonding_mode_parsed, + .help_str ="set bonding mode (mode_value) (port_id): Set the bonding mode for port_id" , + .data =NULL , + .tokens = { + (void *) &cmd_setbonding_mode_set, + (void *) &cmd_setbonding_mode_bonding, + (void *) &cmd_setbonding_mode_mode, + (void *) &cmd_setbonding_mode_value, + (void *) &cmd_setbonding_mode_port, +NULL + } +}; + +/* *** SET BALANCE XMIT POLICY *** */ +struct cmd_set_bonding_balance_xmit_policy_result { +cmdline_fixed_string_t set; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t balance_xmit_policy; +uint8_t port_id; +cmdline_fixed_string_t policy; +}; + +static void cmd_set_bonding_balance_xmit_policy_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_set_bonding_balance_xmit_policy_result *res = parsed_result; +portid_t port_id = res->port_id; +uint8_t policy; + +if (!strcmp (res->policy,"l2" )) { + policy =BALANCE_XMIT_POLICY_LAYER2 ; + }else if (!strcmp (res->policy,"l23" )) { + policy =BALANCE_XMIT_POLICY_LAYER23 ; + }else if (!strcmp (res->policy,"l34" )) { + policy =BALANCE_XMIT_POLICY_LAYER34 ; + }else { +printf ("\t Invalid xmit policy selection" ); +return ; + } + +/* Set the bonding mode for the relevant port. */ +if (0 !=rte_eth_bond_xmit_policy_set (port_id, policy)) { +printf ("\t Failed to set bonding balance xmit policy for port = %d.\n" , + port_id); + } +} + +cmdline_parse_token_string_t cmd_setbonding_balance_xmit_policy_set = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result, + set,"set" ); +cmdline_parse_token_string_t cmd_setbonding_balance_xmit_policy_bonding = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_setbonding_balance_xmit_policy_balance_xmit_policy = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result, + balance_xmit_policy,"balance_xmit_policy" ); +cmdline_parse_token_num_t cmd_setbonding_balance_xmit_policy_port = +TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result, + port_id,UINT8 ); +cmdline_parse_token_string_t cmd_setbonding_balance_xmit_policy_policy = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result, + policy,"l2#l23#l34" ); + +cmdline_parse_inst_t cmd_set_balance_xmit_policy = { + .f = cmd_set_bonding_balance_xmit_policy_parsed, + .help_str ="set bonding balance_xmit_policy (port_id) (policy_value): Set the bonding balance_xmit_policy for port_id" , + .data =NULL , + .tokens = { + (void *)&cmd_setbonding_balance_xmit_policy_set, + (void *)&cmd_setbonding_balance_xmit_policy_bonding, + (void *)&cmd_setbonding_balance_xmit_policy_balance_xmit_policy, + (void *)&cmd_setbonding_balance_xmit_policy_port, + (void *)&cmd_setbonding_balance_xmit_policy_policy, +NULL + } +}; + +/* *** SHOW NIC BONDING CONFIGURATION *** */ +struct cmd_show_bonding_config_result { +cmdline_fixed_string_t show; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t config; +uint8_t port_id; +}; + +static void cmd_show_bonding_config_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_show_bonding_config_result *res = parsed_result; +int bonding_mode; +uint8_t slaves[RTE_MAX_ETHPORTS ]; +int num_slaves, num_active_slaves; +int primary_id; +int i; +portid_t port_id = res->port_id; + +/* Display the bonding mode.*/ + bonding_mode =rte_eth_bond_mode_get (port_id); +if (bonding_mode <0 ) { +printf ("\tFailed to get bonding mode for port = %d\n" , port_id); +return ; + }else +printf ("\tBonding mode: %d\n" , bonding_mode); + +if (bonding_mode ==BONDING_MODE_BALANCE ) { +int balance_xmit_policy; + + balance_xmit_policy =rte_eth_bond_xmit_policy_get (port_id); +if (balance_xmit_policy <0 ) { +printf ("\tFailed to get balance xmit policy for port = %d\n" , + port_id); +return ; + }else { +printf ("\tBalance Xmit Policy: " ); + +switch (balance_xmit_policy) { +case BALANCE_XMIT_POLICY_LAYER2 : +printf ("BALANCE_XMIT_POLICY_LAYER2" ); +break ; +case BALANCE_XMIT_POLICY_LAYER23 : +printf ("BALANCE_XMIT_POLICY_LAYER23" ); +break ; +case BALANCE_XMIT_POLICY_LAYER34 : +printf ("BALANCE_XMIT_POLICY_LAYER34" ); +break ; + } +printf ("\n" ); + } + } + + num_slaves =rte_eth_bond_slaves_get (port_id, slaves,RTE_MAX_ETHPORTS ); + +if (num_slaves <0 ) { +printf ("\tFailed to get slave list for port = %d\n" , port_id); +return ; + } +if (num_slaves >0 ) { +printf ("\tSlaves (%d): [" , num_slaves); +for (i =0 ; i < num_slaves -1 ; i++) +printf ("%d " , slaves[i]); + +printf ("%d]\n" , slaves[num_slaves -1 ]); + }else { +printf ("\tSlaves: []\n" ); + + } + + num_active_slaves =rte_eth_bond_active_slaves_get (port_id, slaves, +RTE_MAX_ETHPORTS ); + +if (num_active_slaves <0 ) { +printf ("\tFailed to get active slave list for port = %d\n" , port_id); +return ; + } +if (num_active_slaves >0 ) { +printf ("\tActive Slaves (%d): [" , num_active_slaves); +for (i =0 ; i < num_active_slaves -1 ; i++) +printf ("%d " , slaves[i]); + +printf ("%d]\n" , slaves[num_active_slaves -1 ]); + + }else { +printf ("\tActive Slaves: []\n" ); + + } + + primary_id =rte_eth_bond_primary_get (port_id); +if (primary_id <0 ) { +printf ("\tFailed to get primary slave for port = %d\n" , port_id); +return ; + }else +printf ("\tPrimary: [%d]\n" , primary_id); + +} + +cmdline_parse_token_string_t cmd_showbonding_config_show = +TOKEN_STRING_INITIALIZER(struct cmd_show_bonding_config_result, + show,"show" ); +cmdline_parse_token_string_t cmd_showbonding_config_bonding = +TOKEN_STRING_INITIALIZER(struct cmd_show_bonding_config_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_showbonding_config_config = +TOKEN_STRING_INITIALIZER(struct cmd_show_bonding_config_result, + config,"config" ); +cmdline_parse_token_num_t cmd_showbonding_config_port = +TOKEN_NUM_INITIALIZER(struct cmd_show_bonding_config_result, + port_id,UINT8 ); + +cmdline_parse_inst_t cmd_show_bonding_config = { + .f = cmd_show_bonding_config_parsed, + .help_str ="show bonding config (port_id): Show the bonding config for port_id" , + .data =NULL , + .tokens = { + (void *)&cmd_showbonding_config_show, + (void *)&cmd_showbonding_config_bonding, + (void *)&cmd_showbonding_config_config, + (void *)&cmd_showbonding_config_port, +NULL + } +}; + +/* *** SET BONDING PRIMARY *** */ +struct cmd_set_bonding_primary_result { +cmdline_fixed_string_t set; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t primary; +uint8_t slave_id; +uint8_t port_id; +}; + +static void cmd_set_bonding_primary_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_set_bonding_primary_result *res = parsed_result; +portid_t master_port_id = res->port_id; +portid_t slave_port_id = res->slave_id; + +/* Set the primary slave for a bonded device. */ +if (0 !=rte_eth_bond_primary_set (master_port_id, slave_port_id)) { +printf ("\t Failed to set primary slave for port = %d.\n" , + master_port_id); +return ; + } +init_port_config (); +} + +cmdline_parse_token_string_t cmd_setbonding_primary_set = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_primary_result, + set,"set" ); +cmdline_parse_token_string_t cmd_setbonding_primary_bonding = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_primary_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_setbonding_primary_primary = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_primary_result, + primary,"primary" ); +cmdline_parse_token_num_t cmd_setbonding_primary_slave = +TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_primary_result, + slave_id,UINT8 ); +cmdline_parse_token_num_t cmd_setbonding_primary_port = +TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_primary_result, + port_id,UINT8 ); + +cmdline_parse_inst_t cmd_set_bonding_primary = { + .f = cmd_set_bonding_primary_parsed, + .help_str ="set bonding primary (slave_id) (port_id): Set the primary slave for port_id" , + .data =NULL , + .tokens = { + (void *)&cmd_setbonding_primary_set, + (void *)&cmd_setbonding_primary_bonding, + (void *)&cmd_setbonding_primary_primary, + (void *)&cmd_setbonding_primary_slave, + (void *)&cmd_setbonding_primary_port, +NULL + } +}; + +/* *** ADD SLAVE *** */ +struct cmd_add_bonding_slave_result { +cmdline_fixed_string_t add; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t slave; +uint8_t slave_id; +uint8_t port_id; +}; + +static void cmd_add_bonding_slave_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_add_bonding_slave_result *res = parsed_result; +portid_t master_port_id = res->port_id; +portid_t slave_port_id = res->slave_id; + +/* Set the primary slave for a bonded device. */ +if (0 !=rte_eth_bond_slave_add (master_port_id, slave_port_id)) { +printf ("\t Failed to add slave %d to master port = %d.\n" , + slave_port_id, master_port_id); +return ; + } +init_port_config (); +} + +cmdline_parse_token_string_t cmd_addbonding_slave_add = +TOKEN_STRING_INITIALIZER(struct cmd_add_bonding_slave_result, + add,"add" ); +cmdline_parse_token_string_t cmd_addbonding_slave_bonding = +TOKEN_STRING_INITIALIZER(struct cmd_add_bonding_slave_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_addbonding_slave_slave = +TOKEN_STRING_INITIALIZER(struct cmd_add_bonding_slave_result, + slave,"slave" ); +cmdline_parse_token_num_t cmd_addbonding_slave_slaveid = +TOKEN_NUM_INITIALIZER(struct cmd_add_bonding_slave_result, + slave_id,UINT8 ); +cmdline_parse_token_num_t cmd_addbonding_slave_port = +TOKEN_NUM_INITIALIZER(struct cmd_add_bonding_slave_result, + port_id,UINT8 ); + +cmdline_parse_inst_t cmd_add_bonding_slave = { + .f = cmd_add_bonding_slave_parsed, + .help_str ="add bonding slave (slave_id) (port_id): Add a slave device to a bonded device" , + .data =NULL , + .tokens = { + (void *)&cmd_addbonding_slave_add, + (void *)&cmd_addbonding_slave_bonding, + (void *)&cmd_addbonding_slave_slave, + (void *)&cmd_addbonding_slave_slaveid, + (void *)&cmd_addbonding_slave_port, +NULL + } +}; + +/* *** REMOVE SLAVE *** */ +struct cmd_remove_bonding_slave_result { +cmdline_fixed_string_t remove; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t slave; +uint8_t slave_id; +uint8_t port_id; +}; + +static void cmd_remove_bonding_slave_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_remove_bonding_slave_result *res = parsed_result; +portid_t master_port_id = res->port_id; +portid_t slave_port_id = res->slave_id; + +/* Set the primary slave for a bonded device. */ +if (0 !=rte_eth_bond_slave_remove (master_port_id, slave_port_id)) { +printf ("\t Failed to remove slave %d from master port = %d.\n" , + slave_port_id, master_port_id); +return ; + } +init_port_config (); +} + +cmdline_parse_token_string_t cmd_removebonding_slave_remove = + TOKEN_STRING_INITIALIZER(struct cmd_remove_bonding_slave_result, + remove,"remove" ); +cmdline_parse_token_string_t cmd_removebonding_slave_bonding = + TOKEN_STRING_INITIALIZER(struct cmd_remove_bonding_slave_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_removebonding_slave_slave = + TOKEN_STRING_INITIALIZER(struct cmd_remove_bonding_slave_result, + slave,"slave" ); +cmdline_parse_token_num_t cmd_removebonding_slave_slaveid = + TOKEN_NUM_INITIALIZER(struct cmd_remove_bonding_slave_result, + slave_id,UINT8 ); +cmdline_parse_token_num_t cmd_removebonding_slave_port = + TOKEN_NUM_INITIALIZER(struct cmd_remove_bonding_slave_result, + port_id,UINT8 ); + +cmdline_parse_inst_t cmd_remove_bonding_slave = { + .f = cmd_remove_bonding_slave_parsed, + .help_str ="remove bonding slave (slave_id) (port_id): Remove a slave device from a bonded device" , + .data =NULL , + .tokens = { + (void *)&cmd_removebonding_slave_remove, + (void *)&cmd_removebonding_slave_bonding, + (void *)&cmd_removebonding_slave_slave, + (void *)&cmd_removebonding_slave_slaveid, + (void *)&cmd_removebonding_slave_port, +NULL + } +}; + +/* *** CREATE BONDED DEVICE *** */ +struct cmd_create_bonded_device_result { +cmdline_fixed_string_t create; +cmdline_fixed_string_t bonded; +cmdline_fixed_string_t device; +uint8_t mode; +uint8_t socket; +}; + +static int bond_dev_num =0 ; + +static void cmd_create_bonded_device_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_create_bonded_device_result *res = parsed_result; +char ethdev_name[RTE_ETH_NAME_MAX_LEN ]; +int port_id; + +if (test_done ==0 ) { +printf ("Please stop forwarding first\n" ); +return ; + } + +rte_snprintf (ethdev_name,RTE_ETH_NAME_MAX_LEN ,"eth_bond_testpmd_%d" , + bond_dev_num++); + +/* Create a new bonded device. */ + port_id =rte_eth_bond_create (ethdev_name, res->mode, res->socket); +if (port_id <0 ) { +printf ("\t Failed to create bonded device.\n" ); +return ; + }else { +printf ("Created new bonded device %s on (port %d).\n" , ethdev_name, + port_id); + +/* Update number of ports */ + nb_ports =rte_eth_dev_count (); +reconfig (port_id); +rte_eth_promiscuous_enable (port_id); + } + +} + +cmdline_parse_token_string_t cmd_createbonded_device_create = + TOKEN_STRING_INITIALIZER(struct cmd_create_bonded_device_result, + create,"create" ); +cmdline_parse_token_string_t cmd_createbonded_device_bonded = + TOKEN_STRING_INITIALIZER(struct cmd_create_bonded_device_result, + bonded,"bonded" ); +cmdline_parse_token_string_t cmd_createbonded_device_device = + TOKEN_STRING_INITIALIZER(struct cmd_create_bonded_device_result, + device,"device" ); +cmdline_parse_token_num_t cmd_createbonded_device_mode = + TOKEN_NUM_INITIALIZER(struct cmd_create_bonded_device_result, + mode,UINT8 ); +cmdline_parse_token_num_t cmd_createbonded_device_socket = + TOKEN_NUM_INITIALIZER(struct cmd_create_bonded_device_result, + socket,UINT8 ); + +cmdline_parse_inst_t cmd_create_bonded_device = { + .f = cmd_create_bonded_device_parsed, + .help_str ="create bonded device (mode) (socket): Create a new bonded device with specific bonding mode and socket" , + .data =NULL , + .tokens = { + (void *)&cmd_createbonded_device_create, + (void *)&cmd_createbonded_device_bonded, + (void *)&cmd_createbonded_device_device, + (void *)&cmd_createbonded_device_mode, + (void *)&cmd_createbonded_device_socket, +NULL + } +}; + +/* *** SET MAC ADDRESS IN BONDED DEVICE *** */ +struct cmd_set_bond_mac_addr_result { +cmdline_fixed_string_t set; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t mac_addr; +uint8_t port_num; +struct ether_addr address; +}; + +static void cmd_set_bond_mac_addr_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_set_bond_mac_addr_result *res = parsed_result; +int ret; + +if (res->port_num >= nb_ports) { +printf ("Port id %d must be less than %d\n" , res->port_num, nb_ports); +return ; + } + + ret =rte_eth_bond_mac_address_set (res->port_num, &res->address); + +/* check the return value and print it if is < 0 */ +if (ret <0 ) +printf ("set_bond_mac_addr error: (%s)\n" ,strerror (-ret)); +} + +cmdline_parse_token_string_t cmd_set_bond_mac_addr_set = + TOKEN_STRING_INITIALIZER(struct cmd_set_bond_mac_addr_result, set, "set"); +cmdline_parse_token_string_t cmd_set_bond_mac_addr_bonding = + TOKEN_STRING_INITIALIZER(struct cmd_set_bond_mac_addr_result, bonding, +"bonding" ); +cmdline_parse_token_string_t cmd_set_bond_mac_addr_mac = + TOKEN_STRING_INITIALIZER(struct cmd_set_bond_mac_addr_result, mac_addr, +"mac_addr" ); +cmdline_parse_token_num_t cmd_set_bond_mac_addr_portnum = + TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mac_addr_result, port_num, UINT8); +cmdline_parse_token_etheraddr_t cmd_set_bond_mac_addr_addr = + TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_bond_mac_addr_result, address); + +cmdline_parse_inst_t cmd_set_bond_mac_addr = { + .f = cmd_set_bond_mac_addr_parsed, + .data = (void *)0 , + .help_str ="set bonding mac_addr (port_id) (address): " , + .tokens = { + (void *)&cmd_set_bond_mac_addr_set, + (void *)&cmd_set_bond_mac_addr_bonding, + (void *)&cmd_set_bond_mac_addr_mac, + (void *)&cmd_set_bond_mac_addr_portnum, + (void *)&cmd_set_bond_mac_addr_addr, +NULL + } +}; + +#endif /* RTE_LIBRTE_PMD_BOND */ +/* *** SET FORWARDING MODE *** */ struct cmd_set_fwd_mode_result {cmdline_fixed_string_t set;
@@ -6572,6 +7141,16 @@ cmdline_parse_ctx_t main_ctx[] = { (cmdline_parse_inst_t *)&cmd_set_bypass_timeout, (cmdline_parse_inst_t *)&cmd_show_bypass_config, #endif +#ifdef RTE_LIBRTE_PMD_BOND + (cmdline_parse_inst_t *) &cmd_set_bonding_mode, + (cmdline_parse_inst_t *) &cmd_show_bonding_config, + (cmdline_parse_inst_t *) &cmd_set_bonding_primary, + (cmdline_parse_inst_t *) &cmd_add_bonding_slave, + (cmdline_parse_inst_t *) &cmd_remove_bonding_slave, + (cmdline_parse_inst_t *) &cmd_create_bonded_device, + (cmdline_parse_inst_t *) &cmd_set_bond_mac_addr, + (cmdline_parse_inst_t *) &cmd_set_balance_xmit_policy, +#endif (cmdline_parse_inst_t *)&cmd_vlan_offload, (cmdline_parse_inst_t *)&cmd_vlan_tpid, (cmdline_parse_inst_t *)&cmd_rx_vlan_filter_all,
app/test-pmd/config.c +3 -1
@@ -252,6 +252,7 @@ void port_infos_display(portid_t port_id) {struct rte_port *port; +struct ether_addr mac_addr;struct rte_eth_link link;int vlan_offload;struct rte_mempool * mp;
@@ -265,7 +266,8 @@ port_infos_display(portid_t port_id)rte_eth_link_get_nowait (port_id, &link);printf ("\n%s Infos for port %-2d %s\n" , info_border, port_id, info_border); -print_ethaddr ("MAC address: " , &port->eth_addr); +rte_eth_macaddr_get (port_id, &mac_addr); +print_ethaddr ("MAC address: " , &mac_addr);printf ("\nConnect to socket: %u" , port->socket_id);if (port_numa[port_id] !=NUMA_NO_CONFIG ) {
app/test-pmd/parameters.c +3 -0
@@ -75,6 +75,9 @@#include <cmdline_parse.h> #include <cmdline_parse_etheraddr.h> #endif +#ifdef RTE_LIBRTE_PMD_BOND +#include <rte_eth_bond.h> +#endif #include "testpmd.h"
app/test-pmd/testpmd.c +32 -8
@@ -300,7 +300,7 @@ struct rte_fdir_conf fdir_conf = { .drop_queue = 127, }; -static volatile int test_done =1 ;/* stop packet forwarding when set to 1. */ +volatile int test_done =1 ;/* stop packet forwarding when set to 1. */ struct queue_stats_mappings tx_queue_stats_mappings_array[MAX_TX_QUEUE_STATS_MAPPINGS ];struct queue_stats_mappings rx_queue_stats_mappings_array[MAX_RX_QUEUE_STATS_MAPPINGS ];
@@ -625,6 +625,32 @@ init_config(void)rte_exit (EXIT_FAILURE ,"FAIL from init_fwd_streams()\n" ); } + +void +reconfig (portid_t new_port_id) +{ +struct rte_port *port; + +/* Reconfiguration of Ethernet ports. */ + ports =rte_realloc (ports, +sizeof (struct rte_port ) * nb_ports, +CACHE_LINE_SIZE ); +if (ports ==NULL ) { +rte_exit (EXIT_FAILURE ,"rte_realloc(%d struct rte_port) failed\n" , + nb_ports); + } + + port = &ports[new_port_id]; +rte_eth_dev_info_get (new_port_id, &port->dev_info); + +/* set flag to initialize port/queue */ + port->need_reconfig =1 ; + port->need_reconfig_queues =1 ; + +init_port_config (); +} + +int init_fwd_streams (void ) {
@@ -1252,7 +1278,7 @@ start_port(portid_t pid)portid_t pi;queueid_t qi;struct rte_port *port; -uint8_t *mac_addr; +struct ether_addr mac_addr;if (test_done ==0 ) {printf ("Please stop forwarding first\n" );
@@ -1380,10 +1406,11 @@ start_port(portid_t pid) RTE_PORT_HANDLING, RTE_PORT_STARTED) == 0)printf ("Port %d can not be set into started\n" , pi); - mac_addr = port->eth_addr.addr_bytes; +rte_eth_macaddr_get (pi, &mac_addr);printf ("Port %d: %02X:%02X:%02X:%02X:%02X:%02X\n" , pi, - mac_addr[0 ], mac_addr[1 ], mac_addr[2 ], - mac_addr[3 ], mac_addr[4 ], mac_addr[5 ]); + mac_addr.addr_bytes[0 ], mac_addr.addr_bytes[1 ], + mac_addr.addr_bytes[2 ], mac_addr.addr_bytes[3 ], + mac_addr.addr_bytes[4 ], mac_addr.addr_bytes[5 ]);/* at least one port started, need checking link status */ need_check_link_status =1 ;
@@ -1826,9 +1853,6 @@ main(int argc, char** argv)if (diag <0 )rte_panic ("Cannot init EAL\n" ); -if (rte_eal_pci_probe ()) -rte_panic ("Cannot probe PCI\n" ); - nb_ports = (portid_t )rte_eth_dev_count ();if (nb_ports ==0 ) rte_exit(EXIT_FAILURE, "No probed ethernet devices - "
app/test-pmd/testpmd.h +2 -0
@@ -279,6 +279,7 @@ extern uint16_t port_topology; /**< set by "--port-topology" parameter */extern uint8_t no_flush_rx;/**<set by "--no-flush-rx" parameter */ extern uint8_t mp_anon;/**< set by "--mp-anon" parameter */ extern uint8_t no_link_check;/**<set by "--disable-link-check" parameter */ +extern volatile int test_done;/* stop packet forwarding when set to 1. */ #ifdef RTE_NIC_BYPASS extern uint32_t bypass_timeout;/**< Store the NIC bypass watchdog timeout */
@@ -452,6 +453,7 @@ void fwd_config_display(void);void rxtx_config_display (void );void fwd_config_setup (void );void set_def_fwd_config (void ); +void reconfig (portid_t new_port_id);int init_fwd_streams (void );void port_mtu_set (portid_t port_id,uint16_t mtu);
Signature · 1 line
1.7.0.7
PATCH v6 6/6 Link Bonding Library doxygen additions
In reply to a message not in the archive--- doc/doxy-api-index.md | 1 + doc/doxy-api.conf | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
doc/doxy-api-index.md +1 -0
@@ -36,6 +36,7 @@ API {#index} There are many libraries, so their headers may be grouped by topics: - **device**: + [bond] (@ref rte_eth_bond.h), [ethdev] (@ref rte_ethdev.h), [devargs] (@ref rte_devargs.h), [KNI] (@ref rte_kni.h),
doc/doxy-api.conf +1 -0
@@ -30,6 +30,7 @@ PROJECT_NAME = DPDK INPUT = doc/doxy-api-index.md \ + lib/librte_pmd_bond \ lib/librte_eal/common/include \ lib/librte_acl \ lib/librte_distributor \
Signature · 1 line
1.7.0.7
PATCH v5 1/6 Link Bonding Library (lib/librte_pmd_bond)
In reply to a message not in the archiveInitial release with support for
Mode 0 - Round Robin
Mode 1 - Active Backup
Mode 2 - Balance -> Supports 3 transmit polices (layer 2, layer 2+3, layer 3+4) Mode 3 - Broadcast
--- config/common_bsdapp | 5 + config/common_linuxapp | 5 + lib/Makefile | 1 + lib/librte_pmd_bond/Makefile | 32 + lib/librte_pmd_bond/rte_eth_bond.c | 2148 ++++++++++++++++++++++++++++++++++++ lib/librte_pmd_bond/rte_eth_bond.h | 255 +++++ mk/rte.app.mk | 5 + 7 files changed, 2451 insertions(+), 0 deletions(-) create mode 100644 lib/librte_pmd_bond/Makefile create mode 100644 lib/librte_pmd_bond/rte_eth_bond.c create mode 100644 lib/librte_pmd_bond/rte_eth_bond.h
config/common_bsdapp +5 -0
@@ -206,6 +206,11 @@ CONFIG_RTE_PMD_RING_MAX_TX_RINGS=16 CONFIG_RTE_LIBRTE_PMD_PCAP=y # +# Compile link bonding pmd library +# +CONFIG_RTE_LIBRTE_PMD_BOND=y + +# # Do prefetch of packet data within PMD driver receive function # CONFIG_RTE_PMD_PACKET_PREFETCH=y
config/common_linuxapp +5 -0
@@ -244,6 +244,11 @@ CONFIG_RTE_PMD_RING_MAX_TX_RINGS=16 CONFIG_RTE_LIBRTE_PMD_PCAP=n # +# Compile link bonding pmd library +# +CONFIG_RTE_LIBRTE_PMD_BOND=y + +# # Compile Xen PMD # CONFIG_RTE_LIBRTE_PMD_XENVIRT=n
lib/Makefile +1 -0
@@ -49,6 +49,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += librte_pmd_pcap DIRS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += librte_pmd_virtio DIRS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += librte_pmd_vmxnet3 DIRS-$(CONFIG_RTE_LIBRTE_PMD_XENVIRT) += librte_pmd_xenvirt +DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += librte_pmd_bond DIRS-$(CONFIG_RTE_LIBRTE_HASH) += librte_hash DIRS-$(CONFIG_RTE_LIBRTE_LPM) += librte_lpm DIRS-$(CONFIG_RTE_LIBRTE_ACL) += librte_acl
lib/librte_pmd_bond/Makefile new file +32 -0
@@ -0,0 +1,32 @@ +# <COPYRIGHT_TAG> + +include $(RTE_SDK)/mk/rte.vars.mk + +# +# library name +# +LIB = librte_pmd_bond.a + +CFLAGS += -O3 +CFLAGS += $(WERROR_FLAGS) + +# +# all source are stored in SRCS-y +# +SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond.c + + +# +# Export include files +# +SYMLINK-y-include += rte_eth_bond.h + + +# this lib depends upon: +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += lib/librte_mbuf +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += lib/librte_ether +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += lib/librte_malloc +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += lib/librte_eal +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += lib/librte_kvargs + +include $(RTE_SDK)/mk/rte.lib.mk
lib/librte_pmd_bond/rte_eth_bond.c new file +2148 -0
2,148 lines not on this page · raw message
lib/librte_pmd_bond/rte_eth_bond.h new file +255 -0
255 lines not on this page · raw message
mk/rte.app.mk +5 -0
@@ -205,8 +205,13 @@ ifeq ($(CONFIG_RTE_LIBRTE_PMD_PCAP),y) LDLIBS += -lrte_pmd_pcap -lpcap endif +ifeq ($(CONFIG_RTE_LIBRTE_PMD_BOND),y) +LDLIBS += -lrte_pmd_bond endif +endif + + LDLIBS += $(EXECENV_LDLIBS) LDLIBS += --end-group
Signature · 1 line
1.7.0.7
PATCH v5 2/6 Support for unique interface naming of pmds
In reply to a message not in the archiveAdding support to rte_eth_dev_data structure to support unique name identifier for ethdevs to support adding slave ethdevs (specifically virtual devices which have no public unique identifier) to a link bonding device. This changes the API rte_eth_dev_allocate() to require a const char *name when allocating a ethdev, which also verifies that the name is unique and hasn’t been already used by an existed allocated rte_eth_dev. Also contains updates to virtual pmd’s to now call the API with a name parameter.
--- lib/librte_ether/rte_ethdev.c | 32 +++++++++++++++++++++++++++-- lib/librte_ether/rte_ethdev.h | 7 +++++- lib/librte_pmd_pcap/rte_eth_pcap.c | 22 ++++++++++---------- lib/librte_pmd_ring/rte_eth_ring.c | 32 +++++++++++++++-------------- lib/librte_pmd_ring/rte_eth_ring.h | 3 +- lib/librte_pmd_xenvirt/rte_eth_xenvirt.c | 2 +- 6 files changed, 66 insertions(+), 32 deletions(-)
lib/librte_ether/rte_ethdev.c +29 -3
@@ -65,6 +65,7 @@#include <rte_mbuf.h> #include <rte_errno.h> #include <rte_spinlock.h> +#include <rte_string_fns.h> #include "rte_ether.h" #include "rte_ethdev.h"
@@ -153,21 +154,40 @@ rte_eth_dev_data_alloc(void) RTE_MAX_ETHPORTS * sizeof(*rte_eth_dev_data)); } +static struct rte_eth_dev * +rte_eth_dev_allocated (const char *name) +{ +unsigned i; + +for (i =0 ; i < nb_ports; i++) { +if (strcmp (rte_eth_devices[i].data->name, name) ==0 ) +return &rte_eth_devices[i]; + } +return NULL ; +} +struct rte_eth_dev * -rte_eth_dev_allocate (void ) +rte_eth_dev_allocate (const char *name) {struct rte_eth_dev *eth_dev;if (nb_ports ==RTE_MAX_ETHPORTS ) { -PMD_DEBUG_TRACE ("Reached maximum number of ethernet ports\n" ); +PMD_DEBUG_TRACE ("Reached maximum number of Ethernet ports\n" );return NULL ; }if (rte_eth_dev_data ==NULL )rte_eth_dev_data_alloc (); +if (rte_eth_dev_allocated (name) !=NULL ) { +PMD_DEBUG_TRACE ("Ethernet Device with name %s already allocated!\n" ); +return NULL ; + } + eth_dev = &rte_eth_devices[nb_ports]; eth_dev->data = &rte_eth_dev_data[nb_ports]; +rte_snprintf (eth_dev->data->name,sizeof (eth_dev->data->name), +"%s" , name); eth_dev->data->port_id = nb_ports++;return eth_dev; }
@@ -178,11 +198,17 @@ rte_eth_dev_init(struct rte_pci_driver *pci_drv, {struct eth_driver *eth_drv;struct rte_eth_dev *eth_dev; +char ethdev_name[RTE_ETH_NAME_MAX_LEN ]; +int diag; eth_drv = (struct eth_driver *)pci_drv; - eth_dev =rte_eth_dev_allocate (); +/* Create unique Ethernet device name using PCI address */ +rte_snprintf (ethdev_name,RTE_ETH_NAME_MAX_LEN ,"%d:%d.%d" , + pci_dev->addr.bus, pci_dev->addr.devid, pci_dev->addr.function); + + eth_dev =rte_eth_dev_allocate (ethdev_name);if (eth_dev ==NULL )return -ENOMEM ;
lib/librte_ether/rte_ethdev.h +6 -1
@@ -1497,6 +1497,8 @@ struct rte_eth_dev_sriov { };#define RTE_ETH_DEV_SRIOV (dev) ((dev)->data->sriov) +#define RTE_ETH_NAME_MAX_LEN (32) +/** * @internal * The data part, with no function pointers, associated with each ethernet device.
@@ -1505,6 +1507,8 @@ struct rte_eth_dev_sriov {* processes in a multi-process configuration. */ struct rte_eth_dev_data { +char name[RTE_ETH_NAME_MAX_LEN ];/**< Unique identifier name */ +void **rx_queues;/**< Array of pointers to RX queues. */ void **tx_queues;/**< Array of pointers to TX queues. */ uint16_t nb_rx_queues;/**< Number of RX queues. */
@@ -1560,10 +1564,11 @@ extern uint8_t rte_eth_dev_count(void);* Allocates a new ethdev slot for an ethernet device and returns the pointer * to that slot for the driver to use. * +* @param name Unique identifier name for each Ethernet device * @return * - Slot in the rte_dev_devices array for a new device; */ -struct rte_eth_dev *rte_eth_dev_allocate (void ); +struct rte_eth_dev *rte_eth_dev_allocate (const char *name);struct eth_driver ;/**
lib/librte_pmd_pcap/rte_eth_pcap.c +11 -11
@@ -534,7 +534,7 @@ open_tx_iface(const char *key __rte_unused, const char *value, void *extra_args) static int -rte_pmd_init_internals(const unsigned nb_rx_queues, +rte_pmd_init_internals(const char *name, const unsigned nb_rx_queues, const unsigned nb_tx_queues, const unsigned numa_node, struct pmd_internals **internals,
@@ -558,20 +558,20 @@ rte_pmd_init_internals(const unsigned nb_rx_queues,/* now do all data allocation - for eth_dev structure, dummy pci driver * and internal (private) data */ - data =rte_zmalloc_socket (NULL ,sizeof (*data),0 , numa_node); + data =rte_zmalloc_socket (name,sizeof (*data),0 , numa_node);if (data ==NULL ) goto error; - pci_dev =rte_zmalloc_socket (NULL ,sizeof (*pci_dev),0 , numa_node); + pci_dev =rte_zmalloc_socket (name,sizeof (*pci_dev),0 , numa_node);if (pci_dev ==NULL ) goto error; - *internals =rte_zmalloc_socket (NULL ,sizeof (**internals),0 , numa_node); + *internals =rte_zmalloc_socket (name,sizeof (**internals),0 , numa_node);if (*internals ==NULL ) goto error;/* reserve an ethdev entry */ - *eth_dev =rte_eth_dev_allocate (); + *eth_dev =rte_eth_dev_allocate (name);if (*eth_dev ==NULL ) goto error;
@@ -617,7 +617,7 @@ rte_pmd_init_internals(const unsigned nb_rx_queues, } static int -rte_eth_from_pcaps_n_dumpers(pcap_t * const rx_queues[], +rte_eth_from_pcaps_n_dumpers(const char *name, pcap_t * const rx_queues[], const unsigned nb_rx_queues, pcap_dumper_t * const tx_queues[], const unsigned nb_tx_queues,
@@ -634,7 +634,7 @@ rte_eth_from_pcaps_n_dumpers(pcap_t * const rx_queues[],if (tx_queues ==NULL && nb_tx_queues >0 )return -1 ; -if (rte_pmd_init_internals (nb_rx_queues, nb_tx_queues, numa_node, +if (rte_pmd_init_internals (name, nb_rx_queues, nb_tx_queues, numa_node, &internals, ð_dev, kvlist) <0 )return -1 ;
@@ -652,7 +652,7 @@ rte_eth_from_pcaps_n_dumpers(pcap_t * const rx_queues[], } static int -rte_eth_from_pcaps(pcap_t * const rx_queues[], +rte_eth_from_pcaps(const char *name, pcap_t * const rx_queues[], const unsigned nb_rx_queues, pcap_t * const tx_queues[], const unsigned nb_tx_queues,
@@ -669,7 +669,7 @@ rte_eth_from_pcaps(pcap_t * const rx_queues[],if (tx_queues ==NULL && nb_tx_queues >0 )return -1 ; -if (rte_pmd_init_internals (nb_rx_queues, nb_tx_queues, numa_node, +if (rte_pmd_init_internals (name, nb_rx_queues, nb_tx_queues, numa_node, &internals, ð_dev, kvlist) <0 )return -1 ;
@@ -760,10 +760,10 @@ rte_pmd_pcap_devinit(const char *name, const char *params)return -1 ;if (using_dumpers) -return rte_eth_from_pcaps_n_dumpers (pcaps.pcaps, pcaps.num_of_rx, +return rte_eth_from_pcaps_n_dumpers (name, pcaps.pcaps, pcaps.num_of_rx, dumpers.dumpers, dumpers.num_of_tx, numa_node, kvlist); -return rte_eth_from_pcaps (pcaps.pcaps, pcaps.num_of_rx, dumpers.pcaps, +return rte_eth_from_pcaps (name, pcaps.pcaps, pcaps.num_of_rx, dumpers.pcaps, dumpers.num_of_tx, numa_node, kvlist); }
lib/librte_pmd_ring/rte_eth_ring.c +17 -15
@@ -219,7 +219,7 @@ static struct eth_dev_ops ops = { }; int -rte_eth_from_rings(struct rte_ring *const rx_queues[], +rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[], const unsigned nb_rx_queues, struct rte_ring *const tx_queues[], const unsigned nb_tx_queues,
@@ -243,20 +243,20 @@ rte_eth_from_rings(struct rte_ring *const rx_queues[],/* now do all data allocation - for eth_dev structure, dummy pci driver * and internal (private) data */ - data =rte_zmalloc_socket (NULL ,sizeof (*data),0 , numa_node); + data =rte_zmalloc_socket (name,sizeof (*data),0 , numa_node);if (data ==NULL ) goto error; - pci_dev =rte_zmalloc_socket (NULL ,sizeof (*pci_dev),0 , numa_node); + pci_dev =rte_zmalloc_socket (name,sizeof (*pci_dev),0 , numa_node);if (pci_dev ==NULL ) goto error; - internals =rte_zmalloc_socket (NULL ,sizeof (*internals),0 , numa_node); + internals =rte_zmalloc_socket (name,sizeof (*internals),0 , numa_node);if (internals ==NULL ) goto error;/* reserve an ethdev entry */ - eth_dev =rte_eth_dev_allocate (); + eth_dev =rte_eth_dev_allocate (name);if (eth_dev ==NULL ) goto error;
@@ -335,7 +335,7 @@ eth_dev_ring_create(const char *name, const unsigned numa_node,return -1 ; } -if (rte_eth_from_rings (rxtx, num_rings, rxtx, num_rings, numa_node)) +if (rte_eth_from_rings (name, rxtx, num_rings, rxtx, num_rings, numa_node))return -1 ;return 0 ;
@@ -352,29 +352,31 @@ eth_dev_ring_pair_create(const char *name, const unsigned numa_node,struct rte_ring *rx[RTE_PMD_RING_MAX_RX_RINGS ];struct rte_ring *tx[RTE_PMD_RING_MAX_TX_RINGS ];unsigned i; -char rng_name[RTE_RING_NAMESIZE ]; +char rx_rng_name[RTE_RING_NAMESIZE ]; +char tx_rng_name[RTE_RING_NAMESIZE ];unsigned num_rings =RTE_MIN (RTE_PMD_RING_MAX_RX_RINGS ,RTE_PMD_RING_MAX_TX_RINGS );for (i =0 ; i < num_rings; i++) { -rte_snprintf (rng_name,sizeof (rng_name),"ETH_RX%u_%s" , i, name); +rte_snprintf (rx_rng_name,sizeof (rx_rng_name),"ETH_RX%u_%s" , i, name); rx[i] = (action ==DEV_CREATE ) ? -rte_ring_create (rng_name,1024 , numa_node, +rte_ring_create (rx_rng_name,1024 , numa_node,RING_F_SP_ENQ |RING_F_SC_DEQ ) : -rte_ring_lookup (rng_name); +rte_ring_lookup (rx_rng_name);if (rx[i] ==NULL )return -1 ; -rte_snprintf (rng_name,sizeof (rng_name),"ETH_TX%u_%s" , i, name); +rte_snprintf (tx_rng_name,sizeof (tx_rng_name),"ETH_TX%u_%s" , i, name); tx[i] = (action ==DEV_CREATE ) ? -rte_ring_create (rng_name,1024 , numa_node, +rte_ring_create (tx_rng_name,1024 , numa_node,RING_F_SP_ENQ |RING_F_SC_DEQ ): -rte_ring_lookup (rng_name); +rte_ring_lookup (tx_rng_name);if (tx[i] ==NULL )return -1 ; } -if (rte_eth_from_rings (rx, num_rings, tx, num_rings, numa_node) || -rte_eth_from_rings (tx, num_rings, rx, num_rings, numa_node) ) +if (rte_eth_from_rings (rx_rng_name, rx, num_rings, tx, num_rings, + numa_node) ||rte_eth_from_rings (tx_rng_name, tx, num_rings, rx, + num_rings, numa_node))return -1 ;return 0 ;
lib/librte_pmd_ring/rte_eth_ring.h +2 -1
@@ -40,7 +40,8 @@ extern "C" {#include <rte_ring.h> -int rte_eth_from_rings(struct rte_ring * const rx_queues[], +int rte_eth_from_rings(const char *name, + struct rte_ring * const rx_queues[], const unsigned nb_rx_queues, struct rte_ring *const tx_queues[], const unsigned nb_tx_queues,
lib/librte_pmd_xenvirt/rte_eth_xenvirt.c +1 -1
@@ -647,7 +647,7 @@ eth_dev_xenvirt_create(const char *name, const char *params, goto err;/* reserve an ethdev entry */ - eth_dev =rte_eth_dev_allocate (); + eth_dev =rte_eth_dev_allocate (name);if (eth_dev ==NULL ) goto err;
Signature · 1 line
1.7.0.7
PATCH v5 3/6 EAL support for link bonding device initialization
In reply to a message not in the archiveUpdating 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.
--- 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 | 13 +++++- lib/librte_eal/linuxapp/eal/eal.c | 11 +++++- 6 files changed, 73 insertions(+), 29 deletions(-)
lib/librte_eal/bsdapp/eal/eal.c +9 -1
@@ -874,7 +874,7 @@ rte_eal_init(int argc, char **argv)rte_eal_mcfg_complete (); -if (rte_eal_dev_init () <0 ) +if (rte_eal_dev_init (PMD_INIT_PRE_PCI_PROBE ) <0 )rte_panic ("Cannot init pmd devices\n" );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 (); +/* 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; }
lib/librte_eal/common/eal_common_dev.c +40 -18
77 lines not on this page · raw message
lib/librte_eal/common/eal_common_pci.c +3 -0
@@ -150,6 +150,9 @@ rte_eal_pci_probe(void) probe_all =1 ; TAILQ_FOREACH(dev, &pci_device_list, next) { +/* check if device has already been initialized */ +if (dev->driver !=NULL ) +continue ;/* set devargs in PCI structure */ devargs =pci_devargs_lookup (dev);
lib/librte_eal/common/include/eal_private.h +0 -7
@@ -196,11 +196,4 @@ int rte_eal_intr_init(void);*/ int rte_eal_alarm_init (void ); -/** -* This function initialises any virtual devices -* -* This function is private to the EAL. -*/ -int rte_eal_dev_init (void ); -#endif /* _EAL_PRIVATE_H_ */
lib/librte_eal/common/include/rte_dev.h +11 -2
@@ -62,6 +62,15 @@ 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*/ +}; + +#define RTE_PMD_BOND ("eth_bond") +/** +* Driver initialization */ +enum pmd_init_priority { +PMD_INIT_PRE_PCI_PROBE =0 , +PMD_INIT_POST_PCI_PROBE =1 , };/**
@@ -93,9 +102,9 @@ void rte_eal_driver_register(struct rte_driver *driver);void rte_eal_driver_unregister (struct rte_driver *driver);/** -* 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);#define PMD_REGISTER_DRIVER (d)\ void devinitfn_ ##d(void);\
lib/librte_eal/linuxapp/eal/eal.c +10 -1
@@ -75,6 +75,7 @@#include <rte_atomic.h> #include <malloc_heap.h> #include <rte_eth_ring.h> +#include <rte_dev.h> #include "eal_private.h" #include "eal_thread.h"
@@ -1096,7 +1097,7 @@ rte_eal_init(int argc, char **argv)RTE_LOG (DEBUG ,EAL ,"Master core %u is ready (tid=%x)\n" , rte_config.master_lcore, (int )thread_id); -if (rte_eal_dev_init () <0 ) +if (rte_eal_dev_init (PMD_INIT_PRE_PCI_PROBE ) <0 )rte_panic ("Cannot init pmd devices\n" );RTE_LCORE_FOREACH_SLAVE (i) {
@@ -1126,6 +1127,14 @@ rte_eal_init(int argc, char **argv)rte_eal_mp_remote_launch (sync_func,NULL ,SKIP_MASTER );rte_eal_mp_wait_lcore (); +/* 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; }
Signature · 1 line
1.7.0.7
PATCH v5 4/6 Link bonding Unit Tests
In reply to a message not in the archiveIncluding:
- 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
--- app/test/Makefile | 4 +- app/test/commands.c | 7 + app/test/packet_burst_generator.c | 287 +++ app/test/packet_burst_generator.h | 78 + app/test/test.h | 1 + app/test/test_link_bonding.c | 3958 +++++++++++++++++++++++++++++++++++++ app/test/virtual_pmd.c | 574 ++++++ app/test/virtual_pmd.h | 74 + 8 files changed, 4982 insertions(+), 1 deletions(-) create mode 100644 app/test/packet_burst_generator.c create mode 100644 app/test/packet_burst_generator.h create mode 100644 app/test/test_link_bonding.c create mode 100644 app/test/virtual_pmd.c create mode 100644 app/test/virtual_pmd.h
app/test/Makefile +3 -1
@@ -102,7 +102,9 @@ SRCS-$(CONFIG_RTE_APP_TEST) += test_ivshmem.c SRCS-$(CONFIG_RTE_APP_TEST) += test_distributor.c SRCS-$(CONFIG_RTE_APP_TEST) += test_distributor_perf.c SRCS-$(CONFIG_RTE_APP_TEST) += test_devargs.c - +SRCS-$(CONFIG_RTE_APP_TEST) += virtual_pmd.c +SRCS-$(CONFIG_RTE_APP_TEST) += packet_burst_generator.c +SRCS-$(CONFIG_RTE_APP_TEST) += test_link_bonding.c ifeq ($(CONFIG_RTE_APP_TEST),y) SRCS-$(CONFIG_RTE_LIBRTE_ACL) += test_acl.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_pmd_ring.c
app/test/commands.c +7 -0
@@ -159,6 +159,10 @@ static void cmd_autotest_parsed(void *parsed_result, ret =test_timer ();if (!strcmp (res->autotest,"timer_perf_autotest" )) ret =test_timer_perf (); +#ifdef RTE_LIBRTE_PMD_BOND +if (!strcmp (res->autotest,"link_bonding_autotest" )) + ret =test_link_bonding (); +#endif if (!strcmp (res->autotest,"mempool_autotest" )) ret =test_mempool ();if (!strcmp (res->autotest,"mempool_perf_autotest" ))
@@ -227,6 +231,9 @@ cmdline_parse_token_string_t cmd_autotest_autotest = "alarm_autotest#interrupt_autotest#" "version_autotest#eal_fs_autotest#" "cmdline_autotest#func_reentrancy_autotest#" +#ifdef RTE_LIBRTE_PMD_BOND + "link_bonding_autotest#" +#endif"mempool_perf_autotest#hash_perf_autotest#" "memcpy_perf_autotest#ring_perf_autotest#" "red_autotest#meter_autotest#sched_autotest#"
app/test/packet_burst_generator.c new file +287 -0
287 lines not on this page · raw message
app/test/packet_burst_generator.h new file +78 -0
78 lines not on this page · raw message
app/test/test.h +1 -0
@@ -97,6 +97,7 @@ int test_distributor(void);int test_distributor_perf (void );int test_kvargs (void );int test_devargs (void ); +int test_link_bonding (void );int test_pci_run;
app/test/test_link_bonding.c new file +3958 -0
2,599 lines not on this page · raw message
app/test/virtual_pmd.c new file +574 -0
574 lines not on this page · raw message
app/test/virtual_pmd.h new file +74 -0
74 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.7.0.7
Part of the diff is not shown here. View the raw message.
PATCH v5 5/6 testpmd link bonding additions
In reply to a message not in the archive - 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
--- app/test-pmd/cmdline.c | 579 +++++++++++++++++++++++++++++++++++++++++++++ app/test-pmd/config.c | 4 +- app/test-pmd/parameters.c | 3 + app/test-pmd/testpmd.c | 40 +++- app/test-pmd/testpmd.h | 2 + 5 files changed, 619 insertions(+), 9 deletions(-)
app/test-pmd/cmdline.c +579 -0
@@ -84,6 +84,9 @@#include <cmdline_socket.h> #include <cmdline.h> #include <rte_pci_dev_ids.h> +#ifdef RTE_LIBRTE_PMD_BOND +#include <rte_eth_bond.h> +#endif #include "testpmd.h"
@@ -404,6 +407,31 @@ static void cmd_help_long_parsed(void *parsed_result," Show the bypass configuration for a bypass enabled NIC" " using the lowest port on the NIC.\n\n"#endif +#ifdef RTE_LIBRTE_PMD_BOND +"create bonded device (mode) (socket)\n" +" Create a new bonded device with specific bonding mode and socket.\n\n" + +"add bonding slave (slave_id) (port_id)\n" +" Add a slave device to a bonded device.\n\n" + +"remove bonding slave (slave_id) (port_id)\n" +" Remove a slave device from a bonded device.\n\n" + +"set bonding mode (value) (port_id)\n" +" Set the bonding mode on a bonded device.\n\n" + +"set bonding primary (slave_id) (port_id)\n" +" Set the primary slave for a bonded device.\n\n" + +"show bonding config (port_id)\n" +" Show the bonding config for port_id.\n\n" + +"set bonding mac_addr (port_id) (address)\n" +" Set the MAC address of a bonded device.\n\n" + +"set bonding xmit_balance_policy (port_id) (l2|l23|l34)\n" +" Set the transmit balance policy for bonded device running in balance mode.\n\n" +#endif ,list_pkt_forwarding_modes () );
@@ -3031,6 +3059,547 @@ cmdline_parse_inst_t cmd_show_bypass_config = { };#endif +#ifdef RTE_LIBRTE_PMD_BOND +/* *** SET BONDING MODE *** */ +struct cmd_set_bonding_mode_result { +cmdline_fixed_string_t set; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t mode; +uint8_t value; +uint8_t port_id; +}; + +static void cmd_set_bonding_mode_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_set_bonding_mode_result *res = parsed_result; +portid_t port_id = res->port_id; + +/* Set the bonding mode for the relevant port. */ +if (0 !=rte_eth_bond_mode_set (port_id, res->value)) +printf ("\t Failed to set bonding mode for port = %d.\n" , port_id); +} + +cmdline_parse_token_string_t cmd_setbonding_mode_set = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_mode_result, + set,"set" ); +cmdline_parse_token_string_t cmd_setbonding_mode_bonding = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_mode_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_setbonding_mode_mode = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_mode_result, + mode,"mode" ); +cmdline_parse_token_num_t cmd_setbonding_mode_value = +TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_mode_result, + value,UINT8 ); +cmdline_parse_token_num_t cmd_setbonding_mode_port = +TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_mode_result, + port_id,UINT8 ); + +cmdline_parse_inst_t cmd_set_bonding_mode = { + .f = cmd_set_bonding_mode_parsed, + .help_str ="set bonding mode (mode_value) (port_id): Set the bonding mode for port_id" , + .data =NULL , + .tokens = { + (void *) &cmd_setbonding_mode_set, + (void *) &cmd_setbonding_mode_bonding, + (void *) &cmd_setbonding_mode_mode, + (void *) &cmd_setbonding_mode_value, + (void *) &cmd_setbonding_mode_port, +NULL + } +}; + +/* *** SET BALANCE XMIT POLICY *** */ +struct cmd_set_bonding_balance_xmit_policy_result { +cmdline_fixed_string_t set; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t balance_xmit_policy; +uint8_t port_id; +cmdline_fixed_string_t policy; +}; + +static void cmd_set_bonding_balance_xmit_policy_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_set_bonding_balance_xmit_policy_result *res = parsed_result; +portid_t port_id = res->port_id; +uint8_t policy; + +if (!strcmp (res->policy,"l2" )) { + policy =BALANCE_XMIT_POLICY_LAYER2 ; + }else if (!strcmp (res->policy,"l23" )) { + policy =BALANCE_XMIT_POLICY_LAYER23 ; + }else if (!strcmp (res->policy,"l34" )) { + policy =BALANCE_XMIT_POLICY_LAYER34 ; + }else { +printf ("\t Invalid xmit policy selection" ); +return ; + } + +/* Set the bonding mode for the relevant port. */ +if (0 !=rte_eth_bond_xmit_policy_set (port_id, policy)) { +printf ("\t Failed to set bonding balance xmit policy for port = %d.\n" , + port_id); + } +} + +cmdline_parse_token_string_t cmd_setbonding_balance_xmit_policy_set = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result, + set,"set" ); +cmdline_parse_token_string_t cmd_setbonding_balance_xmit_policy_bonding = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_setbonding_balance_xmit_policy_balance_xmit_policy = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result, + balance_xmit_policy,"balance_xmit_policy" ); +cmdline_parse_token_num_t cmd_setbonding_balance_xmit_policy_port = +TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result, + port_id,UINT8 ); +cmdline_parse_token_string_t cmd_setbonding_balance_xmit_policy_policy = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result, + policy,"l2#l23#l34" ); + +cmdline_parse_inst_t cmd_set_balance_xmit_policy = { + .f = cmd_set_bonding_balance_xmit_policy_parsed, + .help_str ="set bonding balance_xmit_policy (port_id) (policy_value): Set the bonding balance_xmit_policy for port_id" , + .data =NULL , + .tokens = { + (void *)&cmd_setbonding_balance_xmit_policy_set, + (void *)&cmd_setbonding_balance_xmit_policy_bonding, + (void *)&cmd_setbonding_balance_xmit_policy_balance_xmit_policy, + (void *)&cmd_setbonding_balance_xmit_policy_port, + (void *)&cmd_setbonding_balance_xmit_policy_policy, +NULL + } +}; + +/* *** SHOW NIC BONDING CONFIGURATION *** */ +struct cmd_show_bonding_config_result { +cmdline_fixed_string_t show; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t config; +uint8_t port_id; +}; + +static void cmd_show_bonding_config_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_show_bonding_config_result *res = parsed_result; +int bonding_mode; +uint8_t slaves[RTE_MAX_ETHPORTS ]; +int num_slaves, num_active_slaves; +int primary_id; +int i; +portid_t port_id = res->port_id; + +/* Display the bonding mode.*/ + bonding_mode =rte_eth_bond_mode_get (port_id); +if (bonding_mode <0 ) { +printf ("\tFailed to get bonding mode for port = %d\n" , port_id); +return ; + }else +printf ("\tBonding mode: %d\n" , bonding_mode); + +if (bonding_mode ==BONDING_MODE_BALANCE ) { +int balance_xmit_policy; + + balance_xmit_policy =rte_eth_bond_xmit_policy_get (port_id); +if (balance_xmit_policy <0 ) { +printf ("\tFailed to get balance xmit policy for port = %d\n" , + port_id); +return ; + }else { +printf ("\tBalance Xmit Policy: " ); + +switch (balance_xmit_policy) { +case BALANCE_XMIT_POLICY_LAYER2 : +printf ("BALANCE_XMIT_POLICY_LAYER2" ); +break ; +case BALANCE_XMIT_POLICY_LAYER23 : +printf ("BALANCE_XMIT_POLICY_LAYER23" ); +break ; +case BALANCE_XMIT_POLICY_LAYER34 : +printf ("BALANCE_XMIT_POLICY_LAYER34" ); +break ; + } +printf ("\n" ); + } + } + + num_slaves =rte_eth_bond_slaves_get (port_id, slaves,RTE_MAX_ETHPORTS ); + +if (num_slaves <0 ) { +printf ("\tFailed to get slave list for port = %d\n" , port_id); +return ; + } +if (num_slaves >0 ) { +printf ("\tSlaves (%d): [" , num_slaves); +for (i =0 ; i < num_slaves -1 ; i++) +printf ("%d " , slaves[i]); + +printf ("%d]\n" , slaves[num_slaves -1 ]); + }else { +printf ("\tSlaves: []\n" ); + + } + + num_active_slaves =rte_eth_bond_active_slaves_get (port_id, slaves, +RTE_MAX_ETHPORTS ); + +if (num_active_slaves <0 ) { +printf ("\tFailed to get active slave list for port = %d\n" , port_id); +return ; + } +if (num_active_slaves >0 ) { +printf ("\tActive Slaves (%d): [" , num_active_slaves); +for (i =0 ; i < num_active_slaves -1 ; i++) +printf ("%d " , slaves[i]); + +printf ("%d]\n" , slaves[num_active_slaves -1 ]); + + }else { +printf ("\tActive Slaves: []\n" ); + + } + + primary_id =rte_eth_bond_primary_get (port_id); +if (primary_id <0 ) { +printf ("\tFailed to get primary slave for port = %d\n" , port_id); +return ; + }else +printf ("\tPrimary: [%d]\n" , primary_id); + +} + +cmdline_parse_token_string_t cmd_showbonding_config_show = +TOKEN_STRING_INITIALIZER(struct cmd_show_bonding_config_result, + show,"show" ); +cmdline_parse_token_string_t cmd_showbonding_config_bonding = +TOKEN_STRING_INITIALIZER(struct cmd_show_bonding_config_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_showbonding_config_config = +TOKEN_STRING_INITIALIZER(struct cmd_show_bonding_config_result, + config,"config" ); +cmdline_parse_token_num_t cmd_showbonding_config_port = +TOKEN_NUM_INITIALIZER(struct cmd_show_bonding_config_result, + port_id,UINT8 ); + +cmdline_parse_inst_t cmd_show_bonding_config = { + .f = cmd_show_bonding_config_parsed, + .help_str ="show bonding config (port_id): Show the bonding config for port_id" , + .data =NULL , + .tokens = { + (void *)&cmd_showbonding_config_show, + (void *)&cmd_showbonding_config_bonding, + (void *)&cmd_showbonding_config_config, + (void *)&cmd_showbonding_config_port, +NULL + } +}; + +/* *** SET BONDING PRIMARY *** */ +struct cmd_set_bonding_primary_result { +cmdline_fixed_string_t set; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t primary; +uint8_t slave_id; +uint8_t port_id; +}; + +static void cmd_set_bonding_primary_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_set_bonding_primary_result *res = parsed_result; +portid_t master_port_id = res->port_id; +portid_t slave_port_id = res->slave_id; + +/* Set the primary slave for a bonded device. */ +if (0 !=rte_eth_bond_primary_set (master_port_id, slave_port_id)) { +printf ("\t Failed to set primary slave for port = %d.\n" , + master_port_id); +return ; + } +init_port_config (); +} + +cmdline_parse_token_string_t cmd_setbonding_primary_set = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_primary_result, + set,"set" ); +cmdline_parse_token_string_t cmd_setbonding_primary_bonding = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_primary_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_setbonding_primary_primary = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_primary_result, + primary,"primary" ); +cmdline_parse_token_num_t cmd_setbonding_primary_slave = +TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_primary_result, + slave_id,UINT8 ); +cmdline_parse_token_num_t cmd_setbonding_primary_port = +TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_primary_result, + port_id,UINT8 ); + +cmdline_parse_inst_t cmd_set_bonding_primary = { + .f = cmd_set_bonding_primary_parsed, + .help_str ="set bonding primary (slave_id) (port_id): Set the primary slave for port_id" , + .data =NULL , + .tokens = { + (void *)&cmd_setbonding_primary_set, + (void *)&cmd_setbonding_primary_bonding, + (void *)&cmd_setbonding_primary_primary, + (void *)&cmd_setbonding_primary_slave, + (void *)&cmd_setbonding_primary_port, +NULL + } +}; + +/* *** ADD SLAVE *** */ +struct cmd_add_bonding_slave_result { +cmdline_fixed_string_t add; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t slave; +uint8_t slave_id; +uint8_t port_id; +}; + +static void cmd_add_bonding_slave_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_add_bonding_slave_result *res = parsed_result; +portid_t master_port_id = res->port_id; +portid_t slave_port_id = res->slave_id; + +/* Set the primary slave for a bonded device. */ +if (0 !=rte_eth_bond_slave_add (master_port_id, slave_port_id)) { +printf ("\t Failed to add slave %d to master port = %d.\n" , + slave_port_id, master_port_id); +return ; + } +init_port_config (); +} + +cmdline_parse_token_string_t cmd_addbonding_slave_add = +TOKEN_STRING_INITIALIZER(struct cmd_add_bonding_slave_result, + add,"add" ); +cmdline_parse_token_string_t cmd_addbonding_slave_bonding = +TOKEN_STRING_INITIALIZER(struct cmd_add_bonding_slave_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_addbonding_slave_slave = +TOKEN_STRING_INITIALIZER(struct cmd_add_bonding_slave_result, + slave,"slave" ); +cmdline_parse_token_num_t cmd_addbonding_slave_slaveid = +TOKEN_NUM_INITIALIZER(struct cmd_add_bonding_slave_result, + slave_id,UINT8 ); +cmdline_parse_token_num_t cmd_addbonding_slave_port = +TOKEN_NUM_INITIALIZER(struct cmd_add_bonding_slave_result, + port_id,UINT8 ); + +cmdline_parse_inst_t cmd_add_bonding_slave = { + .f = cmd_add_bonding_slave_parsed, + .help_str ="add bonding slave (slave_id) (port_id): Add a slave device to a bonded device" , + .data =NULL , + .tokens = { + (void *)&cmd_addbonding_slave_add, + (void *)&cmd_addbonding_slave_bonding, + (void *)&cmd_addbonding_slave_slave, + (void *)&cmd_addbonding_slave_slaveid, + (void *)&cmd_addbonding_slave_port, +NULL + } +}; + +/* *** REMOVE SLAVE *** */ +struct cmd_remove_bonding_slave_result { +cmdline_fixed_string_t remove; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t slave; +uint8_t slave_id; +uint8_t port_id; +}; + +static void cmd_remove_bonding_slave_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_remove_bonding_slave_result *res = parsed_result; +portid_t master_port_id = res->port_id; +portid_t slave_port_id = res->slave_id; + +/* Set the primary slave for a bonded device. */ +if (0 !=rte_eth_bond_slave_remove (master_port_id, slave_port_id)) { +printf ("\t Failed to remove slave %d from master port = %d.\n" , + slave_port_id, master_port_id); +return ; + } +init_port_config (); +} + +cmdline_parse_token_string_t cmd_removebonding_slave_remove = + TOKEN_STRING_INITIALIZER(struct cmd_remove_bonding_slave_result, + remove,"remove" ); +cmdline_parse_token_string_t cmd_removebonding_slave_bonding = + TOKEN_STRING_INITIALIZER(struct cmd_remove_bonding_slave_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_removebonding_slave_slave = + TOKEN_STRING_INITIALIZER(struct cmd_remove_bonding_slave_result, + slave,"slave" ); +cmdline_parse_token_num_t cmd_removebonding_slave_slaveid = + TOKEN_NUM_INITIALIZER(struct cmd_remove_bonding_slave_result, + slave_id,UINT8 ); +cmdline_parse_token_num_t cmd_removebonding_slave_port = + TOKEN_NUM_INITIALIZER(struct cmd_remove_bonding_slave_result, + port_id,UINT8 ); + +cmdline_parse_inst_t cmd_remove_bonding_slave = { + .f = cmd_remove_bonding_slave_parsed, + .help_str ="remove bonding slave (slave_id) (port_id): Remove a slave device from a bonded device" , + .data =NULL , + .tokens = { + (void *)&cmd_removebonding_slave_remove, + (void *)&cmd_removebonding_slave_bonding, + (void *)&cmd_removebonding_slave_slave, + (void *)&cmd_removebonding_slave_slaveid, + (void *)&cmd_removebonding_slave_port, +NULL + } +}; + +/* *** CREATE BONDED DEVICE *** */ +struct cmd_create_bonded_device_result { +cmdline_fixed_string_t create; +cmdline_fixed_string_t bonded; +cmdline_fixed_string_t device; +uint8_t mode; +uint8_t socket; +}; + +static int bond_dev_num =0 ; + +static void cmd_create_bonded_device_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_create_bonded_device_result *res = parsed_result; +char ethdev_name[RTE_ETH_NAME_MAX_LEN ]; +int port_id; + +if (test_done ==0 ) { +printf ("Please stop forwarding first\n" ); +return ; + } + +rte_snprintf (ethdev_name,RTE_ETH_NAME_MAX_LEN ,"eth_bond_testpmd_%d" , + bond_dev_num++); + +/* Create a new bonded device. */ + port_id =rte_eth_bond_create (ethdev_name, res->mode, res->socket); +if (port_id <0 ) { +printf ("\t Failed to create bonded device.\n" ); +return ; + }else { +printf ("Created new bonded device %s on (port %d).\n" , ethdev_name, + port_id); + +/* Update number of ports */ + nb_ports =rte_eth_dev_count (); +reconfig (port_id); +rte_eth_promiscuous_enable (port_id); + } + +} + +cmdline_parse_token_string_t cmd_createbonded_device_create = + TOKEN_STRING_INITIALIZER(struct cmd_create_bonded_device_result, + create,"create" ); +cmdline_parse_token_string_t cmd_createbonded_device_bonded = + TOKEN_STRING_INITIALIZER(struct cmd_create_bonded_device_result, + bonded,"bonded" ); +cmdline_parse_token_string_t cmd_createbonded_device_device = + TOKEN_STRING_INITIALIZER(struct cmd_create_bonded_device_result, + device,"device" ); +cmdline_parse_token_num_t cmd_createbonded_device_mode = + TOKEN_NUM_INITIALIZER(struct cmd_create_bonded_device_result, + mode,UINT8 ); +cmdline_parse_token_num_t cmd_createbonded_device_socket = + TOKEN_NUM_INITIALIZER(struct cmd_create_bonded_device_result, + socket,UINT8 ); + +cmdline_parse_inst_t cmd_create_bonded_device = { + .f = cmd_create_bonded_device_parsed, + .help_str ="create bonded device (mode) (socket): Create a new bonded device with specific bonding mode and socket" , + .data =NULL , + .tokens = { + (void *)&cmd_createbonded_device_create, + (void *)&cmd_createbonded_device_bonded, + (void *)&cmd_createbonded_device_device, + (void *)&cmd_createbonded_device_mode, + (void *)&cmd_createbonded_device_socket, +NULL + } +}; + +/* *** SET MAC ADDRESS IN BONDED DEVICE *** */ +struct cmd_set_bond_mac_addr_result { +cmdline_fixed_string_t set; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t mac_addr; +uint8_t port_num; +struct ether_addr address; +}; + +static void cmd_set_bond_mac_addr_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_set_bond_mac_addr_result *res = parsed_result; +int ret; + +if (res->port_num >= nb_ports) { +printf ("Port id %d must be less than %d\n" , res->port_num, nb_ports); +return ; + } + + ret =rte_eth_bond_mac_address_set (res->port_num, &res->address); + +/* check the return value and print it if is < 0 */ +if (ret <0 ) +printf ("set_bond_mac_addr error: (%s)\n" ,strerror (-ret)); +} + +cmdline_parse_token_string_t cmd_set_bond_mac_addr_set = + TOKEN_STRING_INITIALIZER(struct cmd_set_bond_mac_addr_result, set, "set"); +cmdline_parse_token_string_t cmd_set_bond_mac_addr_bonding = + TOKEN_STRING_INITIALIZER(struct cmd_set_bond_mac_addr_result, bonding, +"bonding" ); +cmdline_parse_token_string_t cmd_set_bond_mac_addr_mac = + TOKEN_STRING_INITIALIZER(struct cmd_set_bond_mac_addr_result, mac_addr, +"mac_addr" ); +cmdline_parse_token_num_t cmd_set_bond_mac_addr_portnum = + TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mac_addr_result, port_num, UINT8); +cmdline_parse_token_etheraddr_t cmd_set_bond_mac_addr_addr = + TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_bond_mac_addr_result, address); + +cmdline_parse_inst_t cmd_set_bond_mac_addr = { + .f = cmd_set_bond_mac_addr_parsed, + .data = (void *)0 , + .help_str ="set bonding mac_addr (port_id) (address): " , + .tokens = { + (void *)&cmd_set_bond_mac_addr_set, + (void *)&cmd_set_bond_mac_addr_bonding, + (void *)&cmd_set_bond_mac_addr_mac, + (void *)&cmd_set_bond_mac_addr_portnum, + (void *)&cmd_set_bond_mac_addr_addr, +NULL + } +}; + +#endif /* RTE_LIBRTE_PMD_BOND */ +/* *** SET FORWARDING MODE *** */ struct cmd_set_fwd_mode_result {cmdline_fixed_string_t set;
@@ -6572,6 +7141,16 @@ cmdline_parse_ctx_t main_ctx[] = { (cmdline_parse_inst_t *)&cmd_set_bypass_timeout, (cmdline_parse_inst_t *)&cmd_show_bypass_config, #endif +#ifdef RTE_LIBRTE_PMD_BOND + (cmdline_parse_inst_t *) &cmd_set_bonding_mode, + (cmdline_parse_inst_t *) &cmd_show_bonding_config, + (cmdline_parse_inst_t *) &cmd_set_bonding_primary, + (cmdline_parse_inst_t *) &cmd_add_bonding_slave, + (cmdline_parse_inst_t *) &cmd_remove_bonding_slave, + (cmdline_parse_inst_t *) &cmd_create_bonded_device, + (cmdline_parse_inst_t *) &cmd_set_bond_mac_addr, + (cmdline_parse_inst_t *) &cmd_set_balance_xmit_policy, +#endif (cmdline_parse_inst_t *)&cmd_vlan_offload, (cmdline_parse_inst_t *)&cmd_vlan_tpid, (cmdline_parse_inst_t *)&cmd_rx_vlan_filter_all,
app/test-pmd/config.c +3 -1
@@ -252,6 +252,7 @@ void port_infos_display(portid_t port_id) {struct rte_port *port; +struct ether_addr mac_addr;struct rte_eth_link link;int vlan_offload;struct rte_mempool * mp;
@@ -265,7 +266,8 @@ port_infos_display(portid_t port_id)rte_eth_link_get_nowait (port_id, &link);printf ("\n%s Infos for port %-2d %s\n" , info_border, port_id, info_border); -print_ethaddr ("MAC address: " , &port->eth_addr); +rte_eth_macaddr_get (port_id, &mac_addr); +print_ethaddr ("MAC address: " , &mac_addr);printf ("\nConnect to socket: %u" , port->socket_id);if (port_numa[port_id] !=NUMA_NO_CONFIG ) {
app/test-pmd/parameters.c +3 -0
@@ -75,6 +75,9 @@#include <cmdline_parse.h> #include <cmdline_parse_etheraddr.h> #endif +#ifdef RTE_LIBRTE_PMD_BOND +#include <rte_eth_bond.h> +#endif #include "testpmd.h"
app/test-pmd/testpmd.c +32 -8
@@ -300,7 +300,7 @@ struct rte_fdir_conf fdir_conf = { .drop_queue = 127, }; -static volatile int test_done =1 ;/* stop packet forwarding when set to 1. */ +volatile int test_done =1 ;/* stop packet forwarding when set to 1. */ struct queue_stats_mappings tx_queue_stats_mappings_array[MAX_TX_QUEUE_STATS_MAPPINGS ];struct queue_stats_mappings rx_queue_stats_mappings_array[MAX_RX_QUEUE_STATS_MAPPINGS ];
@@ -625,6 +625,32 @@ init_config(void)rte_exit (EXIT_FAILURE ,"FAIL from init_fwd_streams()\n" ); } + +void +reconfig (portid_t new_port_id) +{ +struct rte_port *port; + +/* Reconfiguration of Ethernet ports. */ + ports =rte_realloc (ports, +sizeof (struct rte_port ) * nb_ports, +CACHE_LINE_SIZE ); +if (ports ==NULL ) { +rte_exit (EXIT_FAILURE ,"rte_realloc(%d struct rte_port) failed\n" , + nb_ports); + } + + port = &ports[new_port_id]; +rte_eth_dev_info_get (new_port_id, &port->dev_info); + +/* set flag to initialize port/queue */ + port->need_reconfig =1 ; + port->need_reconfig_queues =1 ; + +init_port_config (); +} + +int init_fwd_streams (void ) {
@@ -1252,7 +1278,7 @@ start_port(portid_t pid)portid_t pi;queueid_t qi;struct rte_port *port; -uint8_t *mac_addr; +struct ether_addr mac_addr;if (test_done ==0 ) {printf ("Please stop forwarding first\n" );
@@ -1380,10 +1406,11 @@ start_port(portid_t pid) RTE_PORT_HANDLING, RTE_PORT_STARTED) == 0)printf ("Port %d can not be set into started\n" , pi); - mac_addr = port->eth_addr.addr_bytes; +rte_eth_macaddr_get (pi, &mac_addr);printf ("Port %d: %02X:%02X:%02X:%02X:%02X:%02X\n" , pi, - mac_addr[0 ], mac_addr[1 ], mac_addr[2 ], - mac_addr[3 ], mac_addr[4 ], mac_addr[5 ]); + mac_addr.addr_bytes[0 ], mac_addr.addr_bytes[1 ], + mac_addr.addr_bytes[2 ], mac_addr.addr_bytes[3 ], + mac_addr.addr_bytes[4 ], mac_addr.addr_bytes[5 ]);/* at least one port started, need checking link status */ need_check_link_status =1 ;
@@ -1826,9 +1853,6 @@ main(int argc, char** argv)if (diag <0 )rte_panic ("Cannot init EAL\n" ); -if (rte_eal_pci_probe ()) -rte_panic ("Cannot probe PCI\n" ); - nb_ports = (portid_t )rte_eth_dev_count ();if (nb_ports ==0 ) rte_exit(EXIT_FAILURE, "No probed ethernet devices - "
app/test-pmd/testpmd.h +2 -0
@@ -279,6 +279,7 @@ extern uint16_t port_topology; /**< set by "--port-topology" parameter */extern uint8_t no_flush_rx;/**<set by "--no-flush-rx" parameter */ extern uint8_t mp_anon;/**< set by "--mp-anon" parameter */ extern uint8_t no_link_check;/**<set by "--disable-link-check" parameter */ +extern volatile int test_done;/* stop packet forwarding when set to 1. */ #ifdef RTE_NIC_BYPASS extern uint32_t bypass_timeout;/**< Store the NIC bypass watchdog timeout */
@@ -452,6 +453,7 @@ void fwd_config_display(void);void rxtx_config_display (void );void fwd_config_setup (void );void set_def_fwd_config (void ); +void reconfig (portid_t new_port_id);int init_fwd_streams (void );void port_mtu_set (portid_t port_id,uint16_t mtu);
Signature · 1 line
1.7.0.7
PATCH v5 6/6 Link Bonding Library doxygen additions
In reply to a message not in the archive--- doc/doxy-api-index.md | 1 + doc/doxy-api.conf | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
doc/doxy-api-index.md +1 -0
@@ -36,6 +36,7 @@ API {#index} There are many libraries, so their headers may be grouped by topics: - **device**: + [bond] (@ref rte_eth_bond.h), [ethdev] (@ref rte_ethdev.h), [devargs] (@ref rte_devargs.h), [KNI] (@ref rte_kni.h),
doc/doxy-api.conf +1 -0
@@ -30,6 +30,7 @@ PROJECT_NAME = DPDK INPUT = doc/doxy-api-index.md \ + lib/librte_pmd_bond \ lib/librte_eal/common/include \ lib/librte_acl \ lib/librte_distributor \
Signature · 1 line
1.7.0.7
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
In reply to a message not in the archive--- config/common_bsdapp | 5 + config/common_linuxapp | 5 + lib/Makefile | 1 + lib/librte_pmd_bond/Makefile | 32 + lib/librte_pmd_bond/rte_eth_bond.c | 2149 ++++++++++++++++++++++++++++++++++++ lib/librte_pmd_bond/rte_eth_bond.h | 255 +++++ mk/rte.app.mk | 5 + 7 files changed, 2452 insertions(+), 0 deletions(-) create mode 100644 lib/librte_pmd_bond/Makefile create mode 100644 lib/librte_pmd_bond/rte_eth_bond.c create mode 100644 lib/librte_pmd_bond/rte_eth_bond.h
config/common_bsdapp +5 -0
@@ -189,6 +189,11 @@ CONFIG_RTE_PMD_RING_MAX_TX_RINGS=16 CONFIG_RTE_LIBRTE_PMD_PCAP=y # +# Compile link bonding pmd library +# +CONFIG_RTE_LIBRTE_PMD_BOND=y + +# # Do prefetch of packet data within PMD driver receive function # CONFIG_RTE_PMD_PACKET_PREFETCH=y
config/common_linuxapp +5 -0
@@ -218,6 +218,11 @@ CONFIG_RTE_PMD_RING_MAX_TX_RINGS=16 CONFIG_RTE_LIBRTE_PMD_PCAP=n # +# Compile link bonding pmd library +# +CONFIG_RTE_LIBRTE_PMD_BOND=y + +# # Compile Xen PMD # CONFIG_RTE_LIBRTE_PMD_XENVIRT=n
lib/Makefile +1 -0
@@ -47,6 +47,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += librte_pmd_pcap DIRS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += librte_pmd_virtio DIRS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += librte_pmd_vmxnet3 DIRS-$(CONFIG_RTE_LIBRTE_PMD_XENVIRT) += librte_pmd_xenvirt +DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += librte_pmd_bond DIRS-$(CONFIG_RTE_LIBRTE_HASH) += librte_hash DIRS-$(CONFIG_RTE_LIBRTE_LPM) += librte_lpm DIRS-$(CONFIG_RTE_LIBRTE_ACL) += librte_acl
lib/librte_pmd_bond/Makefile new file +32 -0
@@ -0,0 +1,32 @@ +# <COPYRIGHT_TAG> + +include $(RTE_SDK)/mk/rte.vars.mk + +# +# library name +# +LIB = librte_pmd_bond.a + +CFLAGS += -O3 +CFLAGS += $(WERROR_FLAGS) + +# +# all source are stored in SRCS-y +# +SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond.c + + +# +# Export include files +# +SYMLINK-y-include += rte_eth_bond.h + + +# this lib depends upon: +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += lib/librte_mbuf +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += lib/librte_ether +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += lib/librte_malloc +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += lib/librte_eal +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += lib/librte_kvargs + +include $(RTE_SDK)/mk/rte.lib.mk
lib/librte_pmd_bond/rte_eth_bond.c new file +2149 -0
2,149 lines not on this page · raw message
lib/librte_pmd_bond/rte_eth_bond.h new file +255 -0
255 lines not on this page · raw message
mk/rte.app.mk +5 -0
@@ -181,8 +181,13 @@ ifeq ($(CONFIG_RTE_LIBRTE_PMD_PCAP),y) LDLIBS += -lrte_pmd_pcap -lpcap endif +ifeq ($(CONFIG_RTE_LIBRTE_PMD_BOND),y) +LDLIBS += -lrte_pmd_bond endif +endif + + LDLIBS += $(EXECENV_LDLIBS) LDLIBS += --end-group
Signature · 1 line
1.7.0.7
PATCH v4 2/6 Support for unique interface naming of pmds
In reply to a message not in the archiveAdding support to rte_eth_dev_data structure to support unique name identifier for ethdevs to support adding slave ethdevs (specifically virtual devices which have no public unique identifier) to a link bonding device. This changes the API rte_eth_dev_allocate() to require a const char *name when allocating a ethdev, which also verifies that the name is unique and hasn’t been already used by an existed allocated rte_eth_dev. Also contains updates to virtual pmd’s to now call the API with a name parameter.
--- lib/librte_ether/rte_ethdev.c | 33 +++++++++++++++++++++++++++-- lib/librte_ether/rte_ethdev.h | 7 +++++- lib/librte_pmd_pcap/rte_eth_pcap.c | 22 ++++++++++---------- lib/librte_pmd_ring/rte_eth_ring.c | 32 +++++++++++++++------------- lib/librte_pmd_ring/rte_eth_ring.h | 3 +- lib/librte_pmd_xenvirt/rte_eth_xenvirt.c | 2 +- 6 files changed, 67 insertions(+), 32 deletions(-)
lib/librte_ether/rte_ethdev.c +30 -3
@@ -64,6 +64,7 @@#include <rte_mbuf.h> #include <rte_errno.h> #include <rte_spinlock.h> +#include <rte_string_fns.h> #include "rte_ether.h" #include "rte_ethdev.h"
@@ -152,8 +153,21 @@ rte_eth_dev_data_alloc(void) RTE_MAX_ETHPORTS * sizeof(*rte_eth_dev_data)); } +static int +rte_eth_dev_name_unique (const char *name) +{ +unsigned i; + +for (i =0 ; i < nb_ports; i++) { +if (strcmp (rte_eth_devices[i].data->name, name) ==0 ) +return -1 ; + } + +return 0 ; +} +struct rte_eth_dev * -rte_eth_dev_allocate (void ) +rte_eth_dev_allocate (const char *name) {struct rte_eth_dev *eth_dev;
@@ -165,23 +179,36 @@ rte_eth_dev_allocate(void)if (rte_eth_dev_data ==NULL )rte_eth_dev_data_alloc (); +if (rte_eth_dev_name_unique (name)) { +PMD_DEBUG_TRACE ("Ethernet Device with name %s already allocated!\n" ); +return NULL ; + } + eth_dev = &rte_eth_devices[nb_ports]; eth_dev->data = &rte_eth_dev_data[nb_ports]; +rte_snprintf (eth_dev->data->name,sizeof (eth_dev->data->name), +"%s" , name); eth_dev->data->port_id = nb_ports++;return eth_dev; }static int rte_eth_dev_init (struct rte_pci_driver *pci_drv, -struct rte_pci_device *pci_dev) +struct rte_pci_device *pci_dev) {struct eth_driver *eth_drv;struct rte_eth_dev *eth_dev; +char ethdev_name[RTE_ETH_NAME_MAX_LEN ]; +int diag; eth_drv = (struct eth_driver *)pci_drv; - eth_dev =rte_eth_dev_allocate (); +/* Create unique ethdev name from pci address */ +rte_snprintf (ethdev_name,RTE_ETH_NAME_MAX_LEN ,"%d:%d.%d" , + pci_dev->addr.bus, pci_dev->addr.devid, pci_dev->addr.function); + + eth_dev =rte_eth_dev_allocate (ethdev_name);if (eth_dev ==NULL )return -ENOMEM ;
lib/librte_ether/rte_ethdev.h +6 -1
@@ -1233,6 +1233,8 @@ struct rte_eth_dev_sriov { };#define RTE_ETH_DEV_SRIOV (dev) ((dev)->data->sriov) +#define RTE_ETH_NAME_MAX_LEN (32) +/** * @internal * The data part, with no function pointers, associated with each ethernet device.
@@ -1241,6 +1243,8 @@ struct rte_eth_dev_sriov {* processes in a multi-process configuration. */ struct rte_eth_dev_data { +char name[RTE_ETH_NAME_MAX_LEN ];/**< Unique identifier name */ +void **rx_queues;/**< Array of pointers to RX queues. */ void **tx_queues;/**< Array of pointers to TX queues. */ uint16_t nb_rx_queues;/**< Number of RX queues. */
@@ -1293,10 +1297,11 @@ extern uint8_t rte_eth_dev_count(void);* Allocates a new ethdev slot for an ethernet device and returns the pointer * to that slot for the driver to use. * +* @param name Unique identifier name for each Ethernet device * @return * - Slot in the rte_dev_devices array for a new device; */ -struct rte_eth_dev *rte_eth_dev_allocate (void ); +struct rte_eth_dev *rte_eth_dev_allocate (const char *name);struct eth_driver ;/**
lib/librte_pmd_pcap/rte_eth_pcap.c +11 -11
@@ -534,7 +534,7 @@ open_tx_iface(const char *key __rte_unused, const char *value, void *extra_args) static int -rte_pmd_init_internals(const unsigned nb_rx_queues, +rte_pmd_init_internals(const char *name, const unsigned nb_rx_queues, const unsigned nb_tx_queues, const unsigned numa_node, struct pmd_internals **internals,
@@ -558,20 +558,20 @@ rte_pmd_init_internals(const unsigned nb_rx_queues,/* now do all data allocation - for eth_dev structure, dummy pci driver * and internal (private) data */ - data =rte_zmalloc_socket (NULL ,sizeof (*data),0 , numa_node); + data =rte_zmalloc_socket (name,sizeof (*data),0 , numa_node);if (data ==NULL ) goto error; - pci_dev =rte_zmalloc_socket (NULL ,sizeof (*pci_dev),0 , numa_node); + pci_dev =rte_zmalloc_socket (name,sizeof (*pci_dev),0 , numa_node);if (pci_dev ==NULL ) goto error; - *internals =rte_zmalloc_socket (NULL ,sizeof (**internals),0 , numa_node); + *internals =rte_zmalloc_socket (name,sizeof (**internals),0 , numa_node);if (*internals ==NULL ) goto error;/* reserve an ethdev entry */ - *eth_dev =rte_eth_dev_allocate (); + *eth_dev =rte_eth_dev_allocate (name);if (*eth_dev ==NULL ) goto error;
@@ -617,7 +617,7 @@ rte_pmd_init_internals(const unsigned nb_rx_queues, } static int -rte_eth_from_pcaps_n_dumpers(pcap_t * const rx_queues[], +rte_eth_from_pcaps_n_dumpers(const char *name, pcap_t * const rx_queues[], const unsigned nb_rx_queues, pcap_dumper_t * const tx_queues[], const unsigned nb_tx_queues,
@@ -634,7 +634,7 @@ rte_eth_from_pcaps_n_dumpers(pcap_t * const rx_queues[],if (tx_queues ==NULL && nb_tx_queues >0 )return -1 ; -if (rte_pmd_init_internals (nb_rx_queues, nb_tx_queues, numa_node, +if (rte_pmd_init_internals (name, nb_rx_queues, nb_tx_queues, numa_node, &internals, ð_dev, kvlist) <0 )return -1 ;
@@ -652,7 +652,7 @@ rte_eth_from_pcaps_n_dumpers(pcap_t * const rx_queues[], } static int -rte_eth_from_pcaps(pcap_t * const rx_queues[], +rte_eth_from_pcaps(const char *name, pcap_t * const rx_queues[], const unsigned nb_rx_queues, pcap_t * const tx_queues[], const unsigned nb_tx_queues,
@@ -669,7 +669,7 @@ rte_eth_from_pcaps(pcap_t * const rx_queues[],if (tx_queues ==NULL && nb_tx_queues >0 )return -1 ; -if (rte_pmd_init_internals (nb_rx_queues, nb_tx_queues, numa_node, +if (rte_pmd_init_internals (name, nb_rx_queues, nb_tx_queues, numa_node, &internals, ð_dev, kvlist) <0 )return -1 ;
@@ -760,10 +760,10 @@ rte_pmd_pcap_devinit(const char *name, const char *params)return -1 ;if (using_dumpers) -return rte_eth_from_pcaps_n_dumpers (pcaps.pcaps, pcaps.num_of_rx, +return rte_eth_from_pcaps_n_dumpers (name, pcaps.pcaps, pcaps.num_of_rx, dumpers.dumpers, dumpers.num_of_tx, numa_node, kvlist); -return rte_eth_from_pcaps (pcaps.pcaps, pcaps.num_of_rx, dumpers.pcaps, +return rte_eth_from_pcaps (name, pcaps.pcaps, pcaps.num_of_rx, dumpers.pcaps, dumpers.num_of_tx, numa_node, kvlist); }
lib/librte_pmd_ring/rte_eth_ring.c +17 -15
@@ -219,7 +219,7 @@ static struct eth_dev_ops ops = { }; int -rte_eth_from_rings(struct rte_ring *const rx_queues[], +rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[], const unsigned nb_rx_queues, struct rte_ring *const tx_queues[], const unsigned nb_tx_queues,
@@ -243,20 +243,20 @@ rte_eth_from_rings(struct rte_ring *const rx_queues[],/* now do all data allocation - for eth_dev structure, dummy pci driver * and internal (private) data */ - data =rte_zmalloc_socket (NULL ,sizeof (*data),0 , numa_node); + data =rte_zmalloc_socket (name,sizeof (*data),0 , numa_node);if (data ==NULL ) goto error; - pci_dev =rte_zmalloc_socket (NULL ,sizeof (*pci_dev),0 , numa_node); + pci_dev =rte_zmalloc_socket (name,sizeof (*pci_dev),0 , numa_node);if (pci_dev ==NULL ) goto error; - internals =rte_zmalloc_socket (NULL ,sizeof (*internals),0 , numa_node); + internals =rte_zmalloc_socket (name,sizeof (*internals),0 , numa_node);if (internals ==NULL ) goto error;/* reserve an ethdev entry */ - eth_dev =rte_eth_dev_allocate (); + eth_dev =rte_eth_dev_allocate (name);if (eth_dev ==NULL ) goto error;
@@ -335,7 +335,7 @@ eth_dev_ring_create(const char *name, const unsigned numa_node,return -1 ; } -if (rte_eth_from_rings (rxtx, num_rings, rxtx, num_rings, numa_node)) +if (rte_eth_from_rings (name, rxtx, num_rings, rxtx, num_rings, numa_node))return -1 ;return 0 ;
@@ -352,29 +352,31 @@ eth_dev_ring_pair_create(const char *name, const unsigned numa_node,struct rte_ring *rx[RTE_PMD_RING_MAX_RX_RINGS ];struct rte_ring *tx[RTE_PMD_RING_MAX_TX_RINGS ];unsigned i; -char rng_name[RTE_RING_NAMESIZE ]; +char rx_rng_name[RTE_RING_NAMESIZE ]; +char tx_rng_name[RTE_RING_NAMESIZE ];unsigned num_rings =RTE_MIN (RTE_PMD_RING_MAX_RX_RINGS ,RTE_PMD_RING_MAX_TX_RINGS );for (i =0 ; i < num_rings; i++) { -rte_snprintf (rng_name,sizeof (rng_name),"ETH_RX%u_%s" , i, name); +rte_snprintf (rx_rng_name,sizeof (rx_rng_name),"ETH_RX%u_%s" , i, name); rx[i] = (action ==DEV_CREATE ) ? -rte_ring_create (rng_name,1024 , numa_node, +rte_ring_create (rx_rng_name,1024 , numa_node,RING_F_SP_ENQ |RING_F_SC_DEQ ) : -rte_ring_lookup (rng_name); +rte_ring_lookup (rx_rng_name);if (rx[i] ==NULL )return -1 ; -rte_snprintf (rng_name,sizeof (rng_name),"ETH_TX%u_%s" , i, name); +rte_snprintf (tx_rng_name,sizeof (tx_rng_name),"ETH_TX%u_%s" , i, name); tx[i] = (action ==DEV_CREATE ) ? -rte_ring_create (rng_name,1024 , numa_node, +rte_ring_create (tx_rng_name,1024 , numa_node,RING_F_SP_ENQ |RING_F_SC_DEQ ): -rte_ring_lookup (rng_name); +rte_ring_lookup (tx_rng_name);if (tx[i] ==NULL )return -1 ; } -if (rte_eth_from_rings (rx, num_rings, tx, num_rings, numa_node) || -rte_eth_from_rings (tx, num_rings, rx, num_rings, numa_node) ) +if (rte_eth_from_rings (rx_rng_name, rx, num_rings, tx, num_rings, + numa_node) ||rte_eth_from_rings (tx_rng_name, tx, num_rings, rx, + num_rings, numa_node))return -1 ;return 0 ;
lib/librte_pmd_ring/rte_eth_ring.h +2 -1
@@ -40,7 +40,8 @@ extern "C" {#include <rte_ring.h> -int rte_eth_from_rings(struct rte_ring * const rx_queues[], +int rte_eth_from_rings(const char *name, + struct rte_ring * const rx_queues[], const unsigned nb_rx_queues, struct rte_ring *const tx_queues[], const unsigned nb_tx_queues,
lib/librte_pmd_xenvirt/rte_eth_xenvirt.c +1 -1
@@ -647,7 +647,7 @@ eth_dev_xenvirt_create(const char *name, const char *params, goto err;/* reserve an ethdev entry */ - eth_dev =rte_eth_dev_allocate (); + eth_dev =rte_eth_dev_allocate (name);if (eth_dev ==NULL ) goto err;
Signature · 1 line
1.7.0.7
PATCH v4 3/6 EAL support for link bonding device initialization
In reply to a message not in the archiveUpdating 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.
--- 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(-)
lib/librte_eal/common/eal_common_dev.c +62 -4
@@ -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 +
lib/librte_eal/common/eal_common_pci.c +6 -0
@@ -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 */
lib/librte_eal/common/include/eal_private.h +7 -0
@@ -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_ */
lib/librte_eal/common/include/rte_dev.h +1 -0
@@ -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*/ };/**
Signature · 1 line
1.7.0.7
PATCH v4 4/6 Link bonding Unit Tests
In reply to a message not in the archiveIncluding:
- 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
--- app/test/Makefile | 4 +- app/test/commands.c | 7 + app/test/packet_burst_generator.c | 288 +++ app/test/packet_burst_generator.h | 78 + app/test/test.h | 1 + app/test/test_link_bonding.c | 3958 +++++++++++++++++++++++++++++++++++++ app/test/virtual_pmd.c | 574 ++++++ app/test/virtual_pmd.h | 74 + 8 files changed, 4983 insertions(+), 1 deletions(-) create mode 100644 app/test/packet_burst_generator.c create mode 100644 app/test/packet_burst_generator.h create mode 100644 app/test/test_link_bonding.c create mode 100644 app/test/virtual_pmd.c create mode 100644 app/test/virtual_pmd.h
app/test/Makefile +3 -1
@@ -96,7 +96,9 @@ SRCS-$(CONFIG_RTE_APP_TEST) += test_ivshmem.c SRCS-$(CONFIG_RTE_APP_TEST) += test_distributor.c SRCS-$(CONFIG_RTE_APP_TEST) += test_distributor_perf.c SRCS-$(CONFIG_RTE_APP_TEST) += test_devargs.c - +SRCS-$(CONFIG_RTE_APP_TEST) += virtual_pmd.c +SRCS-$(CONFIG_RTE_APP_TEST) += packet_burst_generator.c +SRCS-$(CONFIG_RTE_APP_TEST) += test_link_bonding.c ifeq ($(CONFIG_RTE_APP_TEST),y) SRCS-$(CONFIG_RTE_LIBRTE_ACL) += test_acl.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_pmd_ring.c
app/test/commands.c +7 -0
@@ -157,6 +157,10 @@ static void cmd_autotest_parsed(void *parsed_result, ret =test_timer ();if (!strcmp (res->autotest,"timer_perf_autotest" )) ret =test_timer_perf (); +#ifdef RTE_LIBRTE_PMD_BOND +if (!strcmp (res->autotest,"link_bonding_autotest" )) + ret =test_link_bonding (); +#endif if (!strcmp (res->autotest,"mempool_autotest" )) ret =test_mempool ();if (!strcmp (res->autotest,"mempool_perf_autotest" ))
@@ -225,6 +229,9 @@ cmdline_parse_token_string_t cmd_autotest_autotest = "alarm_autotest#interrupt_autotest#" "version_autotest#eal_fs_autotest#" "cmdline_autotest#func_reentrancy_autotest#" +#ifdef RTE_LIBRTE_PMD_BOND + "link_bonding_autotest#" +#endif"mempool_perf_autotest#hash_perf_autotest#" "memcpy_perf_autotest#ring_perf_autotest#" "red_autotest#meter_autotest#sched_autotest#"
app/test/packet_burst_generator.c new file +288 -0
288 lines not on this page · raw message
app/test/packet_burst_generator.h new file +78 -0
78 lines not on this page · raw message
app/test/test.h +1 -0
@@ -96,6 +96,7 @@ int test_distributor(void);int test_distributor_perf (void );int test_kvargs (void );int test_devargs (void ); +int test_link_bonding (void );int test_pci_run;
app/test/test_link_bonding.c new file +3958 -0
2,598 lines not on this page · raw message
app/test/virtual_pmd.c new file +574 -0
574 lines not on this page · raw message
app/test/virtual_pmd.h new file +74 -0
74 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.7.0.7
Part of the diff is not shown here. View the raw message.
PATCH v4 5/6 testpmd link bonding additions
In reply to a message not in the archive - 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
--- app/test-pmd/cmdline.c | 571 +++++++++++++++++++++++++++++++++++++++++++++ app/test-pmd/config.c | 4 +- app/test-pmd/parameters.c | 3 + app/test-pmd/testpmd.c | 37 +++- app/test-pmd/testpmd.h | 2 + 5 files changed, 611 insertions(+), 6 deletions(-)
app/test-pmd/cmdline.c +571 -0
@@ -84,6 +84,9 @@#include <cmdline_socket.h> #include <cmdline.h> #include <rte_pci_dev_ids.h> +#ifdef RTE_LIBRTE_PMD_BOND +#include <rte_eth_bond.h> +#endif #include "testpmd.h"
@@ -400,6 +403,31 @@ static void cmd_help_long_parsed(void *parsed_result," Show the bypass configuration for a bypass enabled NIC" " using the lowest port on the NIC.\n\n"#endif +#ifdef RTE_LIBRTE_PMD_BOND +"create bonded device (mode) (socket)\n" +" Create a new bonded device with specific bonding mode and socket.\n\n" + +"add bonding slave (slave_id) (port_id)\n" +" Add a slave device to a bonded device.\n\n" + +"remove bonding slave (slave_id) (port_id)\n" +" Remove a slave device from a bonded device.\n\n" + +"set bonding mode (value) (port_id)\n" +" Set the bonding mode on a bonded device.\n\n" + +"set bonding primary (slave_id) (port_id)\n" +" Set the primary slave for a bonded device.\n\n" + +"show bonding config (port_id)\n" +" Show the bonding config for port_id.\n\n" + +"set bonding mac_addr (port_id) (address)\n" +" Set the MAC address of a bonded device.\n\n" + +"set bonding xmit_balance_policy (port_id) (l2|l23|l34)\n" +" Set the transmit balance policy for bonded device running in balance mode.\n\n" +#endif ,list_pkt_forwarding_modes () );
@@ -2856,6 +2884,539 @@ cmdline_parse_inst_t cmd_show_bypass_config = { };#endif +#ifdef RTE_LIBRTE_PMD_BOND +/* *** SET BONDING MODE *** */ +struct cmd_set_bonding_mode_result { +cmdline_fixed_string_t set; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t mode; +uint8_t value; +uint8_t port_id; +}; + +static void cmd_set_bonding_mode_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_set_bonding_mode_result *res = parsed_result; +portid_t port_id = res->port_id; + +/* Set the bonding mode for the relevant port. */ +if (0 !=rte_eth_bond_mode_set (port_id, res->value)) +printf ("\t Failed to set bonding mode for port = %d.\n" , port_id); +} + +cmdline_parse_token_string_t cmd_setbonding_mode_set = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_mode_result, + set,"set" ); +cmdline_parse_token_string_t cmd_setbonding_mode_bonding = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_mode_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_setbonding_mode_mode = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_mode_result, + mode,"mode" ); +cmdline_parse_token_num_t cmd_setbonding_mode_value = +TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_mode_result, + value,UINT8 ); +cmdline_parse_token_num_t cmd_setbonding_mode_port = +TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_mode_result, + port_id,UINT8 ); + +cmdline_parse_inst_t cmd_set_bonding_mode = { + .f = cmd_set_bonding_mode_parsed, + .help_str ="set bonding mode (mode_value) (port_id): Set the bonding mode for port_id" , + .data =NULL , + .tokens = { + (void *) &cmd_setbonding_mode_set, + (void *) &cmd_setbonding_mode_bonding, + (void *) &cmd_setbonding_mode_mode, + (void *) &cmd_setbonding_mode_value, + (void *) &cmd_setbonding_mode_port, +NULL + } +}; + +/* *** SET BALANCE XMIT POLICY *** */ +struct cmd_set_bonding_balance_xmit_policy_result { +cmdline_fixed_string_t set; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t balance_xmit_policy; +uint8_t port_id; +cmdline_fixed_string_t policy; +}; + +static void cmd_set_bonding_balance_xmit_policy_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_set_bonding_balance_xmit_policy_result *res = parsed_result; +portid_t port_id = res->port_id; +uint8_t policy; + +if (!strcmp (res->policy,"l2" )) { + policy =BALANCE_XMIT_POLICY_LAYER2 ; + }else if (!strcmp (res->policy,"l23" )) { + policy =BALANCE_XMIT_POLICY_LAYER23 ; + }else if (!strcmp (res->policy,"l34" )) { + policy =BALANCE_XMIT_POLICY_LAYER34 ; + }else { +printf ("\t Invalid xmit policy selection" ); +return ; + } + +/* Set the bonding mode for the relevant port. */ +if (0 !=rte_eth_bond_xmit_policy_set (port_id, policy)) { +printf ("\t Failed to set bonding balance xmit policy for port = %d.\n" , + port_id); + } +} + +cmdline_parse_token_string_t cmd_setbonding_balance_xmit_policy_set = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result, + set,"set" ); +cmdline_parse_token_string_t cmd_setbonding_balance_xmit_policy_bonding = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_setbonding_balance_xmit_policy_balance_xmit_policy = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result, + balance_xmit_policy,"balance_xmit_policy" ); +cmdline_parse_token_num_t cmd_setbonding_balance_xmit_policy_port = +TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result, + port_id,UINT8 ); +cmdline_parse_token_string_t cmd_setbonding_balance_xmit_policy_policy = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result, + policy,"l2#l23#l34" ); + +cmdline_parse_inst_t cmd_set_balance_xmit_policy = { + .f = cmd_set_bonding_balance_xmit_policy_parsed, + .help_str ="set bonding balance_xmit_policy (port_id) (policy_value): Set the bonding balance_xmit_policy for port_id" , + .data =NULL , + .tokens = { + (void *)&cmd_setbonding_balance_xmit_policy_set, + (void *)&cmd_setbonding_balance_xmit_policy_bonding, + (void *)&cmd_setbonding_balance_xmit_policy_balance_xmit_policy, + (void *)&cmd_setbonding_balance_xmit_policy_port, + (void *)&cmd_setbonding_balance_xmit_policy_policy, +NULL + } +}; + +/* *** SHOW NIC BONDING CONFIGURATION *** */ +struct cmd_show_bonding_config_result { +cmdline_fixed_string_t show; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t config; +uint8_t port_id; +}; + +static void cmd_show_bonding_config_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_show_bonding_config_result *res = parsed_result; +int bonding_mode; +uint8_t slaves[RTE_MAX_ETHPORTS ]; +int num_slaves, num_active_slaves; +int primary_id; +int i; +portid_t port_id = res->port_id; + +/* Display the bonding mode.*/ + bonding_mode =rte_eth_bond_mode_get (port_id); +if (bonding_mode <0 ) { +printf ("\tFailed to get bonding mode for port = %d\n" , port_id); +return ; + }else +printf ("\tBonding mode: %d\n" , bonding_mode); + +if (bonding_mode ==BONDING_MODE_BALANCE ) { +int balance_xmit_policy; + + balance_xmit_policy =rte_eth_bond_xmit_policy_get (port_id); +if (balance_xmit_policy <0 ) { +printf ("\tFailed to get balance xmit policy for port = %d\n" , + port_id); +return ; + }else { +printf ("\tBalance Xmit Policy: " ); + +switch (balance_xmit_policy) { +case BALANCE_XMIT_POLICY_LAYER2 : +printf ("BALANCE_XMIT_POLICY_LAYER2" ); +break ; +case BALANCE_XMIT_POLICY_LAYER23 : +printf ("BALANCE_XMIT_POLICY_LAYER23" ); +break ; +case BALANCE_XMIT_POLICY_LAYER34 : +printf ("BALANCE_XMIT_POLICY_LAYER34" ); +break ; + } +printf ("\n" ); + } + } + + num_slaves =rte_eth_bond_slaves_get (port_id, slaves,RTE_MAX_ETHPORTS ); + +if (num_slaves <0 ) { +printf ("\tFailed to get slave list for port = %d\n" , port_id); +return ; + } +if (num_slaves >0 ) { +printf ("\tSlaves (%d): [" , num_slaves); +for (i =0 ; i < num_slaves -1 ; i++) +printf ("%d " , slaves[i]); + +printf ("%d]\n" , slaves[num_slaves -1 ]); + }else { +printf ("\tSlaves: []\n" ); + + } + + num_active_slaves =rte_eth_bond_active_slaves_get (port_id, slaves, +RTE_MAX_ETHPORTS ); + +if (num_active_slaves <0 ) { +printf ("\tFailed to get active slave list for port = %d\n" , port_id); +return ; + } +if (num_active_slaves >0 ) { +printf ("\tActive Slaves (%d): [" , num_active_slaves); +for (i =0 ; i < num_active_slaves -1 ; i++) +printf ("%d " , slaves[i]); + +printf ("%d]\n" , slaves[num_active_slaves -1 ]); + + }else { +printf ("\tActive Slaves: []\n" ); + + } + + primary_id =rte_eth_bond_primary_get (port_id); +if (primary_id <0 ) { +printf ("\tFailed to get primary slave for port = %d\n" , port_id); +return ; + }else +printf ("\tPrimary: [%d]\n" , primary_id); + +} + +cmdline_parse_token_string_t cmd_showbonding_config_show = +TOKEN_STRING_INITIALIZER(struct cmd_show_bonding_config_result, + show,"show" ); +cmdline_parse_token_string_t cmd_showbonding_config_bonding = +TOKEN_STRING_INITIALIZER(struct cmd_show_bonding_config_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_showbonding_config_config = +TOKEN_STRING_INITIALIZER(struct cmd_show_bonding_config_result, + config,"config" ); +cmdline_parse_token_num_t cmd_showbonding_config_port = +TOKEN_NUM_INITIALIZER(struct cmd_show_bonding_config_result, + port_id,UINT8 ); + +cmdline_parse_inst_t cmd_show_bonding_config = { + .f = cmd_show_bonding_config_parsed, + .help_str ="show bonding config (port_id): Show the bonding config for port_id" , + .data =NULL , + .tokens = { + (void *)&cmd_showbonding_config_show, + (void *)&cmd_showbonding_config_bonding, + (void *)&cmd_showbonding_config_config, + (void *)&cmd_showbonding_config_port, +NULL + } +}; + +/* *** SET BONDING PRIMARY *** */ +struct cmd_set_bonding_primary_result { +cmdline_fixed_string_t set; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t primary; +uint8_t slave_id; +uint8_t port_id; +}; + +static void cmd_set_bonding_primary_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_set_bonding_primary_result *res = parsed_result; +portid_t master_port_id = res->port_id; +portid_t slave_port_id = res->slave_id; + +/* Set the primary slave for a bonded device. */ +if (0 !=rte_eth_bond_primary_set (master_port_id, slave_port_id)) { +printf ("\t Failed to set primary slave for port = %d.\n" , + master_port_id); +return ; + } +init_port_config (); +} + +cmdline_parse_token_string_t cmd_setbonding_primary_set = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_primary_result, + set,"set" ); +cmdline_parse_token_string_t cmd_setbonding_primary_bonding = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_primary_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_setbonding_primary_primary = +TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_primary_result, + primary,"primary" ); +cmdline_parse_token_num_t cmd_setbonding_primary_slave = +TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_primary_result, + slave_id,UINT8 ); +cmdline_parse_token_num_t cmd_setbonding_primary_port = +TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_primary_result, + port_id,UINT8 ); + +cmdline_parse_inst_t cmd_set_bonding_primary = { + .f = cmd_set_bonding_primary_parsed, + .help_str ="set bonding primary (slave_id) (port_id): Set the primary slave for port_id" , + .data =NULL , + .tokens = { + (void *)&cmd_setbonding_primary_set, + (void *)&cmd_setbonding_primary_bonding, + (void *)&cmd_setbonding_primary_primary, + (void *)&cmd_setbonding_primary_slave, + (void *)&cmd_setbonding_primary_port, +NULL + } +}; + +/* *** ADD SLAVE *** */ +struct cmd_add_bonding_slave_result { +cmdline_fixed_string_t add; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t slave; +uint8_t slave_id; +uint8_t port_id; +}; + +static void cmd_add_bonding_slave_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_add_bonding_slave_result *res = parsed_result; +portid_t master_port_id = res->port_id; +portid_t slave_port_id = res->slave_id; + +/* Set the primary slave for a bonded device. */ +if (0 !=rte_eth_bond_slave_add (master_port_id, slave_port_id)) { +printf ("\t Failed to add slave %d to master port = %d.\n" , + slave_port_id, master_port_id); +return ; + } +init_port_config (); +} + +cmdline_parse_token_string_t cmd_addbonding_slave_add = +TOKEN_STRING_INITIALIZER(struct cmd_add_bonding_slave_result, + add,"add" ); +cmdline_parse_token_string_t cmd_addbonding_slave_bonding = +TOKEN_STRING_INITIALIZER(struct cmd_add_bonding_slave_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_addbonding_slave_slave = +TOKEN_STRING_INITIALIZER(struct cmd_add_bonding_slave_result, + slave,"slave" ); +cmdline_parse_token_num_t cmd_addbonding_slave_slaveid = +TOKEN_NUM_INITIALIZER(struct cmd_add_bonding_slave_result, + slave_id,UINT8 ); +cmdline_parse_token_num_t cmd_addbonding_slave_port = +TOKEN_NUM_INITIALIZER(struct cmd_add_bonding_slave_result, + port_id,UINT8 ); + +cmdline_parse_inst_t cmd_add_bonding_slave = { + .f = cmd_add_bonding_slave_parsed, + .help_str ="add bonding slave (slave_id) (port_id): Add a slave device to a bonded device" , + .data =NULL , + .tokens = { + (void *)&cmd_addbonding_slave_add, + (void *)&cmd_addbonding_slave_bonding, + (void *)&cmd_addbonding_slave_slave, + (void *)&cmd_addbonding_slave_slaveid, + (void *)&cmd_addbonding_slave_port, +NULL + } +}; + +/* *** REMOVE SLAVE *** */ +struct cmd_remove_bonding_slave_result { +cmdline_fixed_string_t remove; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t slave; +uint8_t slave_id; +uint8_t port_id; +}; + +static void cmd_remove_bonding_slave_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_remove_bonding_slave_result *res = parsed_result; +portid_t master_port_id = res->port_id; +portid_t slave_port_id = res->slave_id; + +/* Set the primary slave for a bonded device. */ +if (0 !=rte_eth_bond_slave_remove (master_port_id, slave_port_id)) { +printf ("\t Failed to remove slave %d from master port = %d.\n" , + slave_port_id, master_port_id); +return ; + } +init_port_config (); +} + +cmdline_parse_token_string_t cmd_removebonding_slave_remove = + TOKEN_STRING_INITIALIZER(struct cmd_remove_bonding_slave_result, + remove,"remove" ); +cmdline_parse_token_string_t cmd_removebonding_slave_bonding = + TOKEN_STRING_INITIALIZER(struct cmd_remove_bonding_slave_result, + bonding,"bonding" ); +cmdline_parse_token_string_t cmd_removebonding_slave_slave = + TOKEN_STRING_INITIALIZER(struct cmd_remove_bonding_slave_result, + slave,"slave" ); +cmdline_parse_token_num_t cmd_removebonding_slave_slaveid = + TOKEN_NUM_INITIALIZER(struct cmd_remove_bonding_slave_result, + slave_id,UINT8 ); +cmdline_parse_token_num_t cmd_removebonding_slave_port = + TOKEN_NUM_INITIALIZER(struct cmd_remove_bonding_slave_result, + port_id,UINT8 ); + +cmdline_parse_inst_t cmd_remove_bonding_slave = { + .f = cmd_remove_bonding_slave_parsed, + .help_str ="remove bonding slave (slave_id) (port_id): Remove a slave device from a bonded device" , + .data =NULL , + .tokens = { + (void *)&cmd_removebonding_slave_remove, + (void *)&cmd_removebonding_slave_bonding, + (void *)&cmd_removebonding_slave_slave, + (void *)&cmd_removebonding_slave_slaveid, + (void *)&cmd_removebonding_slave_port, +NULL + } +}; + +/* *** CREATE BONDED DEVICE *** */ +struct cmd_create_bonded_device_result { +cmdline_fixed_string_t create; +cmdline_fixed_string_t bonded; +cmdline_fixed_string_t device; +uint8_t mode; +uint8_t socket; +}; + +static void cmd_create_bonded_device_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_create_bonded_device_result *res = parsed_result; + +int port_id; +if (test_done ==0 ) { +printf ("Please stop forwarding first\n" ); +return ; + } + + port_id =rte_eth_bond_create ("testpmd-bonded-dev" , res->mode, res->socket); +/* Create a new bonded device. */ +if (port_id <0 ) { +printf ("\t Failed to create bonded device.\n" ); +return ; + }else { +printf ("\t Created new bonded device (port %d).\n" , port_id); +/* Update number of ports */ + nb_ports =rte_eth_dev_count (); +reconfig (port_id); +rte_eth_promiscuous_enable (port_id); + } + +} + +cmdline_parse_token_string_t cmd_createbonded_device_create = + TOKEN_STRING_INITIALIZER(struct cmd_create_bonded_device_result, + create,"create" ); +cmdline_parse_token_string_t cmd_createbonded_device_bonded = + TOKEN_STRING_INITIALIZER(struct cmd_create_bonded_device_result, + bonded,"bonded" ); +cmdline_parse_token_string_t cmd_createbonded_device_device = + TOKEN_STRING_INITIALIZER(struct cmd_create_bonded_device_result, + device,"device" ); +cmdline_parse_token_num_t cmd_createbonded_device_mode = + TOKEN_NUM_INITIALIZER(struct cmd_create_bonded_device_result, + mode,UINT8 ); +cmdline_parse_token_num_t cmd_createbonded_device_socket = + TOKEN_NUM_INITIALIZER(struct cmd_create_bonded_device_result, + socket,UINT8 ); + +cmdline_parse_inst_t cmd_create_bonded_device = { + .f = cmd_create_bonded_device_parsed, + .help_str ="create bonded device (mode) (socket): Create a new bonded device with specific bonding mode and socket" , + .data =NULL , + .tokens = { + (void *)&cmd_createbonded_device_create, + (void *)&cmd_createbonded_device_bonded, + (void *)&cmd_createbonded_device_device, + (void *)&cmd_createbonded_device_mode, + (void *)&cmd_createbonded_device_socket, +NULL + } +}; + +/* *** SET MAC ADDRESS IN BONDED DEVICE *** */ +struct cmd_set_bond_mac_addr_result { +cmdline_fixed_string_t set; +cmdline_fixed_string_t bonding; +cmdline_fixed_string_t mac_addr; +uint8_t port_num; +struct ether_addr address; +}; + +static void cmd_set_bond_mac_addr_parsed (void *parsed_result, + __attribute__((unused))struct cmdline *cl, + __attribute__((unused))void *data) +{ +struct cmd_set_bond_mac_addr_result *res = parsed_result; +int ret; + +if (res->port_num >= nb_ports) { +printf ("Port id %d must be less than %d\n" , res->port_num, nb_ports); +return ; + } + + ret =rte_eth_bond_mac_address_set (res->port_num, &res->address); + +/* check the return value and print it if is < 0 */ +if (ret <0 ) +printf ("set_bond_mac_addr error: (%s)\n" ,strerror (-ret)); +} + +cmdline_parse_token_string_t cmd_set_bond_mac_addr_set = + TOKEN_STRING_INITIALIZER(struct cmd_set_bond_mac_addr_result, set, "set"); +cmdline_parse_token_string_t cmd_set_bond_mac_addr_bonding = + TOKEN_STRING_INITIALIZER(struct cmd_set_bond_mac_addr_result, bonding, +"bonding" ); +cmdline_parse_token_string_t cmd_set_bond_mac_addr_mac = + TOKEN_STRING_INITIALIZER(struct cmd_set_bond_mac_addr_result, mac_addr, +"mac_addr" ); +cmdline_parse_token_num_t cmd_set_bond_mac_addr_portnum = + TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mac_addr_result, port_num, UINT8); +cmdline_parse_token_etheraddr_t cmd_set_bond_mac_addr_addr = + TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_bond_mac_addr_result, address); + +cmdline_parse_inst_t cmd_set_bond_mac_addr = { + .f = cmd_set_bond_mac_addr_parsed, + .data = (void *)0 , + .help_str ="set bonding mac_addr (port_id) (address): " , + .tokens = { + (void *)&cmd_set_bond_mac_addr_set, + (void *)&cmd_set_bond_mac_addr_bonding, + (void *)&cmd_set_bond_mac_addr_mac, + (void *)&cmd_set_bond_mac_addr_portnum, + (void *)&cmd_set_bond_mac_addr_addr, +NULL + } +}; + +#endif /* RTE_LIBRTE_PMD_BOND */ +/* *** SET FORWARDING MODE *** */ struct cmd_set_fwd_mode_result {cmdline_fixed_string_t set;
@@ -5567,6 +6128,16 @@ cmdline_parse_ctx_t main_ctx[] = { (cmdline_parse_inst_t *)&cmd_set_bypass_timeout, (cmdline_parse_inst_t *)&cmd_show_bypass_config, #endif +#ifdef RTE_LIBRTE_PMD_BOND + (cmdline_parse_inst_t *) &cmd_set_bonding_mode, + (cmdline_parse_inst_t *) &cmd_show_bonding_config, + (cmdline_parse_inst_t *) &cmd_set_bonding_primary, + (cmdline_parse_inst_t *) &cmd_add_bonding_slave, + (cmdline_parse_inst_t *) &cmd_remove_bonding_slave, + (cmdline_parse_inst_t *) &cmd_create_bonded_device, + (cmdline_parse_inst_t *) &cmd_set_bond_mac_addr, + (cmdline_parse_inst_t *) &cmd_set_balance_xmit_policy, +#endif (cmdline_parse_inst_t *)&cmd_vlan_offload, (cmdline_parse_inst_t *)&cmd_vlan_tpid, (cmdline_parse_inst_t *)&cmd_rx_vlan_filter_all,
app/test-pmd/config.c +3 -1
@@ -242,6 +242,7 @@ void port_infos_display(portid_t port_id) {struct rte_port *port; +struct ether_addr mac_addr;struct rte_eth_link link;int vlan_offload;struct rte_mempool * mp;
@@ -255,7 +256,8 @@ port_infos_display(portid_t port_id)rte_eth_link_get_nowait (port_id, &link);printf ("\n%s Infos for port %-2d %s\n" , info_border, port_id, info_border); -print_ethaddr ("MAC address: " , &port->eth_addr); +rte_eth_macaddr_get (port_id, &mac_addr); +print_ethaddr ("MAC address: " , &mac_addr);printf ("\nConnect to socket: %u" , port->socket_id);if (port_numa[port_id] !=NUMA_NO_CONFIG ) {
app/test-pmd/parameters.c +3 -0
@@ -75,6 +75,9 @@#include <cmdline_parse.h> #include <cmdline_parse_etheraddr.h> #endif +#ifdef RTE_LIBRTE_PMD_BOND +#include <rte_eth_bond.h> +#endif #include "testpmd.h"
app/test-pmd/testpmd.c +32 -5
@@ -300,7 +300,7 @@ struct rte_fdir_conf fdir_conf = { .drop_queue = 127, }; -static volatile int test_done =1 ;/* stop packet forwarding when set to 1. */ +volatile int test_done =1 ;/* stop packet forwarding when set to 1. */ struct queue_stats_mappings tx_queue_stats_mappings_array[MAX_TX_QUEUE_STATS_MAPPINGS ];struct queue_stats_mappings rx_queue_stats_mappings_array[MAX_RX_QUEUE_STATS_MAPPINGS ];
@@ -625,6 +625,32 @@ init_config(void)rte_exit (EXIT_FAILURE ,"FAIL from init_fwd_streams()\n" ); } + +void +reconfig (portid_t new_port_id) +{ +struct rte_port *port; + +/* Reconfiguration of Ethernet ports. */ + ports =rte_realloc (ports, +sizeof (struct rte_port ) * nb_ports, +CACHE_LINE_SIZE ); +if (ports ==NULL ) { +rte_exit (EXIT_FAILURE ,"rte_realloc(%d struct rte_port) failed\n" , + nb_ports); + } + + port = &ports[new_port_id]; +rte_eth_dev_info_get (new_port_id, &port->dev_info); + +/* set flag to initialize port/queue */ + port->need_reconfig =1 ; + port->need_reconfig_queues =1 ; + +init_port_config (); +} + +int init_fwd_streams (void ) {
@@ -1246,7 +1272,7 @@ start_port(portid_t pid)portid_t pi;queueid_t qi;struct rte_port *port; -uint8_t *mac_addr; +struct ether_addr mac_addr;if (test_done ==0 ) {printf ("Please stop forwarding first\n" );
@@ -1374,10 +1400,11 @@ start_port(portid_t pid) RTE_PORT_HANDLING, RTE_PORT_STARTED) == 0)printf ("Port %d can not be set into started\n" , pi); - mac_addr = port->eth_addr.addr_bytes; +rte_eth_macaddr_get (pi, &mac_addr);printf ("Port %d: %02X:%02X:%02X:%02X:%02X:%02X\n" , pi, - mac_addr[0 ], mac_addr[1 ], mac_addr[2 ], - mac_addr[3 ], mac_addr[4 ], mac_addr[5 ]); + mac_addr.addr_bytes[0 ], mac_addr.addr_bytes[1 ], + mac_addr.addr_bytes[2 ], mac_addr.addr_bytes[3 ], + mac_addr.addr_bytes[4 ], mac_addr.addr_bytes[5 ]);/* at least one port started, need checking link status */ need_check_link_status =1 ;
app/test-pmd/testpmd.h +2 -0
@@ -279,6 +279,7 @@ extern uint16_t port_topology; /**< set by "--port-topology" parameter */extern uint8_t no_flush_rx;/**<set by "--no-flush-rx" parameter */ extern uint8_t mp_anon;/**< set by "--mp-anon" parameter */ extern uint8_t no_link_check;/**<set by "--disable-link-check" parameter */ +extern volatile int test_done;/* stop packet forwarding when set to 1. */ #ifdef RTE_NIC_BYPASS extern uint32_t bypass_timeout;/**< Store the NIC bypass watchdog timeout */
@@ -452,6 +453,7 @@ void fwd_config_display(void);void rxtx_config_display (void );void fwd_config_setup (void );void set_def_fwd_config (void ); +void reconfig (portid_t new_port_id);int init_fwd_streams (void );
Signature · 1 line
1.7.0.7
PATCH v4 6/6 Link Bonding Library doxygen additions
In reply to a message not in the archive--- doc/doxy-api-index.md | 1 + doc/doxy-api.conf | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
doc/doxy-api-index.md +1 -0
@@ -36,6 +36,7 @@ API {#index} There are many libraries, so their headers may be grouped by topics: - **device**: + [bond] (@ref rte_eth_bond.h), [ethdev] (@ref rte_ethdev.h), [devargs] (@ref rte_devargs.h), [KNI] (@ref rte_kni.h),
doc/doxy-api.conf +1 -0
@@ -30,6 +30,7 @@ PROJECT_NAME = DPDK INPUT = doc/doxy-api-index.md \ + lib/librte_pmd_bond \ lib/librte_eal/common/include \ lib/librte_acl \ lib/librte_distributor \
Signature · 1 line
1.7.0.7