remove trailing whitespaces
[dpdk.git] / app / test-pmd / cmdline.c
index 5e34775..293c9a7 100644 (file)
@@ -1,13 +1,14 @@
 /*-
  *   BSD LICENSE
- * 
- *   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
+ *
+ *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2014 6WIND S.A.
  *   All rights reserved.
- * 
+ *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above copyright
@@ -17,7 +18,7 @@
  *     * Neither the name of Intel Corporation nor the names of its
  *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 #include <unistd.h>
 #include <inttypes.h>
 #ifndef __linux__
+#ifndef __FreeBSD__
 #include <net/socket.h>
+#else
+#include <sys/socket.h>
+#endif
 #endif
 #include <netinet/in.h>
 
@@ -68,6 +73,7 @@
 #include <rte_ether.h>
 #include <rte_ethdev.h>
 #include <rte_string_fns.h>
+#include <rte_devargs.h>
 
 #include <cmdline_rdline.h>
 #include <cmdline_parse.h>
@@ -176,6 +182,10 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "show port (info|stats|fdir|stat_qmap) (port_id|all)\n"
                        "    Display information for port_id, or all.\n\n"
 
+                       "show port rss-hash [key]\n"
+                       "    Display the RSS hash functions and RSS hash key"
+                       " of port X\n\n"
+
                        "clear port (info|stats|fdir|stat_qmap) (port_id|all)\n"
                        "    Clear information for port_id, or all.\n\n"
 
@@ -220,6 +230,10 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "set burst (num)\n"
                        "    Set number of packets per burst.\n\n"
 
+                       "set burst tx delay (microseconds) retry (num)\n"
+                       "    Set the transmit delay time and number of retries"
+                       " in mac_retry forwarding mode.\n\n"
+
                        "set txpkts (x[,y]*)\n"
                        "    Set the length of each segment of TXONLY"
                        " packets.\n\n"
@@ -258,10 +272,10 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "rx_vlan add (vlan_id) port (port_id) vf (vf_mask)\n"
                        "    Add a vlan_id, to the set of VLAN identifiers"
                        "filtered for VF(s) from port_id.\n\n"
-                       
+
                        "rx_vlan rm (vlan_id) port (port_id) vf (vf_mask)\n"
                        "    Remove a vlan_id, to the set of VLAN identifiers"
-                       "filtered for VF(s) from port_id.\n\n"                  
+                       "filtered for VF(s) from port_id.\n\n"
 
                        "rx_vlan set tpid (value) (port_id)\n"
                        "    Set the outer VLAN TPID for Packet Filtering on"
@@ -284,17 +298,9 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "        bit 3 - insert sctp checksum offload if set\n"
                        "    Please check the NIC datasheet for HW limits.\n\n"
 
-#ifdef RTE_LIBRTE_IEEE1588
-                       "set fwd (io|mac|rxonly|txonly|csum|ieee1588)\n"
-                       "    Set IO, MAC, RXONLY, CSUM or TXONLY or ieee1588"
-                       " packet forwarding mode.\n\n"
+                       "set fwd (%s)\n"
+                       "    Set packet forwarding mode.\n\n"
 
-#else
-                       "set fwd (io|mac|rxonly|txonly|csum)\n"
-                       "    Set IO, MAC, RXONLY, CSUM or TXONLY packet"
-                       " forwarding mode.\n\n"
-
-#endif
                        "mac_addr add (port_id) (XX:XX:XX:XX:XX:XX)\n"
                        "    Add a MAC address on port_id.\n\n"
 
@@ -303,9 +309,9 @@ static void cmd_help_long_parsed(void *parsed_result,
 
                        "mac_addr add port (port_id) vf (vf_id) (mac_address)\n"
                        "    Add a MAC address for a VF on the port.\n\n"
-                       
+
                        "set port (port_id) uta (mac_address|all) (on|off)\n"
-                       "    Add/Remove a or all unicast hash filter(s)" 
+                       "    Add/Remove a or all unicast hash filter(s)"
                        "from port X.\n\n"
 
                        "set promisc (port_id|all) (on|off)\n"
@@ -340,8 +346,8 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "    BAM:accepts broadcast packets;"
                        "MPE:accepts all multicast packets\n\n"
                        "    Enable/Disable a VF receive mode of a port\n\n"
-                       
-                       "set port (port_id) mirror-rule (rule_id)" 
+
+                       "set port (port_id) mirror-rule (rule_id)"
                        "(pool-mirror|vlan-mirror)\n"
                        " (poolmask|vlanid[,vlanid]*) dst-pool (pool_id) (on|off)\n"
                        "   Set pool or vlan type mirror rule on a port.\n"
@@ -388,6 +394,7 @@ static void cmd_help_long_parsed(void *parsed_result,
                        " using the lowest port on the NIC.\n\n"
 #endif
 
+                       , list_pkt_forwarding_modes()
                );
        }
 
@@ -1121,26 +1128,22 @@ cmd_config_rss_parsed(void *parsed_result,
                        __attribute__((unused)) void *data)
 {
        struct cmd_config_rss *res = parsed_result;
-
-       if (!all_ports_stopped()) {
-               printf("Please stop all ports first\n");
-               return;
-       }
+       struct rte_eth_rss_conf rss_conf;
+       uint8_t i;
 
        if (!strcmp(res->value, "ip"))
-               rss_hf = ETH_RSS_IPV4 | ETH_RSS_IPV6;
+               rss_conf.rss_hf = ETH_RSS_IPV4 | ETH_RSS_IPV6;
        else if (!strcmp(res->value, "udp"))
-               rss_hf = ETH_RSS_IPV4 | ETH_RSS_IPV6 | ETH_RSS_IPV4_UDP;
+               rss_conf.rss_hf = ETH_RSS_IPV4_UDP | ETH_RSS_IPV6_UDP;
        else if (!strcmp(res->value, "none"))
-               rss_hf = 0;
+               rss_conf.rss_hf = 0;
        else {
                printf("Unknown parameter\n");
                return;
        }
-
-       init_port_config();
-
-       cmd_reconfig_device_queue(RTE_PORT_ALL, 1, 1);
+       rss_conf.rss_key = NULL;
+       for (i = 0; i < rte_eth_dev_count(); i++)
+               rte_eth_dev_rss_hash_update(i, &rss_conf);
 }
 
 cmdline_parse_token_string_t cmd_config_rss_port =
@@ -1168,6 +1171,99 @@ cmdline_parse_inst_t cmd_config_rss = {
        },
 };
 
+/* *** configure rss hash key *** */
+struct cmd_config_rss_hash_key {
+       cmdline_fixed_string_t port;
+       cmdline_fixed_string_t config;
+       uint8_t port_id;
+       cmdline_fixed_string_t rss_hash_key;
+       cmdline_fixed_string_t key;
+};
+
+#define RSS_HASH_KEY_LENGTH 40
+static uint8_t
+hexa_digit_to_value(char hexa_digit)
+{
+       if ((hexa_digit >= '0') && (hexa_digit <= '9'))
+               return (uint8_t) (hexa_digit - '0');
+       if ((hexa_digit >= 'a') && (hexa_digit <= 'f'))
+               return (uint8_t) ((hexa_digit - 'a') + 10);
+       if ((hexa_digit >= 'A') && (hexa_digit <= 'F'))
+               return (uint8_t) ((hexa_digit - 'A') + 10);
+       /* Invalid hexa digit */
+       return 0xFF;
+}
+
+static uint8_t
+parse_and_check_key_hexa_digit(char *key, int idx)
+{
+       uint8_t hexa_v;
+
+       hexa_v = hexa_digit_to_value(key[idx]);
+       if (hexa_v == 0xFF)
+               printf("invalid key: character %c at position %d is not a "
+                      "valid hexa digit\n", key[idx], idx);
+       return hexa_v;
+}
+
+static void
+cmd_config_rss_hash_key_parsed(void *parsed_result,
+                              __attribute__((unused)) struct cmdline *cl,
+                              __attribute__((unused)) void *data)
+{
+       struct cmd_config_rss_hash_key *res = parsed_result;
+       uint8_t hash_key[RSS_HASH_KEY_LENGTH];
+       uint8_t xdgt0;
+       uint8_t xdgt1;
+       int i;
+
+       /* Check the length of the RSS hash key */
+       if (strlen(res->key) != (RSS_HASH_KEY_LENGTH * 2)) {
+               printf("key length: %d invalid - key must be a string of %d"
+                      "hexa-decimal numbers\n", (int) strlen(res->key),
+                      RSS_HASH_KEY_LENGTH * 2);
+               return;
+       }
+       /* Translate RSS hash key into binary representation */
+       for (i = 0; i < RSS_HASH_KEY_LENGTH; i++) {
+               xdgt0 = parse_and_check_key_hexa_digit(res->key, (i * 2));
+               if (xdgt0 == 0xFF)
+                       return;
+               xdgt1 = parse_and_check_key_hexa_digit(res->key, (i * 2) + 1);
+               if (xdgt1 == 0xFF)
+                       return;
+               hash_key[i] = (uint8_t) ((xdgt0 * 16) + xdgt1);
+       }
+       port_rss_hash_key_update(res->port_id, hash_key);
+}
+
+cmdline_parse_token_string_t cmd_config_rss_hash_key_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key, port, "port");
+cmdline_parse_token_string_t cmd_config_rss_hash_key_config =
+       TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key, config,
+                                "config");
+cmdline_parse_token_string_t cmd_config_rss_hash_key_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_config_rss_hash_key, port_id, UINT8);
+cmdline_parse_token_string_t cmd_config_rss_hash_key_rss_hash_key =
+       TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key,
+                                rss_hash_key, "rss-hash-key");
+cmdline_parse_token_string_t cmd_config_rss_hash_key_value =
+       TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key, key, NULL);
+
+cmdline_parse_inst_t cmd_config_rss_hash_key = {
+       .f = cmd_config_rss_hash_key_parsed,
+       .data = NULL,
+       .help_str = "port config X rss-hash-key 80 hexa digits",
+       .tokens = {
+               (void *)&cmd_config_rss_hash_key_port,
+               (void *)&cmd_config_rss_hash_key_config,
+               (void *)&cmd_config_rss_hash_key_port_id,
+               (void *)&cmd_config_rss_hash_key_rss_hash_key,
+               (void *)&cmd_config_rss_hash_key_value,
+               NULL,
+       },
+};
+
 /* *** Configure RSS RETA *** */
 struct cmd_config_rss_reta {
        cmdline_fixed_string_t port;
@@ -1344,6 +1440,63 @@ cmdline_parse_inst_t cmd_showport_reta = {
        },
 };
 
