X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Fl2fwd%2Fmain.c;h=b775670ced7d88834e3cc4fb8336116138178a6d;hb=3c481324baf32b98a7b7ce669ecde98a0662f07c;hp=f8d14b843a7f354b272638f242dd84c138d7499c;hpb=c81e3f21d1ea05e5123278b15d9d5e1257b6ba99;p=dpdk.git diff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c index f8d14b843a..b775670ced 100644 --- a/examples/l2fwd/main.c +++ b/examples/l2fwd/main.c @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include @@ -38,6 +37,7 @@ #include #include #include +#include static volatile bool force_quit; @@ -67,6 +67,15 @@ static uint32_t l2fwd_enabled_port_mask = 0; /* list of enabled ports */ static uint32_t l2fwd_dst_ports[RTE_MAX_ETHPORTS]; +struct port_pair_params { +#define NUM_PORTS 2 + uint16_t port[NUM_PORTS]; +} __rte_cache_aligned; + +static struct port_pair_params port_pair_params_array[RTE_MAX_ETHPORTS / 2]; +static struct port_pair_params *port_pair_params; +static uint16_t nb_port_pair_params; + static unsigned int l2fwd_rx_queue_per_lcore = 1; #define MAX_RX_QUEUE_PER_LCORE 16 @@ -146,6 +155,8 @@ print_stats(void) total_packets_rx, total_packets_dropped); printf("\n====================================================\n"); + + fflush(stdout); } static void @@ -248,8 +259,8 @@ l2fwd_main_loop(void) /* if timer has reached its timeout */ if (unlikely(timer_tsc >= timer_period)) { - /* do this only on master core */ - if (lcore_id == rte_get_master_lcore()) { + /* do this only on main core */ + if (lcore_id == rte_get_main_lcore()) { print_stats(); /* reset the timer */ timer_tsc = 0; @@ -294,11 +305,13 @@ l2fwd_usage(const char *prgname) printf("%s [EAL options] -- -p PORTMASK [-q NQ]\n" " -p PORTMASK: hexadecimal bitmask of ports to configure\n" " -q NQ: number of queue (=ports) per lcore (default is 1)\n" - " -T PERIOD: statistics will be refreshed each PERIOD seconds (0 to disable, 10 default, 86400 maximum)\n" - " --[no-]mac-updating: Enable or disable MAC addresses updating (enabled by default)\n" - " When enabled:\n" - " - The source MAC address is replaced by the TX port MAC address\n" - " - The destination MAC address is replaced by 02:00:00:00:00:TX_PORT_ID\n", + " -T PERIOD: statistics will be refreshed each PERIOD seconds (0 to disable, 10 default, 86400 maximum)\n" + " --no-mac-updating: Disable MAC addresses updating (enabled by default)\n" + " When enabled:\n" + " - The source MAC address is replaced by the TX port MAC address\n" + " - The destination MAC address is replaced by 02:00:00:00:00:TX_PORT_ID\n" + " --portmap: Configure forwarding port pair mapping\n" + " Default: alternate port pairs\n\n", prgname); } @@ -311,14 +324,66 @@ l2fwd_parse_portmask(const char *portmask) /* parse hexadecimal string */ pm = strtoul(portmask, &end, 16); if ((portmask[0] == '\0') || (end == NULL) || (*end != '\0')) - return -1; - - if (pm == 0) - return -1; + return 0; return pm; } +static int +l2fwd_parse_port_pair_config(const char *q_arg) +{ + enum fieldnames { + FLD_PORT1 = 0, + FLD_PORT2, + _NUM_FLD + }; + unsigned long int_fld[_NUM_FLD]; + const char *p, *p0 = q_arg; + char *str_fld[_NUM_FLD]; + unsigned int size; + char s[256]; + char *end; + int i; + + nb_port_pair_params = 0; + + while ((p = strchr(p0, '(')) != NULL) { + ++p; + p0 = strchr(p, ')'); + if (p0 == NULL) + return -1; + + size = p0 - p; + if (size >= sizeof(s)) + return -1; + + memcpy(s, p, size); + s[size] = '\0'; + if (rte_strsplit(s, sizeof(s), str_fld, + _NUM_FLD, ',') != _NUM_FLD) + return -1; + for (i = 0; i < _NUM_FLD; i++) { + errno = 0; + int_fld[i] = strtoul(str_fld[i], &end, 0); + if (errno != 0 || end == str_fld[i] || + int_fld[i] >= RTE_MAX_ETHPORTS) + return -1; + } + if (nb_port_pair_params >= RTE_MAX_ETHPORTS/2) { + printf("exceeded max number of port pair params: %hu\n", + nb_port_pair_params); + return -1; + } + port_pair_params_array[nb_port_pair_params].port[0] = + (uint16_t)int_fld[FLD_PORT1]; + port_pair_params_array[nb_port_pair_params].port[1] = + (uint16_t)int_fld[FLD_PORT2]; + ++nb_port_pair_params; + } + port_pair_params = port_pair_params_array; + return 0; +} + static unsigned int l2fwd_parse_nqueue(const char *q_arg) { @@ -359,20 +424,22 @@ static const char short_options[] = "T:" /* timer period */ ; -#define CMD_LINE_OPT_MAC_UPDATING "mac-updating" #define CMD_LINE_OPT_NO_MAC_UPDATING "no-mac-updating" +#define CMD_LINE_OPT_PORTMAP_CONFIG "portmap" enum { /* long options mapped to a short option */ /* first long only option value must be >= 256, so that we won't * conflict with short options */ - CMD_LINE_OPT_MIN_NUM = 256, + CMD_LINE_OPT_NO_MAC_UPDATING_NUM = 256, + CMD_LINE_OPT_PORTMAP_NUM, }; static const struct option lgopts[] = { - { CMD_LINE_OPT_MAC_UPDATING, no_argument, &mac_updating, 1}, - { CMD_LINE_OPT_NO_MAC_UPDATING, no_argument, &mac_updating, 0}, + { CMD_LINE_OPT_NO_MAC_UPDATING, no_argument, 0, + CMD_LINE_OPT_NO_MAC_UPDATING_NUM}, + { CMD_LINE_OPT_PORTMAP_CONFIG, 1, 0, CMD_LINE_OPT_PORTMAP_NUM}, {NULL, 0, 0, 0} }; @@ -386,6 +453,7 @@ l2fwd_parse_args(int argc, char **argv) char *prgname = argv[0]; argvopt = argv; + port_pair_params = NULL; while ((opt = getopt_long(argc, argvopt, short_options, lgopts, &option_index)) != EOF) { @@ -423,7 +491,17 @@ l2fwd_parse_args(int argc, char **argv) break; /* long options */ - case 0: + case CMD_LINE_OPT_PORTMAP_NUM: + ret = l2fwd_parse_port_pair_config(optarg); + if (ret) { + fprintf(stderr, "Invalid config\n"); + l2fwd_usage(prgname); + return -1; + } + break; + + case CMD_LINE_OPT_NO_MAC_UPDATING_NUM: + mac_updating = 0; break; default: @@ -440,6 +518,48 @@ l2fwd_parse_args(int argc, char **argv) return ret; } +/* + * Check port pair config with enabled port mask, + * and for valid port pair combinations. + */ +static int +check_port_pair_config(void) +{ + uint32_t port_pair_config_mask = 0; + uint32_t port_pair_mask = 0; + uint16_t index, i, portid; + + for (index = 0; index < nb_port_pair_params; index++) { + port_pair_mask = 0; + + for (i = 0; i < NUM_PORTS; i++) { + portid = port_pair_params[index].port[i]; + if ((l2fwd_enabled_port_mask & (1 << portid)) == 0) { + printf("port %u is not enabled in port mask\n", + portid); + return -1; + } + if (!rte_eth_dev_is_valid_port(portid)) { + printf("port %u is not present on the board\n", + portid); + return -1; + } + + port_pair_mask |= 1 << portid; + } + + if (port_pair_config_mask & port_pair_mask) { + printf("port %u is used in other port pairs\n", portid); + return -1; + } + port_pair_config_mask |= port_pair_mask; + } + + l2fwd_enabled_port_mask &= port_pair_config_mask; + + return 0; +} + /* Check the link status of all ports in up to 9s, and print them finally */ static void check_all_ports_link_status(uint32_t port_mask) @@ -450,6 +570,7 @@ check_all_ports_link_status(uint32_t port_mask) uint8_t count, all_ports_up, print_flag = 0; struct rte_eth_link link; int ret; + char link_status_text[RTE_ETH_LINK_MAX_STR_LEN]; printf("\nChecking link status"); fflush(stdout); @@ -473,14 +594,10 @@ check_all_ports_link_status(uint32_t port_mask) } /* print link status if flag set */ if (print_flag == 1) { - if (link.link_status) - printf( - "Port%d Link Up. Speed %u Mbps - %s\n", - portid, link.link_speed, - (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? - ("full-duplex") : ("half-duplex")); - else - printf("Port %d Link Down\n", portid); + rte_eth_link_to_str(link_status_text, + sizeof(link_status_text), &link); + printf("Port %d %s\n", portid, + link_status_text); continue; } /* clear all_ports_up flag if any link down */ @@ -555,6 +672,11 @@ main(int argc, char **argv) if (nb_ports == 0) rte_exit(EXIT_FAILURE, "No Ethernet ports - bye\n"); + if (port_pair_params != NULL) { + if (check_port_pair_config() < 0) + rte_exit(EXIT_FAILURE, "Invalid port pair config\n"); + } + /* check port mask to possible port mask */ if (l2fwd_enabled_port_mask & ~((1 << nb_ports) - 1)) rte_exit(EXIT_FAILURE, "Invalid portmask; possible (0x%x)\n", @@ -565,26 +687,35 @@ main(int argc, char **argv) l2fwd_dst_ports[portid] = 0; last_port = 0; - /* - * Each logical core is assigned a dedicated TX queue on each port. - */ - RTE_ETH_FOREACH_DEV(portid) { - /* skip ports that are not enabled */ - if ((l2fwd_enabled_port_mask & (1 << portid)) == 0) - continue; + /* populate destination port details */ + if (port_pair_params != NULL) { + uint16_t idx, p; - if (nb_ports_in_mask % 2) { - l2fwd_dst_ports[portid] = last_port; - l2fwd_dst_ports[last_port] = portid; + for (idx = 0; idx < (nb_port_pair_params << 1); idx++) { + p = idx & 1; + portid = port_pair_params[idx >> 1].port[p]; + l2fwd_dst_ports[portid] = + port_pair_params[idx >> 1].port[p ^ 1]; } - else - last_port = portid; + } else { + RTE_ETH_FOREACH_DEV(portid) { + /* skip ports that are not enabled */ + if ((l2fwd_enabled_port_mask & (1 << portid)) == 0) + continue; - nb_ports_in_mask++; - } - if (nb_ports_in_mask % 2) { - printf("Notice: odd number of ports in portmask.\n"); - l2fwd_dst_ports[last_port] = last_port; + if (nb_ports_in_mask % 2) { + l2fwd_dst_ports[portid] = last_port; + l2fwd_dst_ports[last_port] = portid; + } else { + last_port = portid; + } + + nb_ports_in_mask++; + } + if (nb_ports_in_mask % 2) { + printf("Notice: odd number of ports in portmask.\n"); + l2fwd_dst_ports[last_port] = last_port; + } } rx_lcore_id = 0; @@ -613,7 +744,8 @@ main(int argc, char **argv) qconf->rx_port_list[qconf->n_rx_port] = portid; qconf->n_rx_port++; - printf("Lcore %u: RX port %u\n", rx_lcore_id, portid); + printf("Lcore %u: RX port %u TX port %u\n", rx_lcore_id, + portid, l2fwd_dst_ports[portid]); } nb_mbufs = RTE_MAX(nb_ports * (nb_rxd + nb_txd + MAX_PKT_BURST + @@ -754,8 +886,8 @@ main(int argc, char **argv) ret = 0; /* launch per-lcore init on every lcore */ - rte_eal_mp_remote_launch(l2fwd_launch_one_lcore, NULL, CALL_MASTER); - RTE_LCORE_FOREACH_SLAVE(lcore_id) { + rte_eal_mp_remote_launch(l2fwd_launch_one_lcore, NULL, CALL_MAIN); + RTE_LCORE_FOREACH_WORKER(lcore_id) { if (rte_eal_wait_lcore(lcore_id) < 0) { ret = -1; break; @@ -766,10 +898,16 @@ main(int argc, char **argv) if ((l2fwd_enabled_port_mask & (1 << portid)) == 0) continue; printf("Closing port %d...", portid); - rte_eth_dev_stop(portid); + ret = rte_eth_dev_stop(portid); + if (ret != 0) + printf("rte_eth_dev_stop: err=%d, port=%d\n", + ret, portid); rte_eth_dev_close(portid); printf(" Done\n"); } + + /* clean up the EAL */ + rte_eal_cleanup(); printf("Bye...\n"); return ret;