+/* *** Show RSS hash configuration *** */
+struct cmd_showport_rss_hash {
+       cmdline_fixed_string_t show;
+       cmdline_fixed_string_t port;
+       uint8_t port_id;
+       cmdline_fixed_string_t rss_hash;
+       cmdline_fixed_string_t key; /* optional argument */
+};
+
+static void cmd_showport_rss_hash_parsed(void *parsed_result,
+                               __attribute__((unused)) struct cmdline *cl,
+                               void *show_rss_key)
+{
+       struct cmd_showport_rss_hash *res = parsed_result;
+
+       port_rss_hash_conf_show(res->port_id, show_rss_key != NULL);
+}
+
+cmdline_parse_token_string_t cmd_showport_rss_hash_show =
+       TOKEN_STRING_INITIALIZER(struct cmd_showport_rss_hash, show, "show");
+cmdline_parse_token_string_t cmd_showport_rss_hash_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_showport_rss_hash, port, "port");
+cmdline_parse_token_num_t cmd_showport_rss_hash_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_showport_rss_hash, port_id, UINT8);
+cmdline_parse_token_string_t cmd_showport_rss_hash_rss_hash =
+       TOKEN_STRING_INITIALIZER(struct cmd_showport_rss_hash, rss_hash,
+                                "rss-hash");
+cmdline_parse_token_string_t cmd_showport_rss_hash_rss_key =
+       TOKEN_STRING_INITIALIZER(struct cmd_showport_rss_hash, key, "key");
+
+cmdline_parse_inst_t cmd_showport_rss_hash = {
+       .f = cmd_showport_rss_hash_parsed,
+       .data = NULL,
+       .help_str = "show port X rss-hash (X = port number)\n",
+       .tokens = {
+               (void *)&cmd_showport_rss_hash_show,
+               (void *)&cmd_showport_rss_hash_port,
+               (void *)&cmd_showport_rss_hash_port_id,
+               (void *)&cmd_showport_rss_hash_rss_hash,
+               NULL,
+       },
+};
+
+cmdline_parse_inst_t cmd_showport_rss_hash_key = {
+       .f = cmd_showport_rss_hash_parsed,
+       .data = (void *)1,
+       .help_str = "show port X rss-hash key (X = port number)\n",
+       .tokens = {
+               (void *)&cmd_showport_rss_hash_show,
+               (void *)&cmd_showport_rss_hash_port,
+               (void *)&cmd_showport_rss_hash_port_id,
+               (void *)&cmd_showport_rss_hash_rss_hash,
+               (void *)&cmd_showport_rss_hash_rss_key,
+               NULL,
+       },
+};
+
 /* *** Configure DCB *** */
 struct cmd_config_dcb {
        cmdline_fixed_string_t port;
@@ -2325,6 +2478,46 @@ cmdline_parse_inst_t cmd_set_flush_rx = {
        },
 };
 
+/* *** ENABLE/DISABLE LINK STATUS CHECK *** */
+struct cmd_set_link_check {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t link_check;
+       cmdline_fixed_string_t mode;
+};
+
+static void
+cmd_set_link_check_parsed(void *parsed_result,
+               __attribute__((unused)) struct cmdline *cl,
+               __attribute__((unused)) void *data)
+{
+       struct cmd_set_link_check *res = parsed_result;
+       no_link_check = (uint8_t)((strcmp(res->mode, "on") == 0) ? 0 : 1);
+}
+
+cmdline_parse_token_string_t cmd_setlinkcheck_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_link_check,
+                       set, "set");
+cmdline_parse_token_string_t cmd_setlinkcheck_link_check =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_link_check,
+                       link_check, "link_check");
+cmdline_parse_token_string_t cmd_setlinkcheck_mode =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_link_check,
+                       mode, "on#off");
+
+
+cmdline_parse_inst_t cmd_set_link_check = {
+       .f = cmd_set_link_check_parsed,
+       .help_str = "set link_check on|off: enable/disable link status check "
+                   "when starting/stopping a port",
+       .data = NULL,
+       .tokens = {
+               (void *)&cmd_setlinkcheck_set,
+               (void *)&cmd_setlinkcheck_link_check,
+               (void *)&cmd_setlinkcheck_mode,
+               NULL,
+       },
+};
+
 #ifdef RTE_NIC_BYPASS
 /* *** SET NIC BYPASS MODE *** */
 struct cmd_set_bypass_mode_result {
@@ -2678,22 +2871,12 @@ cmdline_parse_token_string_t cmd_setfwd_fwd =
        TOKEN_STRING_INITIALIZER(struct cmd_set_fwd_mode_result, fwd, "fwd");
 cmdline_parse_token_string_t cmd_setfwd_mode =
        TOKEN_STRING_INITIALIZER(struct cmd_set_fwd_mode_result, mode,
-#ifdef RTE_LIBRTE_IEEE1588
-                                "io#mac#rxonly#txonly#csum#ieee1588");
-#else
-                                "io#mac#rxonly#txonly#csum");
-#endif
+               "" /* defined at init */);
 
 cmdline_parse_inst_t cmd_set_fwd_mode = {
        .f = cmd_set_fwd_mode_parsed,
        .data = NULL,
-#ifdef RTE_LIBRTE_IEEE1588
-       .help_str = "set fwd io|mac|rxonly|txonly|csum|ieee1588 - set IO, MAC,"
-       " RXONLY, TXONLY, CSUM or IEEE1588 packet forwarding mode",
-#else
-       .help_str = "set fwd io|mac|rxonly|txonly|csum - set IO, MAC,"
-       " RXONLY, CSUM or TXONLY packet forwarding mode",
-#endif
+       .help_str = NULL, /* defined at init */
        .tokens = {
                (void *)&cmd_setfwd_set,
                (void *)&cmd_setfwd_fwd,
@@ -2702,6 +2885,86 @@ cmdline_parse_inst_t cmd_set_fwd_mode = {
        },
 };
 
+static void cmd_set_fwd_mode_init(void)
+{
+       char *modes, *c;
+       static char token[128];
+       static char help[256];
+       cmdline_parse_token_string_t *token_struct;
+
+       modes = list_pkt_forwarding_modes();
+       rte_snprintf(help, sizeof help, "set fwd %s - "
+               "set packet forwarding mode", modes);
+       cmd_set_fwd_mode.help_str = help;
+
+       /* string token separator is # */
+       for (c = token; *modes != '\0'; modes++)
+               if (*modes == '|')
+                       *c++ = '#';
+               else
+                       *c++ = *modes;
+       token_struct = (cmdline_parse_token_string_t*)cmd_set_fwd_mode.tokens[2];
+       token_struct->string_data.str = token;
+}
+
+/* *** SET BURST TX DELAY TIME RETRY NUMBER *** */
+struct cmd_set_burst_tx_retry_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t burst;
+       cmdline_fixed_string_t tx;
+       cmdline_fixed_string_t delay;
+       uint32_t time;
+       cmdline_fixed_string_t retry;
+       uint32_t retry_num;
+};
+
+static void cmd_set_burst_tx_retry_parsed(void *parsed_result,
+                                       __attribute__((unused)) struct cmdline *cl,
+                                       __attribute__((unused)) void *data)
+{
+       struct cmd_set_burst_tx_retry_result *res = parsed_result;
+
+       if (!strcmp(res->set, "set") && !strcmp(res->burst, "burst")
+               && !strcmp(res->tx, "tx")) {
+               if (!strcmp(res->delay, "delay"))
+                       burst_tx_delay_time = res->time;
+               if (!strcmp(res->retry, "retry"))
+                       burst_tx_retry_num = res->retry_num;
+       }
+
+}
+
+cmdline_parse_token_string_t cmd_set_burst_tx_retry_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_burst_tx_retry_result, set, "set");
+cmdline_parse_token_string_t cmd_set_burst_tx_retry_burst =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_burst_tx_retry_result, burst,
+                                "burst");
+cmdline_parse_token_string_t cmd_set_burst_tx_retry_tx =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_burst_tx_retry_result, tx, "tx");
+cmdline_parse_token_string_t cmd_set_burst_tx_retry_delay =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_burst_tx_retry_result, delay, "delay");
+cmdline_parse_token_num_t cmd_set_burst_tx_retry_time =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_burst_tx_retry_result, time, UINT32);
+cmdline_parse_token_string_t cmd_set_burst_tx_retry_retry =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_burst_tx_retry_result, retry, "retry");
+cmdline_parse_token_num_t cmd_set_burst_tx_retry_retry_num =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_burst_tx_retry_result, retry_num, UINT32);
+
+cmdline_parse_inst_t cmd_set_burst_tx_retry = {
+       .f = cmd_set_burst_tx_retry_parsed,
+       .help_str = "set burst tx delay (time_by_useconds) retry (retry_num)",
+       .tokens = {
+               (void *)&cmd_set_burst_tx_retry_set,
+               (void *)&cmd_set_burst_tx_retry_burst,
+               (void *)&cmd_set_burst_tx_retry_tx,
+               (void *)&cmd_set_burst_tx_retry_delay,
+               (void *)&cmd_set_burst_tx_retry_time,
+               (void *)&cmd_set_burst_tx_retry_retry,
+               (void *)&cmd_set_burst_tx_retry_retry_num,
+               NULL,
+       },
+};
+
 /* *** SET PROMISC MODE *** */
 struct cmd_set_promisc_mode_result {
        cmdline_fixed_string_t set;
@@ -3393,7 +3656,7 @@ cmd_link_flow_ctrl_set_parsed(void *parsed_result,
         * the RTE_FC_RX_PAUSE, Respond to the pause frame at the Tx side.
         */
        static enum rte_eth_fc_mode rx_tx_onoff_2_lfc_mode[2][2] = {
-                       {RTE_FC_NONE, RTE_FC_RX_PAUSE}, {RTE_FC_TX_PAUSE, RTE_FC_FULL}
+                       {RTE_FC_NONE, RTE_FC_TX_PAUSE}, {RTE_FC_RX_PAUSE, RTE_FC_FULL}
        };
 
        rx_fc_enable = (!strcmp(res->rx_lfc_mode, "on")) ? 1 : 0;
@@ -4301,15 +4564,15 @@ cmd_set_uc_hash_parsed(void *parsed_result,
 {
        int ret=0;
        struct cmd_set_uc_hash_table *res = parsed_result;
-       
+
        int is_on = (strcmp(res->mode, "on") == 0) ? 1 : 0;
-       
+
        if (strcmp(res->what, "uta") == 0)
-               ret = rte_eth_dev_uc_hash_table_set(res->port_id, 
+               ret = rte_eth_dev_uc_hash_table_set(res->port_id,
                                                &res->address,(uint8_t)is_on);
        if (ret < 0)
                printf("bad unicast hash table parameter, return code = %d \n", ret);
-       
+
 }
 
 cmdline_parse_token_string_t cmd_set_uc_hash_set =
@@ -4325,7 +4588,7 @@ cmdline_parse_token_string_t cmd_set_uc_hash_what =
        TOKEN_STRING_INITIALIZER(struct cmd_set_uc_hash_table,
                                 what, "uta");
 cmdline_parse_token_etheraddr_t cmd_set_uc_hash_mac =
-       TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_uc_hash_table, 
+       TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_uc_hash_table,
                                address);
 cmdline_parse_token_string_t cmd_set_uc_hash_mode =
        TOKEN_STRING_INITIALIZER(struct cmd_set_uc_hash_table,
@@ -4362,14 +4625,14 @@ cmd_set_uc_all_hash_parsed(void *parsed_result,
 {
        int ret=0;
        struct cmd_set_uc_all_hash_table *res = parsed_result;
-       
+
        int is_on = (strcmp(res->mode, "on") == 0) ? 1 : 0;
-       
-       if ((strcmp(res->what, "uta") == 0) && 
+
+       if ((strcmp(res->what, "uta") == 0) &&
                (strcmp(res->value, "all") == 0))
                ret = rte_eth_dev_uc_all_hash_table_set(res->port_id,(uint8_t) is_on);
        if (ret < 0)
-               printf("bad unicast hash table parameter," 
+               printf("bad unicast hash table parameter,"
                        "return code = %d \n", ret);
 }
 
@@ -4386,7 +4649,7 @@ cmdline_parse_token_string_t cmd_set_uc_all_hash_what =
        TOKEN_STRING_INITIALIZER(struct cmd_set_uc_all_hash_table,
                                 what, "uta");
 cmdline_parse_token_string_t cmd_set_uc_all_hash_value =
-       TOKEN_STRING_INITIALIZER(struct cmd_set_uc_all_hash_table, 
+       TOKEN_STRING_INITIALIZER(struct cmd_set_uc_all_hash_table,
                                value,"all");
 cmdline_parse_token_string_t cmd_set_uc_all_hash_mode =
        TOKEN_STRING_INITIALIZER(struct cmd_set_uc_all_hash_table,
@@ -4488,7 +4751,7 @@ cmd_set_vf_rxmode_parsed(void *parsed_result,
        int ret;
        uint16_t rx_mode = 0;
        struct cmd_set_vf_rxmode *res = parsed_result;
-       
+
        int is_on = (strcmp(res->on, "on") == 0) ? 1 : 0;
        if (!strcmp(res->what,"rxmode")) {
                if (!strcmp(res->mode, "AUPE"))
@@ -4568,7 +4831,7 @@ static void cmd_vf_mac_addr_parsed(void *parsed_result,
        int ret = 0;
 
        if (strcmp(res->what, "add") == 0)
-               ret = rte_eth_dev_mac_addr_add(res->port_num, 
+               ret = rte_eth_dev_mac_addr_add(res->port_num,
                                        &res->address, res->vf_num);
        if(ret < 0)
                printf("vf_mac_addr_cmd error: (%s)\n", strerror(-ret));
@@ -4579,22 +4842,22 @@ cmdline_parse_token_string_t cmd_vf_mac_addr_cmd =
        TOKEN_STRING_INITIALIZER(struct cmd_vf_mac_addr_result,
                                mac_addr_cmd,"mac_addr");
 cmdline_parse_token_string_t cmd_vf_mac_addr_what =
-       TOKEN_STRING_INITIALIZER(struct cmd_vf_mac_addr_result, 
+       TOKEN_STRING_INITIALIZER(struct cmd_vf_mac_addr_result,
                                what,"add");
 cmdline_parse_token_string_t cmd_vf_mac_addr_port =
-       TOKEN_STRING_INITIALIZER(struct cmd_vf_mac_addr_result, 
+       TOKEN_STRING_INITIALIZER(struct cmd_vf_mac_addr_result,
                                port,"port");
 cmdline_parse_token_num_t cmd_vf_mac_addr_portnum =
-       TOKEN_NUM_INITIALIZER(struct cmd_vf_mac_addr_result, 
+       TOKEN_NUM_INITIALIZER(struct cmd_vf_mac_addr_result,
                                port_num, UINT8);
 cmdline_parse_token_string_t cmd_vf_mac_addr_vf =
-       TOKEN_STRING_INITIALIZER(struct cmd_vf_mac_addr_result, 
+       TOKEN_STRING_INITIALIZER(struct cmd_vf_mac_addr_result,
                                vf,"vf");
 cmdline_parse_token_num_t cmd_vf_mac_addr_vfnum =
        TOKEN_NUM_INITIALIZER(struct cmd_vf_mac_addr_result,
                                vf_num, UINT8);
 cmdline_parse_token_etheraddr_t cmd_vf_mac_addr_addr =
-       TOKEN_ETHERADDR_INITIALIZER(struct cmd_vf_mac_addr_result, 
+       TOKEN_ETHERADDR_INITIALIZER(struct cmd_vf_mac_addr_result,
                                address);
 
 cmdline_parse_inst_t cmd_vf_mac_addr_filter = {
@@ -4771,7 +5034,7 @@ cmd_set_mirror_mask_parsed(void *parsed_result,
 cmdline_parse_inst_t cmd_set_mirror_mask = {
                .f = cmd_set_mirror_mask_parsed,
                .data = NULL,
-               .help_str = "set port X mirror-rule Y pool-mirror|vlan-mirror " 
+               .help_str = "set port X mirror-rule Y pool-mirror|vlan-mirror "
                                "pool_mask|vlan_id[,vlan_id]* dst-pool Z on|off",
                .tokens = {
                        (void *)&cmd_mirror_mask_set,
@@ -4932,6 +5195,115 @@ cmdline_parse_inst_t cmd_reset_mirror_rule = {
 
 /* ******************************************************************************** */
 
+struct cmd_dump_result {
+       cmdline_fixed_string_t dump;
+};
+
+static void
+dump_struct_sizes(void)
+{
+#define DUMP_SIZE(t) printf("sizeof(" #t ") = %u\n", (unsigned)sizeof(t));
+       DUMP_SIZE(struct rte_mbuf);
+       DUMP_SIZE(struct rte_pktmbuf);
+       DUMP_SIZE(struct rte_ctrlmbuf);
+       DUMP_SIZE(struct rte_mempool);
+       DUMP_SIZE(struct rte_ring);
+#undef DUMP_SIZE
+}
+
+static void cmd_dump_parsed(void *parsed_result,
+                           __attribute__((unused)) struct cmdline *cl,
+                           __attribute__((unused)) void *data)
+{
+       struct cmd_dump_result *res = parsed_result;
+
+       if (!strcmp(res->dump, "dump_physmem"))
+               rte_dump_physmem_layout(stdout);
+       else if (!strcmp(res->dump, "dump_memzone"))
+               rte_memzone_dump(stdout);
+       else if (!strcmp(res->dump, "dump_log_history"))
+               rte_log_dump_history(stdout);
+       else if (!strcmp(res->dump, "dump_struct_sizes"))
+               dump_struct_sizes();
+       else if (!strcmp(res->dump, "dump_ring"))
+               rte_ring_list_dump(stdout);
+       else if (!strcmp(res->dump, "dump_mempool"))
+               rte_mempool_list_dump(stdout);
+       else if (!strcmp(res->dump, "dump_devargs"))
+               rte_eal_devargs_dump(stdout);
+}
+
+cmdline_parse_token_string_t cmd_dump_dump =
+       TOKEN_STRING_INITIALIZER(struct cmd_dump_result, dump,
+               "dump_physmem#"
+               "dump_memzone#"
+               "dump_log_history#"
+               "dump_struct_sizes#"
+               "dump_ring#"
+               "dump_mempool#"
+               "dump_devargs");
+
+cmdline_parse_inst_t cmd_dump = {
+       .f = cmd_dump_parsed,  /* function to call */
+       .data = NULL,      /* 2nd arg of func */
+       .help_str = "dump status",
+       .tokens = {        /* token list, NULL terminated */
+               (void *)&cmd_dump_dump,
+               NULL,
+       },
+};
+
+/* ******************************************************************************** */
+
+struct cmd_dump_one_result {
+       cmdline_fixed_string_t dump;
+       cmdline_fixed_string_t name;
+};
+
+static void cmd_dump_one_parsed(void *parsed_result, struct cmdline *cl,
+                               __attribute__((unused)) void *data)
+{
+       struct cmd_dump_one_result *res = parsed_result;
+
+       if (!strcmp(res->dump, "dump_ring")) {
+               struct rte_ring *r;
+               r = rte_ring_lookup(res->name);
+               if (r == NULL) {
+                       cmdline_printf(cl, "Cannot find ring\n");
+                       return;
+               }
+               rte_ring_dump(stdout, r);
+       } else if (!strcmp(res->dump, "dump_mempool")) {
+               struct rte_mempool *mp;
+               mp = rte_mempool_lookup(res->name);
+               if (mp == NULL) {
+                       cmdline_printf(cl, "Cannot find mempool\n");
+                       return;
+               }
+               rte_mempool_dump(stdout, mp);
+       }
+}
+
+cmdline_parse_token_string_t cmd_dump_one_dump =
+       TOKEN_STRING_INITIALIZER(struct cmd_dump_one_result, dump,
+                                "dump_ring#dump_mempool");
+
+cmdline_parse_token_string_t cmd_dump_one_name =
+       TOKEN_STRING_INITIALIZER(struct cmd_dump_one_result, name, NULL);
+
+cmdline_parse_inst_t cmd_dump_one = {
+       .f = cmd_dump_one_parsed,  /* function to call */
+       .data = NULL,      /* 2nd arg of func */
+       .help_str = "dump one ring/mempool: dump_ring|dump_mempool <name>",
+       .tokens = {        /* token list, NULL terminated */
+               (void *)&cmd_dump_one_dump,
+               (void *)&cmd_dump_one_name,
+               NULL,
+       },
+};
+
+/* ******************************************************************************** */
+
 /* list of instructions */
 cmdline_parse_ctx_t main_ctx[] = {
        (cmdline_parse_inst_t *)&cmd_help_brief,
@@ -4948,11 +5320,13 @@ cmdline_parse_ctx_t main_ctx[] = {
        (cmdline_parse_inst_t *)&cmd_set_fwd_list,
        (cmdline_parse_inst_t *)&cmd_set_fwd_mask,
        (cmdline_parse_inst_t *)&cmd_set_fwd_mode,
+       (cmdline_parse_inst_t *)&cmd_set_burst_tx_retry,
        (cmdline_parse_inst_t *)&cmd_set_promisc_mode_one,
        (cmdline_parse_inst_t *)&cmd_set_promisc_mode_all,
        (cmdline_parse_inst_t *)&cmd_set_allmulti_mode_one,
        (cmdline_parse_inst_t *)&cmd_set_allmulti_mode_all,
        (cmdline_parse_inst_t *)&cmd_set_flush_rx,
+       (cmdline_parse_inst_t *)&cmd_set_link_check,
 #ifdef RTE_NIC_BYPASS
        (cmdline_parse_inst_t *)&cmd_set_bypass_mode,
        (cmdline_parse_inst_t *)&cmd_set_bypass_event,
@@ -5009,6 +5383,11 @@ cmdline_parse_ctx_t main_ctx[] = {
        (cmdline_parse_inst_t *)&cmd_set_mirror_mask,
        (cmdline_parse_inst_t *)&cmd_set_mirror_link,
        (cmdline_parse_inst_t *)&cmd_reset_mirror_rule,
+       (cmdline_parse_inst_t *)&cmd_showport_rss_hash,
+       (cmdline_parse_inst_t *)&cmd_showport_rss_hash_key,
+       (cmdline_parse_inst_t *)&cmd_config_rss_hash_key,
+       (cmdline_parse_inst_t *)&cmd_dump,
+       (cmdline_parse_inst_t *)&cmd_dump_one,
        NULL,
 };
 
@@ -5018,6 +5397,9 @@ prompt(void)
 {
        struct cmdline *cl;
 
+       /* initialize non-constant commands */
+       cmd_set_fwd_mode_init();
+
        cl = cmdline_stdin_new(main_ctx, "testpmd> ");
        if (cl == NULL) {
                return;