app/testpmd: add missing autoneg field to set flow control
[dpdk.git] / app / test-pmd / cmdline.c
index 9c1bda9..5a18af7 100644 (file)
@@ -1,35 +1,35 @@
 /*-
  *   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 
+ *
+ *   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 
+ *
+ *     * 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 
- *       notice, this list of conditions and the following disclaimer in 
- *       the documentation and/or other materials provided with the 
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
  *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its 
- *       contributors may be used to endorse or promote products derived 
+ *     * 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 
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *
+ *   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
+ *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
  */
 
 #include <stdarg.h>
 #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>
 
@@ -69,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>
 #include <cmdline_parse_etheraddr.h>
 #include <cmdline_socket.h>
 #include <cmdline.h>
+#include <rte_pci_dev_ids.h>
 
 #include "testpmd.h"
 
 static void cmd_reconfig_device_queue(portid_t id, uint8_t dev, uint8_t queue);
 
+#ifdef RTE_NIC_BYPASS
+uint8_t bypass_is_supported(portid_t port_id);
+#endif
+
 /* *** Help command with introduction. *** */
 struct cmd_help_brief_result {
        cmdline_fixed_string_t help;
@@ -103,6 +113,7 @@ static void cmd_help_brief_parsed(__attribute__((unused)) void *parsed_result,
                "    help ports      : Configuring ports.\n"
                "    help flowdir    : Flow Director filter help.\n"
                "    help registers  : Reading and setting port registers.\n"
+               "    help filters    : Filters configuration help.\n"
                "    help all        : All of the above sections.\n\n"
        );
 
@@ -172,6 +183,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"
 
@@ -216,6 +231,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"
@@ -229,6 +248,9 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "vlan set strip (on|off) (port_id)\n"
                        "    Set the VLAN strip on a port.\n\n"
 
+                       "vlan set stripq (on|off) (port_id,queue_id)\n"
+                       "    Set the VLAN strip for a queue on a port.\n\n"
+
                        "vlan set filter (on|off) (port_id)\n"
                        "    Set the VLAN filter on a port.\n\n"
 
@@ -248,10 +270,25 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "    Remove a vlan_id, or all identifiers, from the set"
                        " of VLAN identifiers filtered by port_id.\n\n"
 
+                       "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"
+
+                       "rx_vlan set tpid (value) (port_id)\n"
+                       "    Set the outer VLAN TPID for Packet Filtering on"
+                       " a port\n\n"
+
                        "tx_vlan set vlan_id (port_id)\n"
                        "    Set hardware insertion of VLAN ID in packets sent"
                        " on a port.\n\n"
 
+                       "tx_vlan set pvid port_id vlan_id (on|off)\n"
+                       "    Set port based TX VLAN insertion.\n\n"
+
                        "tx_vlan reset (port_id)\n"
                        "    Disable hardware insertion of a VLAN header in"
                        " packets sent on a port.\n\n"
@@ -265,23 +302,22 @@ 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"
-
-#else
-                       "set fwd (io|mac|rxonly|txonly|csum)\n"
-                       "    Set IO, MAC, RXONLY, CSUM or TXONLY packet"
-                       " forwarding mode.\n\n"
+                       "set fwd (%s)\n"
+                       "    Set 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"
 
                        "mac_addr remove (port_id) (XX:XX:XX:XX:XX:XX)\n"
                        "    Remove a MAC address from port_id.\n\n"
 
+                       "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)"
+                       "from port X.\n\n"
+
                        "set promisc (port_id|all) (on|off)\n"
                        "    Set the promiscuous mode on port_id, or all.\n\n"
 
@@ -289,7 +325,8 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "    Set the allmulti mode on port_id, or all.\n\n"
 
                        "set flow_ctrl rx (on|off) tx (on|off) (high_water)"
-                       " (low_water) (pause_time) (send_xon) (port_id)\n"
+                       " (low_water) (pause_time) (send_xon) mac_ctrl_frame_fwd"
+                       " (on|off) autoneg (on|off) (port_id)\n"
                        "    Set the link flow control parameter on a port.\n\n"
 
                        "set pfc_ctrl rx (on|off) tx (on|off) (high_water)"
@@ -302,6 +339,73 @@ static void cmd_help_long_parsed(void *parsed_result,
                        " queue on port.\n"
                        "    e.g., 'set stat_qmap rx 0 2 5' sets rx queue 2"
                        " on port 0 to mapping 5.\n\n"
+
+                       "set port (port_id) vf (vf_id) rx|tx on|off \n"
+                       "    Enable/Disable a VF receive/tranmit from a port\n\n"
+
+                       "set port (port_id) vf (vf_id) rxmode (AUPE|ROPE|BAM"
+                       "|MPE) (on|off)\n"
+                       "    AUPE:accepts untagged VLAN;"
+                       "ROPE:accept unicast hash\n\n"
+                       "    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) queue (queue_id) rate (rate_num)\n"
+                       "    Set rate limit for a queue of a port\n\n"
+
+                       "set port (port_id) vf (vf_id) rate (rate_num) "
+                       "queue_mask (queue_mask_value)\n"
+                       "    Set rate limit for queues in VF of a port\n\n"
+
+                       "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"
+                       "   e.g., 'set port 0 mirror-rule 0 vlan-mirror 0,1"
+                       " dst-pool 0 on' enable mirror traffic with vlan 0,1"
+                       " to pool 0.\n\n"
+
+                       "set port (port_id) mirror-rule (rule_id)"
+                       " (uplink-mirror|downlink-mirror) dst-pool"
+                       " (pool_id) (on|off)\n"
+                       "   Set uplink or downlink type mirror rule on a port.\n"
+                       "   e.g., 'set port 0 mirror-rule 0 uplink-mirror dst-pool"
+                       " 0 on' enable mirror income traffic to pool 0.\n\n"
+
+                       "reset port (port_id) mirror-rule (rule_id)\n"
+                       "   Reset a mirror rule.\n\n"
+
+                       "set flush_rx (on|off)\n"
+                       "   Flush (default) or don't flush RX streams before"
+                       " forwarding. Mainly used with PCAP drivers.\n\n"
+
+                       #ifdef RTE_NIC_BYPASS
+                       "set bypass mode (normal|bypass|isolate) (port_id)\n"
+                       "   Set the bypass mode for the lowest port on bypass enabled"
+                       " NIC.\n\n"
+
+                       "set bypass event (timeout|os_on|os_off|power_on|power_off) "
+                       "mode (normal|bypass|isolate) (port_id)\n"
+                       "   Set the event required to initiate specified bypass mode for"
+                       " the lowest port on a bypass enabled NIC where:\n"
+                       "       timeout   = enable bypass after watchdog timeout.\n"
+                       "       os_on     = enable bypass when OS/board is powered on.\n"
+                       "       os_off    = enable bypass when OS/board is powered off.\n"
+                       "       power_on  = enable bypass when power supply is turned on.\n"
+                       "       power_off = enable bypass when power supply is turned off."
+                       "\n\n"
+
+                       "set bypass timeout (0|1.5|2|3|4|8|16|32)\n"
+                       "   Set the bypass watchdog timeout to 'n' seconds"
+                       " where 0 = instant.\n\n"
+
+                       "show bypass config (port_id)\n"
+                       "   Show the bypass configuration for a bypass enabled NIC"
+                       " using the lowest port on the NIC.\n\n"
+#endif
+
+                       , list_pkt_forwarding_modes()
                );
        }
 
@@ -423,6 +527,8 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "port config all (txfreet|txrst|rxfreet) (value)\n"
                        "    Set free threshold for rx/tx, or set"
                        " tx rs bit threshold.\n\n"
+                       "port config mtu X value\n"
+                       "    Set the MTU of port X to a given value\n\n"
                );
        }
 
@@ -454,6 +560,67 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "    Set single bit value of a port register.\n\n"
                );
        }
+       if (show_all || !strcmp(res->section, "filters")) {
+
+               cmdline_printf(
+                       cl,
+                       "\n"
+                       "filters:\n"
+                       "--------\n\n"
+
+                       "add_ethertype_filter (port_id) ethertype (eth_value)"
+                       " priority (enable|disable)(pri_value) queue (queue_id) index (idx)\n"
+                       "    add an ethertype filter.\n\n"
+
+                       "remove_ethertype_filter (port_id) index (idx)\n"
+                       "    remove an ethertype filter.\n\n"
+
+                       "get_ethertype_filter (port_id) index (idx)\n"
+                       "    get info of a ethertype filter.\n\n"
+
+                       "add_2tuple_filter (port_id) protocol (pro_value) (pro_mask)"
+                       " dst_port (port_value) (port_mask) flags (flg_value) priority (prio_value)"
+                       " queue (queue_id) index (idx)\n"
+                       "    add a 2tuple filter.\n\n"
+
+                       "remove_2tuple_filter (port_id) index (idx)\n"
+                       "    remove a 2tuple filter.\n\n"
+
+                       "get_2tuple_filter (port_id) index (idx)\n"
+                       "    get info of a 2tuple filter.\n\n"
+
+                       "add_5tuple_filter (port_id) dst_ip (dst_address) src_ip (src_address)"
+                       " dst_port (dst_port_value) src_port (src_port_value) protocol (protocol_value)"
+                       " mask (mask_value) flags (flags_value) priority (prio_value)"
+                       " queue (queue_id) index (idx)\n"
+                       "    add a 5tuple filter.\n\n"
+
+                       "remove_5tuple_filter (port_id) index (idx)\n"
+                       "    remove a 5tuple filter.\n\n"
+
+                       "get_5tuple_filter (port_id) index (idx)\n"
+                       "    get info of a 5tuple filter.\n\n"
+
+                       "add_syn_filter (port_id) priority (high|low) queue (queue_id)"
+                       "    add syn filter.\n\n"
+
+                       "remove_syn_filter (port_id)"
+                       "    remove syn filter.\n\n"
+
+                       "get_syn_filter (port_id) "
+                       "    get syn filter info.\n\n"
+
+                       "add_flex_filter (port_id) len (len_value) bytes (bytes_string) mask (mask_value)"
+                       " priority (prio_value) queue (queue_id) index (idx)\n"
+                       "    add a flex filter.\n\n"
+
+                       "remove_flex_filter (port_id) index (idx)\n"
+                       "    remove a flex filter.\n\n"
+
+                       "get_flex_filter (port_id) index (idx)\n"
+                       "    get info of a flex filter.\n\n"
+               );
+       }
 }
 
 cmdline_parse_token_string_t cmd_help_long_help =
@@ -462,7 +629,7 @@ cmdline_parse_token_string_t cmd_help_long_help =
 cmdline_parse_token_string_t cmd_help_long_section =
        TOKEN_STRING_INITIALIZER(struct cmd_help_long_result, section,
                        "all#control#display#config#flowdir#"
-                       "ports#registers");
+                       "ports#registers#filters");
 
 cmdline_parse_inst_t cmd_help_long = {
        .f = cmd_help_long_parsed,
@@ -921,6 +1088,57 @@ cmdline_parse_inst_t cmd_config_max_pkt_len = {
        },
 };
 
+/* *** configure port MTU *** */
+struct cmd_config_mtu_result {
+       cmdline_fixed_string_t port;
+       cmdline_fixed_string_t keyword;
+       cmdline_fixed_string_t mtu;
+       uint8_t port_id;
+       uint16_t value;
+};
+
+static void
+cmd_config_mtu_parsed(void *parsed_result,
+                     __attribute__((unused)) struct cmdline *cl,
+                     __attribute__((unused)) void *data)
+{
+       struct cmd_config_mtu_result *res = parsed_result;
+
+       if (res->value < ETHER_MIN_LEN) {
+               printf("mtu cannot be less than %d\n", ETHER_MIN_LEN);
+               return;
+       }
+       port_mtu_set(res->port_id, res->value);
+}
+
+cmdline_parse_token_string_t cmd_config_mtu_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_config_mtu_result, port,
+                                "port");
+cmdline_parse_token_string_t cmd_config_mtu_keyword =
+       TOKEN_STRING_INITIALIZER(struct cmd_config_mtu_result, keyword,
+                                "config");
+cmdline_parse_token_string_t cmd_config_mtu_mtu =
+       TOKEN_STRING_INITIALIZER(struct cmd_config_mtu_result, keyword,
+                                "mtu");
+cmdline_parse_token_num_t cmd_config_mtu_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, port_id, UINT8);
+cmdline_parse_token_num_t cmd_config_mtu_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, value, UINT16);
+
+cmdline_parse_inst_t cmd_config_mtu = {
+       .f = cmd_config_mtu_parsed,
+       .data = NULL,
+       .help_str = "port config mtu value",
+       .tokens = {
+               (void *)&cmd_config_mtu_port,
+               (void *)&cmd_config_mtu_keyword,
+               (void *)&cmd_config_mtu_mtu,
+               (void *)&cmd_config_mtu_port_id,
+               (void *)&cmd_config_mtu_value,
+               NULL,
+       },
+};
+
 /* *** configure rx mode *** */
 struct cmd_config_rx_mode_flag {
        cmdline_fixed_string_t port;
@@ -1035,26 +1253,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_IP;
        else if (!strcmp(res->value, "udp"))
-               rss_hf = ETH_RSS_IPV4 | ETH_RSS_IPV6 | ETH_RSS_IPV4_UDP;
+               rss_conf.rss_hf = ETH_RSS_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 =
@@ -1082,6 +1296,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_num_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;
@@ -1119,7 +1426,7 @@ parse_reta_config(const char *str, struct rte_eth_rss_reta *reta_conf)
                if(size >= sizeof(s))
                        return -1;
 
-               rte_snprintf(s, sizeof(s), "%.*s", size, p);
+               snprintf(s, sizeof(s), "%.*s", size, p);
                if (rte_strsplit(s, sizeof(s), str_fld, _NUM_FLD, ',') != _NUM_FLD)
                        return -1;
                for (i = 0; i < _NUM_FLD; i++) {
@@ -1197,7 +1504,7 @@ cmdline_parse_inst_t cmd_config_rss_reta = {
        },
 };
 
-/* *** SHOW PORT INFO *** */
+/* *** SHOW PORT RETA INFO *** */
 struct cmd_showport_reta {
        cmdline_fixed_string_t show;
        cmdline_fixed_string_t port;
@@ -1258,6 +1565,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;
@@ -1921,8 +2285,10 @@ cmd_vlan_offload_parsed(void *parsed_result,
                uint16_t queue_id = 0;
 
                /* No queue_id, return */
-               if(i + 1 >= len)
+               if(i + 1 >= len) {
+                       printf("must specify (port,queue_id)\n");
                        return;
+               }
                tmp = strtoul(str + i + 1, NULL, 0);
                /* If queue_id greater that what 16-bits can represent, return */
                if(tmp > 0xffff)
@@ -2111,6 +2477,63 @@ cmdline_parse_inst_t cmd_tx_vlan_set = {
        },
 };
 
+/* *** ENABLE/DISABLE PORT BASED TX VLAN INSERTION *** */
+struct cmd_tx_vlan_set_pvid_result {
+       cmdline_fixed_string_t tx_vlan;
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t pvid;
+       uint8_t port_id;
+       uint16_t vlan_id;
+       cmdline_fixed_string_t mode;
+};
+
+static void
+cmd_tx_vlan_set_pvid_parsed(void *parsed_result,
+                           __attribute__((unused)) struct cmdline *cl,
+                           __attribute__((unused)) void *data)
+{
+       struct cmd_tx_vlan_set_pvid_result *res = parsed_result;
+
+       if (strcmp(res->mode, "on") == 0)
+               tx_vlan_pvid_set(res->port_id, res->vlan_id, 1);
+       else
+               tx_vlan_pvid_set(res->port_id, res->vlan_id, 0);
+}
+
+cmdline_parse_token_string_t cmd_tx_vlan_set_pvid_tx_vlan =
+       TOKEN_STRING_INITIALIZER(struct cmd_tx_vlan_set_pvid_result,
+                                tx_vlan, "tx_vlan");
+cmdline_parse_token_string_t cmd_tx_vlan_set_pvid_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_tx_vlan_set_pvid_result,
+                                set, "set");
+cmdline_parse_token_string_t cmd_tx_vlan_set_pvid_pvid =
+       TOKEN_STRING_INITIALIZER(struct cmd_tx_vlan_set_pvid_result,
+                                pvid, "pvid");
+cmdline_parse_token_num_t cmd_tx_vlan_set_pvid_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_pvid_result,
+                            port_id, UINT8);
+cmdline_parse_token_num_t cmd_tx_vlan_set_pvid_vlan_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_pvid_result,
+                             vlan_id, UINT16);
+cmdline_parse_token_string_t cmd_tx_vlan_set_pvid_mode =
+       TOKEN_STRING_INITIALIZER(struct cmd_tx_vlan_set_pvid_result,
+                                mode, "on#off");
+
+cmdline_parse_inst_t cmd_tx_vlan_set_pvid = {
+       .f = cmd_tx_vlan_set_pvid_parsed,
+       .data = NULL,
+       .help_str = "tx_vlan set pvid port_id vlan_id (on|off)",
+       .tokens = {
+               (void *)&cmd_tx_vlan_set_pvid_tx_vlan,
+               (void *)&cmd_tx_vlan_set_pvid_set,
+               (void *)&cmd_tx_vlan_set_pvid_pvid,
+               (void *)&cmd_tx_vlan_set_pvid_port_id,
+               (void *)&cmd_tx_vlan_set_pvid_vlan_id,
+               (void *)&cmd_tx_vlan_set_pvid_mode,
+               NULL,
+       },
+};
+
 /* *** DISABLE HARDWARE INSERTION OF VLAN HEADER IN TX PACKETS *** */
 struct cmd_tx_vlan_reset_result {
        cmdline_fixed_string_t tx_vlan;
@@ -2198,133 +2621,613 @@ cmdline_parse_inst_t cmd_tx_cksum_set = {
        },
 };
 
-/* *** SET FORWARDING MODE *** */
-struct cmd_set_fwd_mode_result {
+/* *** ENABLE/DISABLE FLUSH ON RX STREAMS *** */
+struct cmd_set_flush_rx {
        cmdline_fixed_string_t set;
-       cmdline_fixed_string_t fwd;
+       cmdline_fixed_string_t flush_rx;
        cmdline_fixed_string_t mode;
 };
 
-static void cmd_set_fwd_mode_parsed(void *parsed_result,
-                                   __attribute__((unused)) struct cmdline *cl,
-                                   __attribute__((unused)) void *data)
+static void
+cmd_set_flush_rx_parsed(void *parsed_result,
+               __attribute__((unused)) struct cmdline *cl,
+               __attribute__((unused)) void *data)
 {
-       struct cmd_set_fwd_mode_result *res = parsed_result;
-
-       set_pkt_forwarding_mode(res->mode);
+       struct cmd_set_flush_rx *res = parsed_result;
+       no_flush_rx = (uint8_t)((strcmp(res->mode, "on") == 0) ? 0 : 1);
 }
 
-cmdline_parse_token_string_t cmd_setfwd_set =
-       TOKEN_STRING_INITIALIZER(struct cmd_set_fwd_mode_result, set, "set");
-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
+cmdline_parse_token_string_t cmd_setflushrx_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_flush_rx,
+                       set, "set");
+cmdline_parse_token_string_t cmd_setflushrx_flush_rx =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_flush_rx,
+                       flush_rx, "flush_rx");
+cmdline_parse_token_string_t cmd_setflushrx_mode =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_flush_rx,
+                       mode, "on#off");
 
-cmdline_parse_inst_t cmd_set_fwd_mode = {
-       .f = cmd_set_fwd_mode_parsed,
+
+cmdline_parse_inst_t cmd_set_flush_rx = {
+       .f = cmd_set_flush_rx_parsed,
+       .help_str = "set flush_rx on|off: enable/disable flush on rx streams",
        .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
        .tokens = {
-               (void *)&cmd_setfwd_set,
-               (void *)&cmd_setfwd_fwd,
-               (void *)&cmd_setfwd_mode,
+               (void *)&cmd_setflushrx_set,
+               (void *)&cmd_setflushrx_flush_rx,
+               (void *)&cmd_setflushrx_mode,
                NULL,
        },
 };
 
-/* *** SET PROMISC MODE *** */
-struct cmd_set_promisc_mode_result {
+/* *** ENABLE/DISABLE LINK STATUS CHECK *** */
+struct cmd_set_link_check {
        cmdline_fixed_string_t set;
-       cmdline_fixed_string_t promisc;
-       cmdline_fixed_string_t port_all; /* valid if "allports" argument == 1 */
-       uint8_t port_num;                /* valid if "allports" argument == 0 */
+       cmdline_fixed_string_t link_check;
        cmdline_fixed_string_t mode;
 };
 
-static void cmd_set_promisc_mode_parsed(void *parsed_result,
-                                       __attribute__((unused)) struct cmdline *cl,
-                                       void *allports)
+static void
+cmd_set_link_check_parsed(void *parsed_result,
+               __attribute__((unused)) struct cmdline *cl,
+               __attribute__((unused)) void *data)
 {
-       struct cmd_set_promisc_mode_result *res = parsed_result;
-       int enable;
-       portid_t i;
-
-       if (!strcmp(res->mode, "on"))
-               enable = 1;
-       else
-               enable = 0;
-
-       /* all ports */
-       if (allports) {
-               for (i = 0; i < nb_ports; i++) {
-                       if (enable)
-                               rte_eth_promiscuous_enable(i);
-                       else
-                               rte_eth_promiscuous_disable(i);
-               }
-       }
-       else {
-               if (enable)
-                       rte_eth_promiscuous_enable(res->port_num);
-               else
-                       rte_eth_promiscuous_disable(res->port_num);
-       }
+       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_setpromisc_set =
-       TOKEN_STRING_INITIALIZER(struct cmd_set_promisc_mode_result, set, "set");
-cmdline_parse_token_string_t cmd_setpromisc_promisc =
-       TOKEN_STRING_INITIALIZER(struct cmd_set_promisc_mode_result, promisc,
-                                "promisc");
-cmdline_parse_token_string_t cmd_setpromisc_portall =
-       TOKEN_STRING_INITIALIZER(struct cmd_set_promisc_mode_result, port_all,
-                                "all");
-cmdline_parse_token_num_t cmd_setpromisc_portnum =
-       TOKEN_NUM_INITIALIZER(struct cmd_set_promisc_mode_result, port_num,
-                             UINT8);
-cmdline_parse_token_string_t cmd_setpromisc_mode =
-       TOKEN_STRING_INITIALIZER(struct cmd_set_promisc_mode_result, mode,
-                                "on#off");
-
-cmdline_parse_inst_t cmd_set_promisc_mode_all = {
-       .f = cmd_set_promisc_mode_parsed,
-       .data = (void *)1,
-       .help_str = "set promisc all on|off: set promisc mode for all ports",
+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_setpromisc_set,
-               (void *)&cmd_setpromisc_promisc,
-               (void *)&cmd_setpromisc_portall,
-               (void *)&cmd_setpromisc_mode,
+               (void *)&cmd_setlinkcheck_set,
+               (void *)&cmd_setlinkcheck_link_check,
+               (void *)&cmd_setlinkcheck_mode,
                NULL,
        },
 };
 
-cmdline_parse_inst_t cmd_set_promisc_mode_one = {
-       .f = cmd_set_promisc_mode_parsed,
-       .data = (void *)0,
-       .help_str = "set promisc X on|off: set promisc mode on port X",
-       .tokens = {
-               (void *)&cmd_setpromisc_set,
-               (void *)&cmd_setpromisc_promisc,
-               (void *)&cmd_setpromisc_portnum,
-               (void *)&cmd_setpromisc_mode,
-               NULL,
-       },
+#ifdef RTE_NIC_BYPASS
+/* *** SET NIC BYPASS MODE *** */
+struct cmd_set_bypass_mode_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t bypass;
+       cmdline_fixed_string_t mode;
+       cmdline_fixed_string_t value;
+       uint8_t port_id;
 };
 
-/* *** SET ALLMULTI MODE *** */
+static void
+cmd_set_bypass_mode_parsed(void *parsed_result,
+               __attribute__((unused)) struct cmdline *cl,
+               __attribute__((unused)) void *data)
+{
+       struct cmd_set_bypass_mode_result *res = parsed_result;
+       portid_t port_id = res->port_id;
+       uint32_t bypass_mode = RTE_BYPASS_MODE_NORMAL;
+
+       if (!bypass_is_supported(port_id))
+               return;
+
+       if (!strcmp(res->value, "bypass"))
+               bypass_mode = RTE_BYPASS_MODE_BYPASS;
+       else if (!strcmp(res->value, "isolate"))
+               bypass_mode = RTE_BYPASS_MODE_ISOLATE;
+       else
+               bypass_mode = RTE_BYPASS_MODE_NORMAL;
+
+       /* Set the bypass mode for the relevant port. */
+       if (0 != rte_eth_dev_bypass_state_set(port_id, &bypass_mode)) {
+               printf("\t Failed to set bypass mode for port = %d.\n", port_id);
+       }
+}
+
+cmdline_parse_token_string_t cmd_setbypass_mode_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_mode_result,
+                       set, "set");
+cmdline_parse_token_string_t cmd_setbypass_mode_bypass =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_mode_result,
+                       bypass, "bypass");
+cmdline_parse_token_string_t cmd_setbypass_mode_mode =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_mode_result,
+                       mode, "mode");
+cmdline_parse_token_string_t cmd_setbypass_mode_value =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_mode_result,
+                       value, "normal#bypass#isolate");
+cmdline_parse_token_num_t cmd_setbypass_mode_port =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_bypass_mode_result,
+                               port_id, UINT8);
+
+cmdline_parse_inst_t cmd_set_bypass_mode = {
+       .f = cmd_set_bypass_mode_parsed,
+       .help_str = "set bypass mode (normal|bypass|isolate) (port_id): "
+                   "Set the NIC bypass mode for port_id",
+       .data = NULL,
+       .tokens = {
+               (void *)&cmd_setbypass_mode_set,
+               (void *)&cmd_setbypass_mode_bypass,
+               (void *)&cmd_setbypass_mode_mode,
+               (void *)&cmd_setbypass_mode_value,
+               (void *)&cmd_setbypass_mode_port,
+               NULL,
+       },
+};
+
+/* *** SET NIC BYPASS EVENT *** */
+struct cmd_set_bypass_event_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t bypass;
+       cmdline_fixed_string_t event;
+       cmdline_fixed_string_t event_value;
+       cmdline_fixed_string_t mode;
+       cmdline_fixed_string_t mode_value;
+       uint8_t port_id;
+};
+
+static void
+cmd_set_bypass_event_parsed(void *parsed_result,
+               __attribute__((unused)) struct cmdline *cl,
+               __attribute__((unused)) void *data)
+{
+       int32_t rc;
+       struct cmd_set_bypass_event_result *res = parsed_result;
+       portid_t port_id = res->port_id;
+       uint32_t bypass_event = RTE_BYPASS_EVENT_NONE;
+       uint32_t bypass_mode = RTE_BYPASS_MODE_NORMAL;
+
+       if (!bypass_is_supported(port_id))
+               return;
+
+       if (!strcmp(res->event_value, "timeout"))
+               bypass_event = RTE_BYPASS_EVENT_TIMEOUT;
+       else if (!strcmp(res->event_value, "os_on"))
+               bypass_event = RTE_BYPASS_EVENT_OS_ON;
+       else if (!strcmp(res->event_value, "os_off"))
+               bypass_event = RTE_BYPASS_EVENT_OS_OFF;
+       else if (!strcmp(res->event_value, "power_on"))
+               bypass_event = RTE_BYPASS_EVENT_POWER_ON;
+       else if (!strcmp(res->event_value, "power_off"))
+               bypass_event = RTE_BYPASS_EVENT_POWER_OFF;
+       else
+               bypass_event = RTE_BYPASS_EVENT_NONE;
+
+       if (!strcmp(res->mode_value, "bypass"))
+               bypass_mode = RTE_BYPASS_MODE_BYPASS;
+       else if (!strcmp(res->mode_value, "isolate"))
+               bypass_mode = RTE_BYPASS_MODE_ISOLATE;
+       else
+               bypass_mode = RTE_BYPASS_MODE_NORMAL;
+
+       /* Set the watchdog timeout. */
+       if (bypass_event == RTE_BYPASS_EVENT_TIMEOUT) {
+
+               rc = -EINVAL;
+               if (!RTE_BYPASS_TMT_VALID(bypass_timeout) ||
+                               (rc = rte_eth_dev_wd_timeout_store(port_id,
+                               bypass_timeout)) != 0) {
+                       printf("Failed to set timeout value %u "
+                               "for port %d, errto code: %d.\n",
+                               bypass_timeout, port_id, rc);
+               }
+       }
+
+       /* Set the bypass event to transition to bypass mode. */
+       if (0 != rte_eth_dev_bypass_event_store(port_id,
+                       bypass_event, bypass_mode)) {
+               printf("\t Failed to set bypass event for port = %d.\n", port_id);
+       }
+
+}
+
+cmdline_parse_token_string_t cmd_setbypass_event_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_event_result,
+                       set, "set");
+cmdline_parse_token_string_t cmd_setbypass_event_bypass =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_event_result,
+                       bypass, "bypass");
+cmdline_parse_token_string_t cmd_setbypass_event_event =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_event_result,
+                       event, "event");
+cmdline_parse_token_string_t cmd_setbypass_event_event_value =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_event_result,
+                       event_value, "none#timeout#os_off#os_on#power_on#power_off");
+cmdline_parse_token_string_t cmd_setbypass_event_mode =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_event_result,
+                       mode, "mode");
+cmdline_parse_token_string_t cmd_setbypass_event_mode_value =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_event_result,
+                       mode_value, "normal#bypass#isolate");
+cmdline_parse_token_num_t cmd_setbypass_event_port =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_bypass_event_result,
+                               port_id, UINT8);
+
+cmdline_parse_inst_t cmd_set_bypass_event = {
+       .f = cmd_set_bypass_event_parsed,
+       .help_str = "set bypass event (timeout|os_on|os_off|power_on|power_off) "
+                   "mode (normal|bypass|isolate) (port_id): "
+                   "Set the NIC bypass event mode for port_id",
+       .data = NULL,
+       .tokens = {
+               (void *)&cmd_setbypass_event_set,
+               (void *)&cmd_setbypass_event_bypass,
+               (void *)&cmd_setbypass_event_event,
+               (void *)&cmd_setbypass_event_event_value,
+               (void *)&cmd_setbypass_event_mode,
+               (void *)&cmd_setbypass_event_mode_value,
+               (void *)&cmd_setbypass_event_port,
+               NULL,
+       },
+};
+
+
+/* *** SET NIC BYPASS TIMEOUT *** */
+struct cmd_set_bypass_timeout_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t bypass;
+       cmdline_fixed_string_t timeout;
+       cmdline_fixed_string_t value;
+};
+
+static void
+cmd_set_bypass_timeout_parsed(void *parsed_result,
+               __attribute__((unused)) struct cmdline *cl,
+               __attribute__((unused)) void *data)
+{
+       struct cmd_set_bypass_timeout_result *res = parsed_result;
+
+       if (!strcmp(res->value, "1.5"))
+               bypass_timeout = RTE_BYPASS_TMT_1_5_SEC;
+       else if (!strcmp(res->value, "2"))
+               bypass_timeout = RTE_BYPASS_TMT_2_SEC;
+       else if (!strcmp(res->value, "3"))
+               bypass_timeout = RTE_BYPASS_TMT_3_SEC;
+       else if (!strcmp(res->value, "4"))
+               bypass_timeout = RTE_BYPASS_TMT_4_SEC;
+       else if (!strcmp(res->value, "8"))
+               bypass_timeout = RTE_BYPASS_TMT_8_SEC;
+       else if (!strcmp(res->value, "16"))
+               bypass_timeout = RTE_BYPASS_TMT_16_SEC;
+       else if (!strcmp(res->value, "32"))
+               bypass_timeout = RTE_BYPASS_TMT_32_SEC;
+       else
+               bypass_timeout = RTE_BYPASS_TMT_OFF;
+}
+
+cmdline_parse_token_string_t cmd_setbypass_timeout_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_timeout_result,
+                       set, "set");
+cmdline_parse_token_string_t cmd_setbypass_timeout_bypass =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_timeout_result,
+                       bypass, "bypass");
+cmdline_parse_token_string_t cmd_setbypass_timeout_timeout =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_timeout_result,
+                       timeout, "timeout");
+cmdline_parse_token_string_t cmd_setbypass_timeout_value =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_bypass_timeout_result,
+                       value, "0#1.5#2#3#4#8#16#32");
+
+cmdline_parse_inst_t cmd_set_bypass_timeout = {
+       .f = cmd_set_bypass_timeout_parsed,
+       .help_str = "set bypass timeout (0|1.5|2|3|4|8|16|32) seconds: "
+                   "Set the NIC bypass watchdog timeout",
+       .data = NULL,
+       .tokens = {
+               (void *)&cmd_setbypass_timeout_set,
+               (void *)&cmd_setbypass_timeout_bypass,
+               (void *)&cmd_setbypass_timeout_timeout,
+               (void *)&cmd_setbypass_timeout_value,
+               NULL,
+       },
+};
+
+/* *** SHOW NIC BYPASS MODE *** */
+struct cmd_show_bypass_config_result {
+       cmdline_fixed_string_t show;
+       cmdline_fixed_string_t bypass;
+       cmdline_fixed_string_t config;
+       uint8_t port_id;
+};
+
+static void
+cmd_show_bypass_config_parsed(void *parsed_result,
+               __attribute__((unused)) struct cmdline *cl,
+               __attribute__((unused)) void *data)
+{
+       struct cmd_show_bypass_config_result *res = parsed_result;
+       uint32_t event_mode;
+       uint32_t bypass_mode;
+       portid_t port_id = res->port_id;
+       uint32_t timeout = bypass_timeout;
+       int i;
+
+       static const char * const timeouts[RTE_BYPASS_TMT_NUM] =
+               {"off", "1.5", "2", "3", "4", "8", "16", "32"};
+       static const char * const modes[RTE_BYPASS_MODE_NUM] =
+               {"UNKNOWN", "normal", "bypass", "isolate"};
+       static const char * const events[RTE_BYPASS_EVENT_NUM] = {
+               "NONE",
+               "OS/board on",
+               "power supply on",
+               "OS/board off",
+               "power supply off",
+               "timeout"};
+       int num_events = (sizeof events) / (sizeof events[0]);
+
+       if (!bypass_is_supported(port_id))
+               return;
+
+       /* Display the bypass mode.*/
+       if (0 != rte_eth_dev_bypass_state_show(port_id, &bypass_mode)) {
+               printf("\tFailed to get bypass mode for port = %d\n", port_id);
+               return;
+       }
+       else {
+               if (!RTE_BYPASS_MODE_VALID(bypass_mode))
+                       bypass_mode = RTE_BYPASS_MODE_NONE;
+
+               printf("\tbypass mode    = %s\n",  modes[bypass_mode]);
+       }
+
+       /* Display the bypass timeout.*/
+       if (!RTE_BYPASS_TMT_VALID(timeout))
+               timeout = RTE_BYPASS_TMT_OFF;
+
+       printf("\tbypass timeout = %s\n", timeouts[timeout]);
+
+       /* Display the bypass events and associated modes. */
+       for (i = RTE_BYPASS_EVENT_START; i < num_events; i++) {
+
+               if (0 != rte_eth_dev_bypass_event_show(port_id, i, &event_mode)) {
+                       printf("\tFailed to get bypass mode for event = %s\n",
+                               events[i]);
+               } else {
+                       if (!RTE_BYPASS_MODE_VALID(event_mode))
+                               event_mode = RTE_BYPASS_MODE_NONE;
+
+                       printf("\tbypass event: %-16s = %s\n", events[i],
+                               modes[event_mode]);
+               }
+       }
+}
+
+cmdline_parse_token_string_t cmd_showbypass_config_show =
+       TOKEN_STRING_INITIALIZER(struct cmd_show_bypass_config_result,
+                       show, "show");
+cmdline_parse_token_string_t cmd_showbypass_config_bypass =
+       TOKEN_STRING_INITIALIZER(struct cmd_show_bypass_config_result,
+                       bypass, "bypass");
+cmdline_parse_token_string_t cmd_showbypass_config_config =
+       TOKEN_STRING_INITIALIZER(struct cmd_show_bypass_config_result,
+                       config, "config");
+cmdline_parse_token_num_t cmd_showbypass_config_port =
+       TOKEN_NUM_INITIALIZER(struct cmd_show_bypass_config_result,
+                               port_id, UINT8);
+
+cmdline_parse_inst_t cmd_show_bypass_config = {
+       .f = cmd_show_bypass_config_parsed,
+       .help_str = "show bypass config (port_id): "
+                   "Show the NIC bypass config for port_id",
+       .data = NULL,
+       .tokens = {
+               (void *)&cmd_showbypass_config_show,
+               (void *)&cmd_showbypass_config_bypass,
+               (void *)&cmd_showbypass_config_config,
+               (void *)&cmd_showbypass_config_port,
+               NULL,
+       },
+};
+#endif
+
+/* *** SET FORWARDING MODE *** */
+struct cmd_set_fwd_mode_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t fwd;
+       cmdline_fixed_string_t mode;
+};
+
+static void cmd_set_fwd_mode_parsed(void *parsed_result,
+                                   __attribute__((unused)) struct cmdline *cl,
+                                   __attribute__((unused)) void *data)
+{
+       struct cmd_set_fwd_mode_result *res = parsed_result;
+
+       set_pkt_forwarding_mode(res->mode);
+}
+
+cmdline_parse_token_string_t cmd_setfwd_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_fwd_mode_result, set, "set");
+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,
+               "" /* defined at init */);
+
+cmdline_parse_inst_t cmd_set_fwd_mode = {
+       .f = cmd_set_fwd_mode_parsed,
+       .data = NULL,
+       .help_str = NULL, /* defined at init */
+       .tokens = {
+               (void *)&cmd_setfwd_set,
+               (void *)&cmd_setfwd_fwd,
+               (void *)&cmd_setfwd_mode,
+               NULL,
+       },
+};
+
+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();
+       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;
+       cmdline_fixed_string_t promisc;
+       cmdline_fixed_string_t port_all; /* valid if "allports" argument == 1 */
+       uint8_t port_num;                /* valid if "allports" argument == 0 */
+       cmdline_fixed_string_t mode;
+};
+
+static void cmd_set_promisc_mode_parsed(void *parsed_result,
+                                       __attribute__((unused)) struct cmdline *cl,
+                                       void *allports)
+{
+       struct cmd_set_promisc_mode_result *res = parsed_result;
+       int enable;
+       portid_t i;
+
+       if (!strcmp(res->mode, "on"))
+               enable = 1;
+       else
+               enable = 0;
+
+       /* all ports */
+       if (allports) {
+               for (i = 0; i < nb_ports; i++) {
+                       if (enable)
+                               rte_eth_promiscuous_enable(i);
+                       else
+                               rte_eth_promiscuous_disable(i);
+               }
+       }
+       else {
+               if (enable)
+                       rte_eth_promiscuous_enable(res->port_num);
+               else
+                       rte_eth_promiscuous_disable(res->port_num);
+       }
+}
+
+cmdline_parse_token_string_t cmd_setpromisc_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_promisc_mode_result, set, "set");
+cmdline_parse_token_string_t cmd_setpromisc_promisc =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_promisc_mode_result, promisc,
+                                "promisc");
+cmdline_parse_token_string_t cmd_setpromisc_portall =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_promisc_mode_result, port_all,
+                                "all");
+cmdline_parse_token_num_t cmd_setpromisc_portnum =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_promisc_mode_result, port_num,
+                             UINT8);
+cmdline_parse_token_string_t cmd_setpromisc_mode =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_promisc_mode_result, mode,
+                                "on#off");
+
+cmdline_parse_inst_t cmd_set_promisc_mode_all = {
+       .f = cmd_set_promisc_mode_parsed,
+       .data = (void *)1,
+       .help_str = "set promisc all on|off: set promisc mode for all ports",
+       .tokens = {
+               (void *)&cmd_setpromisc_set,
+               (void *)&cmd_setpromisc_promisc,
+               (void *)&cmd_setpromisc_portall,
+               (void *)&cmd_setpromisc_mode,
+               NULL,
+       },
+};
+
+cmdline_parse_inst_t cmd_set_promisc_mode_one = {
+       .f = cmd_set_promisc_mode_parsed,
+       .data = (void *)0,
+       .help_str = "set promisc X on|off: set promisc mode on port X",
+       .tokens = {
+               (void *)&cmd_setpromisc_set,
+               (void *)&cmd_setpromisc_promisc,
+               (void *)&cmd_setpromisc_portnum,
+               (void *)&cmd_setpromisc_mode,
+               NULL,
+       },
+};
+
+/* *** SET ALLMULTI MODE *** */
 struct cmd_set_allmulti_mode_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t allmulti;
@@ -2909,6 +3812,10 @@ struct cmd_link_flow_ctrl_set_result {
        cmdline_fixed_string_t rx_lfc_mode;
        cmdline_fixed_string_t tx;
        cmdline_fixed_string_t tx_lfc_mode;
+       cmdline_fixed_string_t mac_ctrl_frame_fwd;
+       cmdline_fixed_string_t mac_ctrl_frame_fwd_mode;
+       cmdline_fixed_string_t autoneg_str;
+       cmdline_fixed_string_t autoneg;
        uint32_t high_water;
        uint32_t low_water;
        uint16_t pause_time;
@@ -2923,7 +3830,7 @@ cmd_link_flow_ctrl_set_parsed(void *parsed_result,
 {
        struct cmd_link_flow_ctrl_set_result *res = parsed_result;
        struct rte_eth_fc_conf fc_conf;
-       int rx_fc_enable, tx_fc_enable;
+       int rx_fc_enable, tx_fc_enable, mac_ctrl_frame_fwd;
        int ret;
 
        /*
@@ -2933,17 +3840,20 @@ 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;
        tx_fc_enable = (!strcmp(res->tx_lfc_mode, "on")) ? 1 : 0;
+       mac_ctrl_frame_fwd = (!strcmp(res->mac_ctrl_frame_fwd_mode, "on")) ? 1 : 0;
 
        fc_conf.mode       = rx_tx_onoff_2_lfc_mode[rx_fc_enable][tx_fc_enable];
        fc_conf.high_water = res->high_water;
        fc_conf.low_water  = res->low_water;
        fc_conf.pause_time = res->pause_time;
        fc_conf.send_xon   = res->send_xon;
+       fc_conf.mac_ctrl_frame_fwd = (uint8_t)mac_ctrl_frame_fwd;
+       fc_conf.autoneg    = (!strcmp(res->autoneg, "on")) ? 1 : 0;
 
        ret = rte_eth_dev_flow_ctrl_set(res->port_id, &fc_conf);
        if (ret != 0)
@@ -2980,6 +3890,18 @@ cmdline_parse_token_num_t cmd_lfc_set_pause_time =
 cmdline_parse_token_num_t cmd_lfc_set_send_xon =
        TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
                                send_xon, UINT16);
+cmdline_parse_token_string_t cmd_lfc_set_mac_ctrl_frame_fwd_mode =
+       TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
+                               mac_ctrl_frame_fwd, "mac_ctrl_frame_fwd");
+cmdline_parse_token_string_t cmd_lfc_set_mac_ctrl_frame_fwd =
+       TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
+                               mac_ctrl_frame_fwd_mode, "on#off");
+cmdline_parse_token_string_t cmd_lfc_set_autoneg_str =
+       TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
+                               autoneg_str, "autoneg");
+cmdline_parse_token_string_t cmd_lfc_set_autoneg =
+       TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
+                               autoneg, "on#off");
 cmdline_parse_token_num_t cmd_lfc_set_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
                                port_id, UINT8);
@@ -2987,7 +3909,9 @@ cmdline_parse_token_num_t cmd_lfc_set_portid =
 cmdline_parse_inst_t cmd_link_flow_control_set = {
        .f = cmd_link_flow_ctrl_set_parsed,
        .data = NULL,
-       .help_str = "Configure the Ethernet link flow control...",
+       .help_str = "Configure the Ethernet flow control: set flow_ctrl rx on|off \
+tx on|off high_water low_water pause_time send_xon mac_ctrl_frame_fwd on|off \
+autoneg on|off port_id",
        .tokens = {
                (void *)&cmd_lfc_set_set,
                (void *)&cmd_lfc_set_flow_ctrl,
@@ -2999,6 +3923,10 @@ cmdline_parse_inst_t cmd_link_flow_control_set = {
                (void *)&cmd_lfc_set_low_water,
                (void *)&cmd_lfc_set_pause_time,
                (void *)&cmd_lfc_set_send_xon,
+               (void *)&cmd_lfc_set_mac_ctrl_frame_fwd_mode,
+               (void *)&cmd_lfc_set_mac_ctrl_frame_fwd,
+               (void *)&cmd_lfc_set_autoneg_str,
+               (void *)&cmd_lfc_set_autoneg,
                (void *)&cmd_lfc_set_portid,
                NULL,
        },
@@ -3195,14 +4123,93 @@ cmdline_parse_inst_t cmd_start_tx_first = {
        },
 };
 
-/* *** SHOW CFG *** */
-struct cmd_showcfg_result {
-       cmdline_fixed_string_t show;
-       cmdline_fixed_string_t cfg;
-       cmdline_fixed_string_t what;
+/* *** SET LINK UP *** */
+struct cmd_set_link_up_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t link_up;
+       cmdline_fixed_string_t port;
+       uint8_t port_id;
 };
 
-static void cmd_showcfg_parsed(void *parsed_result,
+cmdline_parse_token_string_t cmd_set_link_up_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_link_up_result, set, "set");
+cmdline_parse_token_string_t cmd_set_link_up_link_up =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_link_up_result, link_up,
+                               "link-up");
+cmdline_parse_token_string_t cmd_set_link_up_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_link_up_result, port, "port");
+cmdline_parse_token_num_t cmd_set_link_up_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_link_up_result, port_id, UINT8);
+
+static void cmd_set_link_up_parsed(__attribute__((unused)) void *parsed_result,
+                            __attribute__((unused)) struct cmdline *cl,
+                            __attribute__((unused)) void *data)
+{
+       struct cmd_set_link_up_result *res = parsed_result;
+       dev_set_link_up(res->port_id);
+}
+
+cmdline_parse_inst_t cmd_set_link_up = {
+       .f = cmd_set_link_up_parsed,
+       .data = NULL,
+       .help_str = "set link-up port (port id)",
+       .tokens = {
+               (void *)&cmd_set_link_up_set,
+               (void *)&cmd_set_link_up_link_up,
+               (void *)&cmd_set_link_up_port,
+               (void *)&cmd_set_link_up_port_id,
+               NULL,
+       },
+};
+
+/* *** SET LINK DOWN *** */
+struct cmd_set_link_down_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t link_down;
+       cmdline_fixed_string_t port;
+       uint8_t port_id;
+};
+
+cmdline_parse_token_string_t cmd_set_link_down_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_link_down_result, set, "set");
+cmdline_parse_token_string_t cmd_set_link_down_link_down =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_link_down_result, link_down,
+                               "link-down");
+cmdline_parse_token_string_t cmd_set_link_down_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_link_down_result, port, "port");
+cmdline_parse_token_num_t cmd_set_link_down_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_link_down_result, port_id, UINT8);
+
+static void cmd_set_link_down_parsed(
+                               __attribute__((unused)) void *parsed_result,
+                               __attribute__((unused)) struct cmdline *cl,
+                               __attribute__((unused)) void *data)
+{
+       struct cmd_set_link_down_result *res = parsed_result;
+       dev_set_link_down(res->port_id);
+}
+
+cmdline_parse_inst_t cmd_set_link_down = {
+       .f = cmd_set_link_down_parsed,
+       .data = NULL,
+       .help_str = "set link-down port (port id)",
+       .tokens = {
+               (void *)&cmd_set_link_down_set,
+               (void *)&cmd_set_link_down_link_down,
+               (void *)&cmd_set_link_down_port,
+               (void *)&cmd_set_link_down_port_id,
+               NULL,
+       },
+};
+
+/* *** SHOW CFG *** */
+struct cmd_showcfg_result {
+       cmdline_fixed_string_t show;
+       cmdline_fixed_string_t cfg;
+       cmdline_fixed_string_t what;
+};
+
+static void cmd_showcfg_parsed(void *parsed_result,
                               __attribute__((unused)) struct cmdline *cl,
                               __attribute__((unused)) void *data)
 {
@@ -3812,106 +4819,1911 @@ cmdline_parse_inst_t cmd_set_qmap = {
        },
 };
 
-/* ******************************************************************************** */
+/* *** CONFIGURE UNICAST HASH TABLE *** */
+struct cmd_set_uc_hash_table {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t port;
+       uint8_t port_id;
+       cmdline_fixed_string_t what;
+       struct ether_addr address;
+       cmdline_fixed_string_t mode;
+};
 
-/* list of instructions */
-cmdline_parse_ctx_t main_ctx[] = {
-       (cmdline_parse_inst_t *)&cmd_help_brief,
-       (cmdline_parse_inst_t *)&cmd_help_long,
-       (cmdline_parse_inst_t *)&cmd_quit,
-       (cmdline_parse_inst_t *)&cmd_showport,
-       (cmdline_parse_inst_t *)&cmd_showportall,
-       (cmdline_parse_inst_t *)&cmd_showcfg,
-       (cmdline_parse_inst_t *)&cmd_start,
-       (cmdline_parse_inst_t *)&cmd_start_tx_first,
-       (cmdline_parse_inst_t *)&cmd_reset,
-       (cmdline_parse_inst_t *)&cmd_set_numbers,
-       (cmdline_parse_inst_t *)&cmd_set_txpkts,
-       (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_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_vlan_offload,
-       (cmdline_parse_inst_t *)&cmd_vlan_tpid,
-       (cmdline_parse_inst_t *)&cmd_rx_vlan_filter_all,
-       (cmdline_parse_inst_t *)&cmd_rx_vlan_filter,
-       (cmdline_parse_inst_t *)&cmd_tx_vlan_set,
-       (cmdline_parse_inst_t *)&cmd_tx_vlan_reset,
-       (cmdline_parse_inst_t *)&cmd_tx_cksum_set,
-       (cmdline_parse_inst_t *)&cmd_link_flow_control_set,
-       (cmdline_parse_inst_t *)&cmd_priority_flow_control_set,
-       (cmdline_parse_inst_t *)&cmd_config_dcb,
-       (cmdline_parse_inst_t *)&cmd_read_reg,
-       (cmdline_parse_inst_t *)&cmd_read_reg_bit_field,
-       (cmdline_parse_inst_t *)&cmd_read_reg_bit,
-       (cmdline_parse_inst_t *)&cmd_write_reg,
-       (cmdline_parse_inst_t *)&cmd_write_reg_bit_field,
-       (cmdline_parse_inst_t *)&cmd_write_reg_bit,
-       (cmdline_parse_inst_t *)&cmd_read_rxd_txd,
-       (cmdline_parse_inst_t *)&cmd_add_signature_filter,
-       (cmdline_parse_inst_t *)&cmd_upd_signature_filter,
-       (cmdline_parse_inst_t *)&cmd_rm_signature_filter,
-       (cmdline_parse_inst_t *)&cmd_add_perfect_filter,
-       (cmdline_parse_inst_t *)&cmd_upd_perfect_filter,
-       (cmdline_parse_inst_t *)&cmd_rm_perfect_filter,
-       (cmdline_parse_inst_t *)&cmd_set_masks_filter,
-       (cmdline_parse_inst_t *)&cmd_set_ipv6_masks_filter,
-       (cmdline_parse_inst_t *)&cmd_stop,
-       (cmdline_parse_inst_t *)&cmd_mac_addr,
-       (cmdline_parse_inst_t *)&cmd_set_qmap,
-       (cmdline_parse_inst_t *)&cmd_operate_port,
-       (cmdline_parse_inst_t *)&cmd_operate_specific_port,
-       (cmdline_parse_inst_t *)&cmd_config_speed_all,
-       (cmdline_parse_inst_t *)&cmd_config_speed_specific,
-       (cmdline_parse_inst_t *)&cmd_config_rx_tx,
-       (cmdline_parse_inst_t *)&cmd_config_max_pkt_len,
-       (cmdline_parse_inst_t *)&cmd_config_rx_mode_flag,
-       (cmdline_parse_inst_t *)&cmd_config_rss,
-       (cmdline_parse_inst_t *)&cmd_config_rss_reta,
-       (cmdline_parse_inst_t *)&cmd_showport_reta,
-       (cmdline_parse_inst_t *)&cmd_config_burst,
-       (cmdline_parse_inst_t *)&cmd_config_thresh,
-       (cmdline_parse_inst_t *)&cmd_config_threshold,
-       NULL,
+static void
+cmd_set_uc_hash_parsed(void *parsed_result,
+                      __attribute__((unused)) struct cmdline *cl,
+                      __attribute__((unused)) void *data)
+{
+       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,
+                                               &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 =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_uc_hash_table,
+                                set, "set");
+cmdline_parse_token_string_t cmd_set_uc_hash_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_uc_hash_table,
+                                port, "port");
+cmdline_parse_token_num_t cmd_set_uc_hash_portid =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_uc_hash_table,
+                             port_id, UINT8);
+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,
+                               address);
+cmdline_parse_token_string_t cmd_set_uc_hash_mode =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_uc_hash_table,
+                                mode, "on#off");
+
+cmdline_parse_inst_t cmd_set_uc_hash_filter = {
+       .f = cmd_set_uc_hash_parsed,
+       .data = NULL,
+       .help_str = "set port X uta Y on|off(X = port number,Y = MAC address)",
+       .tokens = {
+               (void *)&cmd_set_uc_hash_set,
+               (void *)&cmd_set_uc_hash_port,
+               (void *)&cmd_set_uc_hash_portid,
+               (void *)&cmd_set_uc_hash_what,
+               (void *)&cmd_set_uc_hash_mac,
+               (void *)&cmd_set_uc_hash_mode,
+               NULL,
+       },
 };
 
-/* prompt function, called from main on MASTER lcore */
-void
-prompt(void)
+struct cmd_set_uc_all_hash_table {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t port;
+       uint8_t port_id;
+       cmdline_fixed_string_t what;
+       cmdline_fixed_string_t value;
+       cmdline_fixed_string_t mode;
+};
+
+static void
+cmd_set_uc_all_hash_parsed(void *parsed_result,
+                      __attribute__((unused)) struct cmdline *cl,
+                      __attribute__((unused)) void *data)
 {
-       struct cmdline *cl;
+       int ret=0;
+       struct cmd_set_uc_all_hash_table *res = parsed_result;
 
-       cl = cmdline_stdin_new(main_ctx, "testpmd> ");
-       if (cl == NULL) {
-               return;
-       }
-       cmdline_interact(cl);
-       cmdline_stdin_exit(cl);
+       int is_on = (strcmp(res->mode, "on") == 0) ? 1 : 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,"
+                       "return code = %d \n", ret);
 }
 
+cmdline_parse_token_string_t cmd_set_uc_all_hash_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_uc_all_hash_table,
+                                set, "set");
+cmdline_parse_token_string_t cmd_set_uc_all_hash_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_uc_all_hash_table,
+                                port, "port");
+cmdline_parse_token_num_t cmd_set_uc_all_hash_portid =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_uc_all_hash_table,
+                             port_id, UINT8);
+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,
+                               value,"all");
+cmdline_parse_token_string_t cmd_set_uc_all_hash_mode =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_uc_all_hash_table,
+                                mode, "on#off");
+
+cmdline_parse_inst_t cmd_set_uc_all_hash_filter = {
+       .f = cmd_set_uc_all_hash_parsed,
+       .data = NULL,
+       .help_str = "set port X uta all on|off (X = port number)",
+       .tokens = {
+               (void *)&cmd_set_uc_all_hash_set,
+               (void *)&cmd_set_uc_all_hash_port,
+               (void *)&cmd_set_uc_all_hash_portid,
+               (void *)&cmd_set_uc_all_hash_what,
+               (void *)&cmd_set_uc_all_hash_value,
+               (void *)&cmd_set_uc_all_hash_mode,
+               NULL,
+       },
+};
+
+/* *** CONFIGURE VF TRAFFIC CONTROL *** */
+struct cmd_set_vf_traffic {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t port;
+       uint8_t port_id;
+       cmdline_fixed_string_t vf;
+       uint8_t vf_id;
+       cmdline_fixed_string_t what;
+       cmdline_fixed_string_t mode;
+};
+
 static void
-cmd_reconfig_device_queue(portid_t id, uint8_t dev, uint8_t queue)
+cmd_set_vf_traffic_parsed(void *parsed_result,
+                      __attribute__((unused)) struct cmdline *cl,
+                      __attribute__((unused)) void *data)
 {
-       if (id < nb_ports) {
-               /* check if need_reconfig has been set to 1 */
-               if (ports[id].need_reconfig == 0)
-                       ports[id].need_reconfig = dev;
-               /* check if need_reconfig_queues has been set to 1 */
-               if (ports[id].need_reconfig_queues == 0)
-                       ports[id].need_reconfig_queues = queue;
-       } else {
-               portid_t pid;
+       struct cmd_set_vf_traffic *res = parsed_result;
+       int is_rx = (strcmp(res->what, "rx") == 0) ? 1 : 0;
+       int is_on = (strcmp(res->mode, "on") == 0) ? 1 : 0;
 
-               for (pid = 0; pid < nb_ports; pid++) {
-                       /* check if need_reconfig has been set to 1 */
-                       if (ports[pid].need_reconfig == 0)
-                               ports[pid].need_reconfig = dev;
-                       /* check if need_reconfig_queues has been set to 1 */
-                       if (ports[pid].need_reconfig_queues == 0)
-                               ports[pid].need_reconfig_queues = queue;
-               }
+       set_vf_traffic(res->port_id, (uint8_t)is_rx, res->vf_id,(uint8_t) is_on);
+}
+
+cmdline_parse_token_string_t cmd_setvf_traffic_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vf_traffic,
+                                set, "set");
+cmdline_parse_token_string_t cmd_setvf_traffic_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vf_traffic,
+                                port, "port");
+cmdline_parse_token_num_t cmd_setvf_traffic_portid =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_vf_traffic,
+                             port_id, UINT8);
+cmdline_parse_token_string_t cmd_setvf_traffic_vf =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vf_traffic,
+                                vf, "vf");
+cmdline_parse_token_num_t cmd_setvf_traffic_vfid =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_vf_traffic,
+                             vf_id, UINT8);
+cmdline_parse_token_string_t cmd_setvf_traffic_what =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vf_traffic,
+                                what, "tx#rx");
+cmdline_parse_token_string_t cmd_setvf_traffic_mode =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vf_traffic,
+                                mode, "on#off");
+
+cmdline_parse_inst_t cmd_set_vf_traffic = {
+       .f = cmd_set_vf_traffic_parsed,
+       .data = NULL,
+       .help_str = "set port X vf Y rx|tx on|off (X = port number,Y = vf id)",
+       .tokens = {
+               (void *)&cmd_setvf_traffic_set,
+               (void *)&cmd_setvf_traffic_port,
+               (void *)&cmd_setvf_traffic_portid,
+               (void *)&cmd_setvf_traffic_vf,
+               (void *)&cmd_setvf_traffic_vfid,
+               (void *)&cmd_setvf_traffic_what,
+               (void *)&cmd_setvf_traffic_mode,
+               NULL,
+       },
+};
+
+/* *** CONFIGURE VF RECEIVE MODE *** */
+struct cmd_set_vf_rxmode {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t port;
+       uint8_t port_id;
+       cmdline_fixed_string_t vf;
+       uint8_t vf_id;
+       cmdline_fixed_string_t what;
+       cmdline_fixed_string_t mode;
+       cmdline_fixed_string_t on;
+};
+
+static void
+cmd_set_vf_rxmode_parsed(void *parsed_result,
+                      __attribute__((unused)) struct cmdline *cl,
+                      __attribute__((unused)) void *data)
+{
+       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"))
+                       rx_mode |= ETH_VMDQ_ACCEPT_UNTAG;
+               else if (!strcmp(res->mode, "ROPE"))
+                       rx_mode |= ETH_VMDQ_ACCEPT_HASH_UC;
+               else if (!strcmp(res->mode, "BAM"))
+                       rx_mode |= ETH_VMDQ_ACCEPT_BROADCAST;
+               else if (!strncmp(res->mode, "MPE",3))
+                       rx_mode |= ETH_VMDQ_ACCEPT_MULTICAST;
        }
+
+       ret = rte_eth_dev_set_vf_rxmode(res->port_id,res->vf_id,rx_mode,(uint8_t)is_on);
+       if (ret < 0)
+               printf("bad VF receive mode parameter, return code = %d \n",
+               ret);
+}
+
+cmdline_parse_token_string_t cmd_set_vf_rxmode_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vf_rxmode,
+                                set, "set");
+cmdline_parse_token_string_t cmd_set_vf_rxmode_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vf_rxmode,
+                                port, "port");
+cmdline_parse_token_num_t cmd_set_vf_rxmode_portid =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_vf_rxmode,
+                             port_id, UINT8);
+cmdline_parse_token_string_t cmd_set_vf_rxmode_vf =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vf_rxmode,
+                                vf, "vf");
+cmdline_parse_token_num_t cmd_set_vf_rxmode_vfid =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_vf_rxmode,
+                             vf_id, UINT8);
+cmdline_parse_token_string_t cmd_set_vf_rxmode_what =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vf_rxmode,
+                                what, "rxmode");
+cmdline_parse_token_string_t cmd_set_vf_rxmode_mode =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vf_rxmode,
+                                mode, "AUPE#ROPE#BAM#MPE");
+cmdline_parse_token_string_t cmd_set_vf_rxmode_on =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vf_rxmode,
+                                on, "on#off");
+
+cmdline_parse_inst_t cmd_set_vf_rxmode = {
+       .f = cmd_set_vf_rxmode_parsed,
+       .data = NULL,
+       .help_str = "set port X vf Y rxmode AUPE|ROPE|BAM|MPE on|off",
+       .tokens = {
+               (void *)&cmd_set_vf_rxmode_set,
+               (void *)&cmd_set_vf_rxmode_port,
+               (void *)&cmd_set_vf_rxmode_portid,
+               (void *)&cmd_set_vf_rxmode_vf,
+               (void *)&cmd_set_vf_rxmode_vfid,
+               (void *)&cmd_set_vf_rxmode_what,
+               (void *)&cmd_set_vf_rxmode_mode,
+               (void *)&cmd_set_vf_rxmode_on,
+               NULL,
+       },
+};
+
+/* *** ADD MAC ADDRESS FILTER FOR A VF OF A PORT *** */
+struct cmd_vf_mac_addr_result {
+       cmdline_fixed_string_t mac_addr_cmd;
+       cmdline_fixed_string_t what;
+       cmdline_fixed_string_t port;
+       uint8_t port_num;
+       cmdline_fixed_string_t vf;
+       uint8_t vf_num;
+       struct ether_addr address;
+};
+
+static void cmd_vf_mac_addr_parsed(void *parsed_result,
+               __attribute__((unused)) struct cmdline *cl,
+               __attribute__((unused)) void *data)
+{
+       struct cmd_vf_mac_addr_result *res = parsed_result;
+       int ret = 0;
+
+       if (strcmp(res->what, "add") == 0)
+               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));
+
+}
+
+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,
+                               what,"add");
+cmdline_parse_token_string_t cmd_vf_mac_addr_port =
+       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,
+                               port_num, UINT8);
+cmdline_parse_token_string_t cmd_vf_mac_addr_vf =
+       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,
+                               address);
+
+cmdline_parse_inst_t cmd_vf_mac_addr_filter = {
+       .f = cmd_vf_mac_addr_parsed,
+       .data = (void *)0,
+       .help_str = "mac_addr add port X vf Y ethaddr:(X = port number,"
+       "Y = VF number)add MAC address filtering for a VF on port X",
+       .tokens = {
+               (void *)&cmd_vf_mac_addr_cmd,
+               (void *)&cmd_vf_mac_addr_what,
+               (void *)&cmd_vf_mac_addr_port,
+               (void *)&cmd_vf_mac_addr_portnum,
+               (void *)&cmd_vf_mac_addr_vf,
+               (void *)&cmd_vf_mac_addr_vfnum,
+               (void *)&cmd_vf_mac_addr_addr,
+               NULL,
+       },
+};
+
+/* *** ADD/REMOVE A VLAN IDENTIFIER TO/FROM A PORT VLAN RX FILTER *** */
+struct cmd_vf_rx_vlan_filter {
+       cmdline_fixed_string_t rx_vlan;
+       cmdline_fixed_string_t what;
+       uint16_t vlan_id;
+       cmdline_fixed_string_t port;
+       uint8_t port_id;
+       cmdline_fixed_string_t vf;
+       uint64_t vf_mask;
+};
+
+static void
+cmd_vf_rx_vlan_filter_parsed(void *parsed_result,
+                         __attribute__((unused)) struct cmdline *cl,
+                         __attribute__((unused)) void *data)
+{
+       struct cmd_vf_rx_vlan_filter *res = parsed_result;
+
+       if (!strcmp(res->what, "add"))
+               set_vf_rx_vlan(res->port_id, res->vlan_id,res->vf_mask, 1);
+       else
+               set_vf_rx_vlan(res->port_id, res->vlan_id,res->vf_mask, 0);
 }
+
+cmdline_parse_token_string_t cmd_vf_rx_vlan_filter_rx_vlan =
+       TOKEN_STRING_INITIALIZER(struct cmd_vf_rx_vlan_filter,
+                                rx_vlan, "rx_vlan");
+cmdline_parse_token_string_t cmd_vf_rx_vlan_filter_what =
+       TOKEN_STRING_INITIALIZER(struct cmd_vf_rx_vlan_filter,
+                                what, "add#rm");
+cmdline_parse_token_num_t cmd_vf_rx_vlan_filter_vlanid =
+       TOKEN_NUM_INITIALIZER(struct cmd_vf_rx_vlan_filter,
+                             vlan_id, UINT16);
+cmdline_parse_token_string_t cmd_vf_rx_vlan_filter_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_vf_rx_vlan_filter,
+                                port, "port");
+cmdline_parse_token_num_t cmd_vf_rx_vlan_filter_portid =
+       TOKEN_NUM_INITIALIZER(struct cmd_vf_rx_vlan_filter,
+                             port_id, UINT8);
+cmdline_parse_token_string_t cmd_vf_rx_vlan_filter_vf =
+       TOKEN_STRING_INITIALIZER(struct cmd_vf_rx_vlan_filter,
+                                vf, "vf");
+cmdline_parse_token_num_t cmd_vf_rx_vlan_filter_vf_mask =
+       TOKEN_NUM_INITIALIZER(struct cmd_vf_rx_vlan_filter,
+                             vf_mask, UINT64);
+
+cmdline_parse_inst_t cmd_vf_rxvlan_filter = {
+       .f = cmd_vf_rx_vlan_filter_parsed,
+       .data = NULL,
+       .help_str = "rx_vlan add|rm X port Y vf Z (X = VLAN ID,"
+               "Y = port number,Z = hexadecimal VF mask)",
+       .tokens = {
+               (void *)&cmd_vf_rx_vlan_filter_rx_vlan,
+               (void *)&cmd_vf_rx_vlan_filter_what,
+               (void *)&cmd_vf_rx_vlan_filter_vlanid,
+               (void *)&cmd_vf_rx_vlan_filter_port,
+               (void *)&cmd_vf_rx_vlan_filter_portid,
+               (void *)&cmd_vf_rx_vlan_filter_vf,
+               (void *)&cmd_vf_rx_vlan_filter_vf_mask,
+               NULL,
+       },
+};
+
+/* *** SET RATE LIMIT FOR A QUEUE OF A PORT *** */
+struct cmd_queue_rate_limit_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t port;
+       uint8_t port_num;
+       cmdline_fixed_string_t queue;
+       uint8_t queue_num;
+       cmdline_fixed_string_t rate;
+       uint16_t rate_num;
+};
+
+static void cmd_queue_rate_limit_parsed(void *parsed_result,
+               __attribute__((unused)) struct cmdline *cl,
+               __attribute__((unused)) void *data)
+{
+       struct cmd_queue_rate_limit_result *res = parsed_result;
+       int ret = 0;
+
+       if ((strcmp(res->set, "set") == 0) && (strcmp(res->port, "port") == 0)
+               && (strcmp(res->queue, "queue") == 0)
+               && (strcmp(res->rate, "rate") == 0))
+               ret = set_queue_rate_limit(res->port_num, res->queue_num,
+                                       res->rate_num);
+       if (ret < 0)
+               printf("queue_rate_limit_cmd error: (%s)\n", strerror(-ret));
+
+}
+
+cmdline_parse_token_string_t cmd_queue_rate_limit_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_queue_rate_limit_result,
+                               set, "set");
+cmdline_parse_token_string_t cmd_queue_rate_limit_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_queue_rate_limit_result,
+                               port, "port");
+cmdline_parse_token_num_t cmd_queue_rate_limit_portnum =
+       TOKEN_NUM_INITIALIZER(struct cmd_queue_rate_limit_result,
+                               port_num, UINT8);
+cmdline_parse_token_string_t cmd_queue_rate_limit_queue =
+       TOKEN_STRING_INITIALIZER(struct cmd_queue_rate_limit_result,
+                               queue, "queue");
+cmdline_parse_token_num_t cmd_queue_rate_limit_queuenum =
+       TOKEN_NUM_INITIALIZER(struct cmd_queue_rate_limit_result,
+                               queue_num, UINT8);
+cmdline_parse_token_string_t cmd_queue_rate_limit_rate =
+       TOKEN_STRING_INITIALIZER(struct cmd_queue_rate_limit_result,
+                               rate, "rate");
+cmdline_parse_token_num_t cmd_queue_rate_limit_ratenum =
+       TOKEN_NUM_INITIALIZER(struct cmd_queue_rate_limit_result,
+                               rate_num, UINT16);
+
+cmdline_parse_inst_t cmd_queue_rate_limit = {
+       .f = cmd_queue_rate_limit_parsed,
+       .data = (void *)0,
+       .help_str = "set port X queue Y rate Z:(X = port number,"
+       "Y = queue number,Z = rate number)set rate limit for a queue on port X",
+       .tokens = {
+               (void *)&cmd_queue_rate_limit_set,
+               (void *)&cmd_queue_rate_limit_port,
+               (void *)&cmd_queue_rate_limit_portnum,
+               (void *)&cmd_queue_rate_limit_queue,
+               (void *)&cmd_queue_rate_limit_queuenum,
+               (void *)&cmd_queue_rate_limit_rate,
+               (void *)&cmd_queue_rate_limit_ratenum,
+               NULL,
+       },
+};
+
+/* *** SET RATE LIMIT FOR A VF OF A PORT *** */
+struct cmd_vf_rate_limit_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t port;
+       uint8_t port_num;
+       cmdline_fixed_string_t vf;
+       uint8_t vf_num;
+       cmdline_fixed_string_t rate;
+       uint16_t rate_num;
+       cmdline_fixed_string_t q_msk;
+       uint64_t q_msk_val;
+};
+
+static void cmd_vf_rate_limit_parsed(void *parsed_result,
+               __attribute__((unused)) struct cmdline *cl,
+               __attribute__((unused)) void *data)
+{
+       struct cmd_vf_rate_limit_result *res = parsed_result;
+       int ret = 0;
+
+       if ((strcmp(res->set, "set") == 0) && (strcmp(res->port, "port") == 0)
+               && (strcmp(res->vf, "vf") == 0)
+               && (strcmp(res->rate, "rate") == 0)
+               && (strcmp(res->q_msk, "queue_mask") == 0))
+               ret = set_vf_rate_limit(res->port_num, res->vf_num,
+                                       res->rate_num, res->q_msk_val);
+       if (ret < 0)
+               printf("vf_rate_limit_cmd error: (%s)\n", strerror(-ret));
+
+}
+
+cmdline_parse_token_string_t cmd_vf_rate_limit_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_vf_rate_limit_result,
+                               set, "set");
+cmdline_parse_token_string_t cmd_vf_rate_limit_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_vf_rate_limit_result,
+                               port, "port");
+cmdline_parse_token_num_t cmd_vf_rate_limit_portnum =
+       TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result,
+                               port_num, UINT8);
+cmdline_parse_token_string_t cmd_vf_rate_limit_vf =
+       TOKEN_STRING_INITIALIZER(struct cmd_vf_rate_limit_result,
+                               vf, "vf");
+cmdline_parse_token_num_t cmd_vf_rate_limit_vfnum =
+       TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result,
+                               vf_num, UINT8);
+cmdline_parse_token_string_t cmd_vf_rate_limit_rate =
+       TOKEN_STRING_INITIALIZER(struct cmd_vf_rate_limit_result,
+                               rate, "rate");
+cmdline_parse_token_num_t cmd_vf_rate_limit_ratenum =
+       TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result,
+                               rate_num, UINT16);
+cmdline_parse_token_string_t cmd_vf_rate_limit_q_msk =
+       TOKEN_STRING_INITIALIZER(struct cmd_vf_rate_limit_result,
+                               q_msk, "queue_mask");
+cmdline_parse_token_num_t cmd_vf_rate_limit_q_msk_val =
+       TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result,
+                               q_msk_val, UINT64);
+
+cmdline_parse_inst_t cmd_vf_rate_limit = {
+       .f = cmd_vf_rate_limit_parsed,
+       .data = (void *)0,
+       .help_str = "set port X vf Y rate Z queue_mask V:(X = port number,"
+       "Y = VF number,Z = rate number, V = queue mask value)set rate limit "
+       "for queues of VF on port X",
+       .tokens = {
+               (void *)&cmd_vf_rate_limit_set,
+               (void *)&cmd_vf_rate_limit_port,
+               (void *)&cmd_vf_rate_limit_portnum,
+               (void *)&cmd_vf_rate_limit_vf,
+               (void *)&cmd_vf_rate_limit_vfnum,
+               (void *)&cmd_vf_rate_limit_rate,
+               (void *)&cmd_vf_rate_limit_ratenum,
+               (void *)&cmd_vf_rate_limit_q_msk,
+               (void *)&cmd_vf_rate_limit_q_msk_val,
+               NULL,
+       },
+};
+
+/* *** CONFIGURE VM MIRROR VLAN/POOL RULE *** */
+struct cmd_set_mirror_mask_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t port;
+       uint8_t port_id;
+       cmdline_fixed_string_t mirror;
+       uint8_t rule_id;
+       cmdline_fixed_string_t what;
+       cmdline_fixed_string_t value;
+       cmdline_fixed_string_t dstpool;
+       uint8_t dstpool_id;
+       cmdline_fixed_string_t on;
+};
+
+cmdline_parse_token_string_t cmd_mirror_mask_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_mask_result,
+                               set, "set");
+cmdline_parse_token_string_t cmd_mirror_mask_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_mask_result,
+                               port, "port");
+cmdline_parse_token_num_t cmd_mirror_mask_portid =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_mask_result,
+                               port_id, UINT8);
+cmdline_parse_token_string_t cmd_mirror_mask_mirror =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_mask_result,
+                               mirror, "mirror-rule");
+cmdline_parse_token_num_t cmd_mirror_mask_ruleid =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_mask_result,
+                               rule_id, UINT8);
+cmdline_parse_token_string_t cmd_mirror_mask_what =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_mask_result,
+                               what, "pool-mirror#vlan-mirror");
+cmdline_parse_token_string_t cmd_mirror_mask_value =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_mask_result,
+                               value, NULL);
+cmdline_parse_token_string_t cmd_mirror_mask_dstpool =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_mask_result,
+                               dstpool, "dst-pool");
+cmdline_parse_token_num_t cmd_mirror_mask_poolid =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_mask_result,
+                               dstpool_id, UINT8);
+cmdline_parse_token_string_t cmd_mirror_mask_on =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_mask_result,
+                               on, "on#off");
+
+static void
+cmd_set_mirror_mask_parsed(void *parsed_result,
+                      __attribute__((unused)) struct cmdline *cl,
+                      __attribute__((unused)) void *data)
+{
+       int ret,nb_item,i;
+       struct cmd_set_mirror_mask_result *res = parsed_result;
+       struct rte_eth_vmdq_mirror_conf mr_conf;
+
+       memset(&mr_conf,0,sizeof(struct rte_eth_vmdq_mirror_conf));
+
+       unsigned int vlan_list[ETH_VMDQ_MAX_VLAN_FILTERS];
+
+       mr_conf.dst_pool = res->dstpool_id;
+
+       if (!strcmp(res->what, "pool-mirror")) {
+               mr_conf.pool_mask = strtoull(res->value,NULL,16);
+               mr_conf.rule_type_mask = ETH_VMDQ_POOL_MIRROR;
+       } else if(!strcmp(res->what, "vlan-mirror")) {
+               mr_conf.rule_type_mask = ETH_VMDQ_VLAN_MIRROR;
+               nb_item = parse_item_list(res->value, "core",
+                                       ETH_VMDQ_MAX_VLAN_FILTERS,vlan_list,1);
+               if (nb_item <= 0)
+                       return;
+
+               for(i=0; i < nb_item; i++) {
+                       if (vlan_list[i] > ETHER_MAX_VLAN_ID) {
+                               printf("Invalid vlan_id: must be < 4096\n");
+                               return;
+                       }
+
+                       mr_conf.vlan.vlan_id[i] = (uint16_t)vlan_list[i];
+                       mr_conf.vlan.vlan_mask |= 1ULL << i;
+               }
+       }
+
+       if(!strcmp(res->on, "on"))
+               ret = rte_eth_mirror_rule_set(res->port_id,&mr_conf,
+                                               res->rule_id, 1);
+       else
+               ret = rte_eth_mirror_rule_set(res->port_id,&mr_conf,
+                                               res->rule_id, 0);
+       if(ret < 0)
+               printf("mirror rule add error: (%s)\n", strerror(-ret));
+}
+
+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 "
+                               "pool_mask|vlan_id[,vlan_id]* dst-pool Z on|off",
+               .tokens = {
+                       (void *)&cmd_mirror_mask_set,
+                       (void *)&cmd_mirror_mask_port,
+                       (void *)&cmd_mirror_mask_portid,
+                       (void *)&cmd_mirror_mask_mirror,
+                       (void *)&cmd_mirror_mask_ruleid,
+                       (void *)&cmd_mirror_mask_what,
+                       (void *)&cmd_mirror_mask_value,
+                       (void *)&cmd_mirror_mask_dstpool,
+                       (void *)&cmd_mirror_mask_poolid,
+                       (void *)&cmd_mirror_mask_on,
+                       NULL,
+               },
+};
+
+/* *** CONFIGURE VM MIRROR UDLINK/DOWNLINK RULE *** */
+struct cmd_set_mirror_link_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t port;
+       uint8_t port_id;
+       cmdline_fixed_string_t mirror;
+       uint8_t rule_id;
+       cmdline_fixed_string_t what;
+       cmdline_fixed_string_t dstpool;
+       uint8_t dstpool_id;
+       cmdline_fixed_string_t on;
+};
+
+cmdline_parse_token_string_t cmd_mirror_link_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_link_result,
+                                set, "set");
+cmdline_parse_token_string_t cmd_mirror_link_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_link_result,
+                               port, "port");
+cmdline_parse_token_num_t cmd_mirror_link_portid =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_link_result,
+                               port_id, UINT8);
+cmdline_parse_token_string_t cmd_mirror_link_mirror =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_link_result,
+                               mirror, "mirror-rule");
+cmdline_parse_token_num_t cmd_mirror_link_ruleid =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_link_result,
+                           rule_id, UINT8);
+cmdline_parse_token_string_t cmd_mirror_link_what =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_link_result,
+                               what, "uplink-mirror#downlink-mirror");
+cmdline_parse_token_string_t cmd_mirror_link_dstpool =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_link_result,
+                               dstpool, "dst-pool");
+cmdline_parse_token_num_t cmd_mirror_link_poolid =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_link_result,
+                               dstpool_id, UINT8);
+cmdline_parse_token_string_t cmd_mirror_link_on =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_link_result,
+                               on, "on#off");
+
+static void
+cmd_set_mirror_link_parsed(void *parsed_result,
+                      __attribute__((unused)) struct cmdline *cl,
+                      __attribute__((unused)) void *data)
+{
+       int ret;
+       struct cmd_set_mirror_link_result *res = parsed_result;
+       struct rte_eth_vmdq_mirror_conf mr_conf;
+
+       memset(&mr_conf,0,sizeof(struct rte_eth_vmdq_mirror_conf));
+       if(!strcmp(res->what, "uplink-mirror")) {
+               mr_conf.rule_type_mask = ETH_VMDQ_UPLINK_MIRROR;
+       }else if(!strcmp(res->what, "downlink-mirror"))
+               mr_conf.rule_type_mask = ETH_VMDQ_DOWNLIN_MIRROR;
+
+       mr_conf.dst_pool = res->dstpool_id;
+
+       if(!strcmp(res->on, "on"))
+               ret = rte_eth_mirror_rule_set(res->port_id,&mr_conf,
+                                               res->rule_id, 1);
+       else
+               ret = rte_eth_mirror_rule_set(res->port_id,&mr_conf,
+                                               res->rule_id, 0);
+
+       /* check the return value and print it if is < 0 */
+       if(ret < 0)
+               printf("mirror rule add error: (%s)\n", strerror(-ret));
+
+}
+
+cmdline_parse_inst_t cmd_set_mirror_link = {
+               .f = cmd_set_mirror_link_parsed,
+               .data = NULL,
+               .help_str = "set port X mirror-rule Y uplink-mirror|"
+                       "downlink-mirror dst-pool Z on|off",
+               .tokens = {
+                       (void *)&cmd_mirror_link_set,
+                       (void *)&cmd_mirror_link_port,
+                       (void *)&cmd_mirror_link_portid,
+                       (void *)&cmd_mirror_link_mirror,
+                       (void *)&cmd_mirror_link_ruleid,
+                       (void *)&cmd_mirror_link_what,
+                       (void *)&cmd_mirror_link_dstpool,
+                       (void *)&cmd_mirror_link_poolid,
+                       (void *)&cmd_mirror_link_on,
+                       NULL,
+               },
+};
+
+/* *** RESET VM MIRROR RULE *** */
+struct cmd_rm_mirror_rule_result {
+       cmdline_fixed_string_t reset;
+       cmdline_fixed_string_t port;
+       uint8_t port_id;
+       cmdline_fixed_string_t mirror;
+       uint8_t rule_id;
+};
+
+cmdline_parse_token_string_t cmd_rm_mirror_rule_reset =
+       TOKEN_STRING_INITIALIZER(struct cmd_rm_mirror_rule_result,
+                                reset, "reset");
+cmdline_parse_token_string_t cmd_rm_mirror_rule_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_rm_mirror_rule_result,
+                               port, "port");
+cmdline_parse_token_num_t cmd_rm_mirror_rule_portid =
+       TOKEN_NUM_INITIALIZER(struct cmd_rm_mirror_rule_result,
+                               port_id, UINT8);
+cmdline_parse_token_string_t cmd_rm_mirror_rule_mirror =
+       TOKEN_STRING_INITIALIZER(struct cmd_rm_mirror_rule_result,
+                               mirror, "mirror-rule");
+cmdline_parse_token_num_t cmd_rm_mirror_rule_ruleid =
+       TOKEN_NUM_INITIALIZER(struct cmd_rm_mirror_rule_result,
+                               rule_id, UINT8);
+
+static void
+cmd_reset_mirror_rule_parsed(void *parsed_result,
+                      __attribute__((unused)) struct cmdline *cl,
+                      __attribute__((unused)) void *data)
+{
+       int ret;
+       struct cmd_set_mirror_link_result *res = parsed_result;
+        /* check rule_id */
+       ret = rte_eth_mirror_rule_reset(res->port_id,res->rule_id);
+       if(ret < 0)
+               printf("mirror rule remove error: (%s)\n", strerror(-ret));
+}
+
+cmdline_parse_inst_t cmd_reset_mirror_rule = {
+               .f = cmd_reset_mirror_rule_parsed,
+               .data = NULL,
+               .help_str = "reset port X mirror-rule Y",
+               .tokens = {
+                       (void *)&cmd_rm_mirror_rule_reset,
+                       (void *)&cmd_rm_mirror_rule_port,
+                       (void *)&cmd_rm_mirror_rule_portid,
+                       (void *)&cmd_rm_mirror_rule_mirror,
+                       (void *)&cmd_rm_mirror_rule_ruleid,
+                       NULL,
+               },
+};
+
+/* ******************************************************************************** */
+
+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,
+       },
+};
+
+/* *** ADD/REMOVE an ethertype FILTER *** */
+struct cmd_ethertype_filter_result {
+       cmdline_fixed_string_t filter;
+       uint8_t port_id;
+       cmdline_fixed_string_t ethertype;
+       uint16_t ethertype_value;
+       cmdline_fixed_string_t priority;
+       cmdline_fixed_string_t priority_en;
+       uint8_t priority_value;
+       cmdline_fixed_string_t queue;
+       uint16_t queue_id;
+       cmdline_fixed_string_t index;
+       uint16_t index_value;
+};
+
+static void
+cmd_ethertype_filter_parsed(void *parsed_result,
+                       __attribute__((unused)) struct cmdline *cl,
+                       __attribute__((unused)) void *data)
+{
+       int ret = 0;
+       struct cmd_ethertype_filter_result *res = parsed_result;
+       struct rte_ethertype_filter filter;
+
+       memset(&filter, 0, sizeof(struct rte_ethertype_filter));
+       filter.ethertype = rte_cpu_to_le_16(res->ethertype_value);
+       filter.priority = res->priority_value;
+
+       if (!strcmp(res->priority_en, "enable"))
+               filter.priority_en = 1;
+       if (!strcmp(res->filter, "add_ethertype_filter"))
+               ret = rte_eth_dev_add_ethertype_filter(res->port_id,
+                               res->index_value,
+                               &filter, res->queue_id);
+       else if (!strcmp(res->filter, "remove_ethertype_filter"))
+               ret = rte_eth_dev_remove_ethertype_filter(res->port_id,
+                               res->index_value);
+       else if (!strcmp(res->filter, "get_ethertype_filter"))
+               get_ethertype_filter(res->port_id, res->index_value);
+
+       if (ret < 0)
+               printf("ethertype filter setting error: (%s)\n",
+                       strerror(-ret));
+}
+
+cmdline_parse_token_num_t cmd_ethertype_filter_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_ethertype_filter_result,
+                               port_id, UINT8);
+cmdline_parse_token_string_t cmd_ethertype_filter_ethertype =
+       TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result,
+                               ethertype, "ethertype");
+cmdline_parse_token_ipaddr_t cmd_ethertype_filter_ethertype_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_ethertype_filter_result,
+                               ethertype_value, UINT16);
+cmdline_parse_token_string_t cmd_ethertype_filter_priority =
+       TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result,
+                               priority, "priority");
+cmdline_parse_token_string_t cmd_ethertype_filter_priority_en =
+       TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result,
+                               priority_en, "enable#disable");
+cmdline_parse_token_num_t cmd_ethertype_filter_priority_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_ethertype_filter_result,
+                               priority_value, UINT8);
+cmdline_parse_token_string_t cmd_ethertype_filter_queue =
+       TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result,
+                               queue, "queue");
+cmdline_parse_token_num_t cmd_ethertype_filter_queue_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_ethertype_filter_result,
+                               queue_id, UINT16);
+cmdline_parse_token_string_t cmd_ethertype_filter_index =
+       TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result,
+                               index, "index");
+cmdline_parse_token_num_t cmd_ethertype_filter_index_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_ethertype_filter_result,
+                               index_value, UINT16);
+cmdline_parse_token_string_t cmd_ethertype_filter_add_filter =
+       TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result,
+                               filter, "add_ethertype_filter");
+cmdline_parse_inst_t cmd_add_ethertype_filter = {
+       .f = cmd_ethertype_filter_parsed,
+       .data = NULL,
+       .help_str = "add an ethertype filter",
+       .tokens = {
+               (void *)&cmd_ethertype_filter_add_filter,
+               (void *)&cmd_ethertype_filter_port_id,
+               (void *)&cmd_ethertype_filter_ethertype,
+               (void *)&cmd_ethertype_filter_ethertype_value,
+               (void *)&cmd_ethertype_filter_priority,
+               (void *)&cmd_ethertype_filter_priority_en,
+               (void *)&cmd_ethertype_filter_priority_value,
+               (void *)&cmd_ethertype_filter_queue,
+               (void *)&cmd_ethertype_filter_queue_id,
+               (void *)&cmd_ethertype_filter_index,
+               (void *)&cmd_ethertype_filter_index_value,
+               NULL,
+       },
+};
+
+cmdline_parse_token_string_t cmd_ethertype_filter_remove_filter =
+       TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result,
+                                filter, "remove_ethertype_filter");
+cmdline_parse_inst_t cmd_remove_ethertype_filter = {
+       .f = cmd_ethertype_filter_parsed,
+       .data = NULL,
+       .help_str = "remove an ethertype filter",
+       .tokens = {
+               (void *)&cmd_ethertype_filter_remove_filter,
+               (void *)&cmd_ethertype_filter_port_id,
+               (void *)&cmd_ethertype_filter_index,
+               (void *)&cmd_ethertype_filter_index_value,
+               NULL,
+       },
+};
+cmdline_parse_token_string_t cmd_ethertype_filter_get_filter =
+       TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result,
+                                filter, "get_ethertype_filter");
+cmdline_parse_inst_t cmd_get_ethertype_filter = {
+       .f = cmd_ethertype_filter_parsed,
+       .data = NULL,
+       .help_str = "get an ethertype filter",
+       .tokens = {
+               (void *)&cmd_ethertype_filter_get_filter,
+               (void *)&cmd_ethertype_filter_port_id,
+               (void *)&cmd_ethertype_filter_index,
+               (void *)&cmd_ethertype_filter_index_value,
+               NULL,
+       },
+};
+
+/* *** set SYN filter *** */
+struct cmd_set_syn_filter_result {
+       cmdline_fixed_string_t filter;
+       uint8_t port_id;
+       cmdline_fixed_string_t priority;
+       cmdline_fixed_string_t high;
+       cmdline_fixed_string_t queue;
+       uint16_t  queue_id;
+};
+
+static void
+cmd_set_syn_filter_parsed(void *parsed_result,
+                       __attribute__((unused)) struct cmdline *cl,
+                       __attribute__((unused)) void *data)
+{
+       int ret = 0;
+       struct cmd_set_syn_filter_result *res = parsed_result;
+       struct rte_syn_filter filter;
+
+       if (!strcmp(res->filter, "add_syn_filter")) {
+               if (!strcmp(res->high, "high"))
+                       filter.hig_pri = 1;
+               else
+                       filter.hig_pri = 0;
+               ret = rte_eth_dev_add_syn_filter(res->port_id,
+                               &filter, res->queue_id);
+       } else if (!strcmp(res->filter, "remove_syn_filter"))
+               ret = rte_eth_dev_remove_syn_filter(res->port_id);
+       else if (!strcmp(res->filter, "get_syn_filter"))
+               get_syn_filter(res->port_id);
+       if (ret < 0)
+               printf("syn filter setting error: (%s)\n", strerror(-ret));
+
+}
+cmdline_parse_token_num_t cmd_syn_filter_portid =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_syn_filter_result,
+                               port_id, UINT8);
+cmdline_parse_token_string_t cmd_syn_filter_priority =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_syn_filter_result,
+                               priority, "priority");
+cmdline_parse_token_string_t cmd_syn_filter_high =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_syn_filter_result,
+                               high, "high#low");
+cmdline_parse_token_string_t cmd_syn_filter_queue =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_syn_filter_result,
+                               queue, "queue");
+cmdline_parse_token_num_t cmd_syn_filter_queue_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_syn_filter_result,
+                               queue_id, UINT16);
+cmdline_parse_token_string_t cmd_syn_filter_add_filter =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_syn_filter_result,
+                               filter, "add_syn_filter");
+cmdline_parse_token_string_t cmd_syn_filter_remove_filter =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_syn_filter_result,
+                               filter, "remove_syn_filter");
+cmdline_parse_inst_t cmd_add_syn_filter = {
+               .f = cmd_set_syn_filter_parsed,
+               .data = NULL,
+               .help_str = "add syn filter",
+               .tokens = {
+                       (void *)&cmd_syn_filter_add_filter,
+                       (void *)&cmd_syn_filter_portid,
+                       (void *)&cmd_syn_filter_priority,
+                       (void *)&cmd_syn_filter_high,
+                       (void *)&cmd_syn_filter_queue,
+                       (void *)&cmd_syn_filter_queue_id,
+                       NULL,
+               },
+};
+cmdline_parse_inst_t cmd_remove_syn_filter = {
+               .f = cmd_set_syn_filter_parsed,
+               .data = NULL,
+               .help_str = "remove syn filter",
+               .tokens = {
+                       (void *)&cmd_syn_filter_remove_filter,
+                       (void *)&cmd_syn_filter_portid,
+                       NULL,
+               },
+};
+
+cmdline_parse_token_string_t cmd_syn_filter_get_filter =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_syn_filter_result,
+                               filter, "get_syn_filter");
+
+cmdline_parse_inst_t cmd_get_syn_filter = {
+               .f = cmd_set_syn_filter_parsed,
+               .data = NULL,
+               .help_str = "get syn filter",
+               .tokens = {
+                       (void *)&cmd_syn_filter_get_filter,
+                       (void *)&cmd_syn_filter_portid,
+                       NULL,
+               },
+};
+
+/* *** ADD/REMOVE A 2tuple FILTER *** */
+struct cmd_2tuple_filter_result {
+       cmdline_fixed_string_t filter;
+       uint8_t port_id;
+       cmdline_fixed_string_t protocol;
+       uint8_t protocol_value;
+       uint8_t protocol_mask;
+       cmdline_fixed_string_t dst_port;
+       uint16_t dst_port_value;
+       uint16_t dst_port_mask;
+       cmdline_fixed_string_t flags;
+       uint8_t flags_value;
+       cmdline_fixed_string_t priority;
+       uint8_t priority_value;
+       cmdline_fixed_string_t queue;
+       uint16_t queue_id;
+       cmdline_fixed_string_t index;
+       uint16_t index_value;
+};
+
+static void
+cmd_2tuple_filter_parsed(void *parsed_result,
+                       __attribute__((unused)) struct cmdline *cl,
+                       __attribute__((unused)) void *data)
+{
+       int ret = 0;
+       struct rte_2tuple_filter filter;
+       struct cmd_2tuple_filter_result *res = parsed_result;
+
+       memset(&filter, 0, sizeof(struct rte_2tuple_filter));
+
+       if (!strcmp(res->filter, "add_2tuple_filter")) {
+               /* need convert to big endian. */
+               filter.dst_port = rte_cpu_to_be_16(res->dst_port_value);
+               filter.protocol = res->protocol_value;
+               filter.dst_port_mask = (res->dst_port_mask) ? 0 : 1;
+               filter.protocol_mask = (res->protocol_mask) ? 0 : 1;
+               filter.priority = res->priority_value;
+               filter.tcp_flags = res->flags_value;
+               ret = rte_eth_dev_add_2tuple_filter(res->port_id,
+                       res->index_value, &filter, res->queue_id);
+       } else if (!strcmp(res->filter, "remove_2tuple_filter"))
+               ret = rte_eth_dev_remove_2tuple_filter(res->port_id,
+                       res->index_value);
+       else if (!strcmp(res->filter, "get_2tuple_filter"))
+               get_2tuple_filter(res->port_id, res->index_value);
+
+       if (ret < 0)
+               printf("2tuple filter setting error: (%s)\n", strerror(-ret));
+}
+
+cmdline_parse_token_num_t cmd_2tuple_filter_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
+                               port_id, UINT8);
+cmdline_parse_token_string_t cmd_2tuple_filter_protocol =
+       TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
+                                protocol, "protocol");
+cmdline_parse_token_num_t cmd_2tuple_filter_protocol_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
+                                protocol_value, UINT8);
+cmdline_parse_token_num_t cmd_2tuple_filter_protocol_mask =
+       TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
+                               protocol_mask, UINT8);
+cmdline_parse_token_string_t cmd_2tuple_filter_dst_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
+                               dst_port, "dst_port");
+cmdline_parse_token_num_t cmd_2tuple_filter_dst_port_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
+                               dst_port_value, UINT16);
+cmdline_parse_token_num_t cmd_2tuple_filter_dst_port_mask =
+       TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
+                               dst_port_mask, UINT16);
+cmdline_parse_token_string_t cmd_2tuple_filter_flags =
+       TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
+                               flags, "flags");
+cmdline_parse_token_num_t cmd_2tuple_filter_flags_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
+                               flags_value, UINT8);
+cmdline_parse_token_string_t cmd_2tuple_filter_priority =
+       TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
+                               priority, "priority");
+cmdline_parse_token_num_t cmd_2tuple_filter_priority_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
+                               priority_value, UINT8);
+cmdline_parse_token_string_t cmd_2tuple_filter_queue =
+       TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
+                               queue, "queue");
+cmdline_parse_token_num_t cmd_2tuple_filter_queue_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
+                               queue_id, UINT16);
+cmdline_parse_token_string_t cmd_2tuple_filter_index =
+       TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
+                               index, "index");
+cmdline_parse_token_num_t cmd_2tuple_filter_index_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
+                               index_value, UINT16);
+cmdline_parse_token_string_t cmd_2tuple_filter_add_filter =
+       TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
+                               filter, "add_2tuple_filter");
+cmdline_parse_inst_t cmd_add_2tuple_filter = {
+       .f = cmd_2tuple_filter_parsed,
+       .data = NULL,
+       .help_str = "add a 2tuple filter",
+       .tokens = {
+               (void *)&cmd_2tuple_filter_add_filter,
+               (void *)&cmd_2tuple_filter_port_id,
+               (void *)&cmd_2tuple_filter_protocol,
+               (void *)&cmd_2tuple_filter_protocol_value,
+               (void *)&cmd_2tuple_filter_protocol_mask,
+               (void *)&cmd_2tuple_filter_dst_port,
+               (void *)&cmd_2tuple_filter_dst_port_value,
+               (void *)&cmd_2tuple_filter_dst_port_mask,
+               (void *)&cmd_2tuple_filter_flags,
+               (void *)&cmd_2tuple_filter_flags_value,
+               (void *)&cmd_2tuple_filter_priority,
+               (void *)&cmd_2tuple_filter_priority_value,
+               (void *)&cmd_2tuple_filter_queue,
+               (void *)&cmd_2tuple_filter_queue_id,
+               (void *)&cmd_2tuple_filter_index,
+               (void *)&cmd_2tuple_filter_index_value,
+               NULL,
+       },
+};
+
+cmdline_parse_token_string_t cmd_2tuple_filter_remove_filter =
+       TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
+                               filter, "remove_2tuple_filter");
+cmdline_parse_inst_t cmd_remove_2tuple_filter = {
+       .f = cmd_2tuple_filter_parsed,
+       .data = NULL,
+       .help_str = "remove a 2tuple filter",
+       .tokens = {
+               (void *)&cmd_2tuple_filter_remove_filter,
+               (void *)&cmd_2tuple_filter_port_id,
+               (void *)&cmd_2tuple_filter_index,
+               (void *)&cmd_2tuple_filter_index_value,
+               NULL,
+       },
+};
+cmdline_parse_token_string_t cmd_2tuple_filter_get_filter =
+       TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
+                               filter, "get_2tuple_filter");
+cmdline_parse_inst_t cmd_get_2tuple_filter = {
+       .f = cmd_2tuple_filter_parsed,
+       .data = NULL,
+       .help_str = "get a 2tuple filter",
+       .tokens = {
+               (void *)&cmd_2tuple_filter_get_filter,
+               (void *)&cmd_2tuple_filter_port_id,
+               (void *)&cmd_2tuple_filter_index,
+               (void *)&cmd_2tuple_filter_index_value,
+               NULL,
+       },
+};
+
+/* *** ADD/REMOVE A 5tuple FILTER *** */
+struct cmd_5tuple_filter_result {
+       cmdline_fixed_string_t filter;
+       uint8_t  port_id;
+       cmdline_fixed_string_t dst_ip;
+       cmdline_ipaddr_t dst_ip_value;
+       cmdline_fixed_string_t src_ip;
+       cmdline_ipaddr_t src_ip_value;
+       cmdline_fixed_string_t dst_port;
+       uint16_t dst_port_value;
+       cmdline_fixed_string_t src_port;
+       uint16_t src_port_value;
+       cmdline_fixed_string_t protocol;
+       uint8_t protocol_value;
+       cmdline_fixed_string_t mask;
+       uint8_t  mask_value;
+       cmdline_fixed_string_t flags;
+       uint8_t flags_value;
+       cmdline_fixed_string_t priority;
+       uint8_t  priority_value;
+       cmdline_fixed_string_t queue;
+       uint16_t  queue_id;
+       cmdline_fixed_string_t index;
+       uint16_t  index_value;
+};
+
+static void
+cmd_5tuple_filter_parsed(void *parsed_result,
+                       __attribute__((unused)) struct cmdline *cl,
+                       __attribute__((unused)) void *data)
+{
+       int ret = 0;
+       struct rte_5tuple_filter filter;
+       struct cmd_5tuple_filter_result *res = parsed_result;
+
+       memset(&filter, 0, sizeof(struct rte_5tuple_filter));
+
+       if (!strcmp(res->filter, "add_5tuple_filter")) {
+               filter.dst_ip_mask = (res->mask_value & 0x10) ? 0 : 1;
+               filter.src_ip_mask = (res->mask_value & 0x08) ? 0 : 1;
+               filter.dst_port_mask = (res->mask_value & 0x04) ? 0 : 1;
+               filter.src_port_mask = (res->mask_value & 0x02) ? 0 : 1;
+               filter.protocol = res->protocol_value;
+               filter.protocol_mask = (res->mask_value & 0x01) ? 0 : 1;
+               filter.priority = res->priority_value;
+               filter.tcp_flags = res->flags_value;
+
+               if (res->dst_ip_value.family == AF_INET)
+                       /* no need to convert, already big endian. */
+                       filter.dst_ip = res->dst_ip_value.addr.ipv4.s_addr;
+               else {
+                       if (filter.dst_ip_mask == 0) {
+                               printf("can not support ipv6 involved compare.\n");
+                               return;
+                       }
+                       filter.dst_ip = 0;
+               }
+
+               if (res->src_ip_value.family == AF_INET)
+                       /* no need to convert, already big endian. */
+                       filter.src_ip = res->src_ip_value.addr.ipv4.s_addr;
+               else {
+                       if (filter.src_ip_mask == 0) {
+                               printf("can not support ipv6 involved compare.\n");
+                               return;
+                       }
+                       filter.src_ip = 0;
+               }
+               /* need convert to big endian. */
+               filter.dst_port = rte_cpu_to_be_16(res->dst_port_value);
+               filter.src_port = rte_cpu_to_be_16(res->src_port_value);
+
+               ret = rte_eth_dev_add_5tuple_filter(res->port_id,
+                       res->index_value, &filter, res->queue_id);
+       } else if (!strcmp(res->filter, "remove_5tuple_filter"))
+               ret = rte_eth_dev_remove_5tuple_filter(res->port_id,
+                       res->index_value);
+       else if (!strcmp(res->filter, "get_5tuple_filter"))
+               get_5tuple_filter(res->port_id, res->index_value);
+       if (ret < 0)
+               printf("5tuple filter setting error: (%s)\n", strerror(-ret));
+}
+
+
+cmdline_parse_token_num_t cmd_5tuple_filter_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
+                               port_id, UINT8);
+cmdline_parse_token_string_t cmd_5tuple_filter_dst_ip =
+       TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
+                               dst_ip, "dst_ip");
+cmdline_parse_token_ipaddr_t cmd_5tuple_filter_dst_ip_value =
+       TOKEN_IPADDR_INITIALIZER(struct cmd_5tuple_filter_result,
+                               dst_ip_value);
+cmdline_parse_token_string_t cmd_5tuple_filter_src_ip =
+       TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
+                               src_ip, "src_ip");
+cmdline_parse_token_ipaddr_t cmd_5tuple_filter_src_ip_value =
+       TOKEN_IPADDR_INITIALIZER(struct cmd_5tuple_filter_result,
+                               src_ip_value);
+cmdline_parse_token_string_t cmd_5tuple_filter_dst_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
+                               dst_port, "dst_port");
+cmdline_parse_token_num_t cmd_5tuple_filter_dst_port_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
+                               dst_port_value, UINT16);
+cmdline_parse_token_string_t cmd_5tuple_filter_src_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
+                               src_port, "src_port");
+cmdline_parse_token_num_t cmd_5tuple_filter_src_port_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
+                               src_port_value, UINT16);
+cmdline_parse_token_string_t cmd_5tuple_filter_protocol =
+       TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
+                               protocol, "protocol");
+cmdline_parse_token_num_t cmd_5tuple_filter_protocol_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
+                               protocol_value, UINT8);
+cmdline_parse_token_string_t cmd_5tuple_filter_mask =
+       TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
+                               mask, "mask");
+cmdline_parse_token_num_t cmd_5tuple_filter_mask_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
+                               mask_value, INT8);
+cmdline_parse_token_string_t cmd_5tuple_filter_flags =
+       TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
+                               flags, "flags");
+cmdline_parse_token_num_t cmd_5tuple_filter_flags_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
+                               flags_value, UINT8);
+cmdline_parse_token_string_t cmd_5tuple_filter_priority =
+       TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
+                               priority, "priority");
+cmdline_parse_token_num_t cmd_5tuple_filter_priority_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
+                               priority_value, UINT8);
+cmdline_parse_token_string_t cmd_5tuple_filter_queue =
+       TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
+                               queue, "queue");
+cmdline_parse_token_num_t cmd_5tuple_filter_queue_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
+                               queue_id, UINT16);
+cmdline_parse_token_string_t cmd_5tuple_filter_index =
+       TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
+                               index, "index");
+cmdline_parse_token_num_t cmd_5tuple_filter_index_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
+                               index_value, UINT16);
+
+cmdline_parse_token_string_t cmd_5tuple_filter_add_filter =
+       TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
+                                filter, "add_5tuple_filter");
+cmdline_parse_inst_t cmd_add_5tuple_filter = {
+       .f = cmd_5tuple_filter_parsed,
+       .data = NULL,
+       .help_str = "add a 5tuple filter",
+       .tokens = {
+               (void *)&cmd_5tuple_filter_add_filter,
+               (void *)&cmd_5tuple_filter_port_id,
+               (void *)&cmd_5tuple_filter_dst_ip,
+               (void *)&cmd_5tuple_filter_dst_ip_value,
+               (void *)&cmd_5tuple_filter_src_ip,
+               (void *)&cmd_5tuple_filter_src_ip_value,
+               (void *)&cmd_5tuple_filter_dst_port,
+               (void *)&cmd_5tuple_filter_dst_port_value,
+               (void *)&cmd_5tuple_filter_src_port,
+               (void *)&cmd_5tuple_filter_src_port_value,
+               (void *)&cmd_5tuple_filter_protocol,
+               (void *)&cmd_5tuple_filter_protocol_value,
+               (void *)&cmd_5tuple_filter_mask,
+               (void *)&cmd_5tuple_filter_mask_value,
+               (void *)&cmd_5tuple_filter_flags,
+               (void *)&cmd_5tuple_filter_flags_value,
+               (void *)&cmd_5tuple_filter_priority,
+               (void *)&cmd_5tuple_filter_priority_value,
+               (void *)&cmd_5tuple_filter_queue,
+               (void *)&cmd_5tuple_filter_queue_id,
+               (void *)&cmd_5tuple_filter_index,
+               (void *)&cmd_5tuple_filter_index_value,
+               NULL,
+       },
+};
+
+cmdline_parse_token_string_t cmd_5tuple_filter_remove_filter =
+       TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
+                               filter, "remove_5tuple_filter");
+cmdline_parse_inst_t cmd_remove_5tuple_filter = {
+       .f = cmd_5tuple_filter_parsed,
+       .data = NULL,
+       .help_str = "remove a 5tuple filter",
+       .tokens = {
+               (void *)&cmd_5tuple_filter_remove_filter,
+               (void *)&cmd_5tuple_filter_port_id,
+               (void *)&cmd_5tuple_filter_index,
+               (void *)&cmd_5tuple_filter_index_value,
+               NULL,
+       },
+};
+
+cmdline_parse_token_string_t cmd_5tuple_filter_get_filter =
+       TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
+                               filter, "get_5tuple_filter");
+cmdline_parse_inst_t cmd_get_5tuple_filter = {
+       .f = cmd_5tuple_filter_parsed,
+       .data = NULL,
+       .help_str = "get a 5tuple filter",
+       .tokens = {
+               (void *)&cmd_5tuple_filter_get_filter,
+               (void *)&cmd_5tuple_filter_port_id,
+               (void *)&cmd_5tuple_filter_index,
+               (void *)&cmd_5tuple_filter_index_value,
+               NULL,
+       },
+};
+
+/* *** ADD/REMOVE A flex FILTER *** */
+struct cmd_flex_filter_result {
+       cmdline_fixed_string_t filter;
+       uint8_t port_id;
+       cmdline_fixed_string_t len;
+       uint8_t len_value;
+       cmdline_fixed_string_t bytes;
+       cmdline_fixed_string_t bytes_value;
+       cmdline_fixed_string_t mask;
+       cmdline_fixed_string_t mask_value;
+       cmdline_fixed_string_t priority;
+       uint8_t priority_value;
+       cmdline_fixed_string_t queue;
+       uint16_t queue_id;
+       cmdline_fixed_string_t index;
+       uint16_t index_value;
+};
+
+static int xdigit2val(unsigned char c)
+{
+       int val;
+       if (isdigit(c))
+               val = c - '0';
+       else if (isupper(c))
+               val = c - 'A' + 10;
+       else
+               val = c - 'a' + 10;
+       return val;
+}
+
+static void
+cmd_flex_filter_parsed(void *parsed_result,
+                         __attribute__((unused)) struct cmdline *cl,
+                         __attribute__((unused)) void *data)
+{
+       int ret = 0;
+       struct rte_flex_filter filter;
+       struct cmd_flex_filter_result *res = parsed_result;
+       char *bytes_ptr, *mask_ptr;
+       uint16_t len, i, j;
+       char c;
+       int val, mod = 0;
+       uint32_t dword = 0;
+       uint8_t byte = 0;
+       uint8_t hex = 0;
+
+       if (!strcmp(res->filter, "add_flex_filter")) {
+               if (res->len_value > 128) {
+                       printf("the len exceed the max length 128\n");
+                       return;
+               }
+               memset(&filter, 0, sizeof(struct rte_flex_filter));
+               filter.len = res->len_value;
+               filter.priority = res->priority_value;
+               bytes_ptr = res->bytes_value;
+               mask_ptr = res->mask_value;
+
+               j = 0;
+                /* translate bytes string to uint_32 array. */
+               if (bytes_ptr[0] == '0' && ((bytes_ptr[1] == 'x') ||
+                       (bytes_ptr[1] == 'X')))
+                       bytes_ptr += 2;
+               len = strnlen(bytes_ptr, res->len_value * 2);
+               if (len == 0 || (len % 8 != 0)) {
+                       printf("please check len and bytes input\n");
+                       return;
+               }
+               for (i = 0; i < len; i++) {
+                       c = bytes_ptr[i];
+                       if (isxdigit(c) == 0) {
+                               /* invalid characters. */
+                               printf("invalid input\n");
+                               return;
+                       }
+                       val = xdigit2val(c);
+                       mod = i % 8;
+                       if (i % 2) {
+                               byte |= val;
+                               dword |= byte << (4 * mod - 4);
+                               byte = 0;
+                       } else
+                               byte |= val << 4;
+                       if (mod == 7) {
+                               filter.dwords[j] = dword;
+                               printf("dwords[%d]:%08x ", j, filter.dwords[j]);
+                               j++;
+                               dword = 0;
+                       }
+               }
+               printf("\n");
+                /* translate mask string to uint8_t array. */
+               j = 0;
+               if (mask_ptr[0] == '0' && ((mask_ptr[1] == 'x') ||
+                       (mask_ptr[1] == 'X')))
+                       mask_ptr += 2;
+               len = strnlen(mask_ptr, (res->len_value+3)/4);
+               if (len == 0) {
+                       printf("invalid input\n");
+                       return;
+               }
+               for (i = 0; i < len; i++) {
+                       c = mask_ptr[i];
+                       if (isxdigit(c) == 0) {
+                               /* invalid characters. */
+                               printf("invalid input\n");
+                               return;
+                       }
+                       val = xdigit2val(c);
+                       hex |= (uint8_t)(val & 0x8) >> 3;
+                       hex |= (uint8_t)(val & 0x4) >> 1;
+                       hex |= (uint8_t)(val & 0x2) << 1;
+                       hex |= (uint8_t)(val & 0x1) << 3;
+                       if (i % 2) {
+                               byte |= hex << 4;
+                               filter.mask[j] = byte;
+                               printf("mask[%d]:%02x ", j, filter.mask[j]);
+                               j++;
+                               byte = 0;
+                       } else
+                               byte |= hex;
+                       hex = 0;
+               }
+               printf("\n");
+               printf("call function rte_eth_dev_add_flex_filter: "
+                       "index = %d, queue-id = %d, len = %d, priority = %d\n",
+                       res->index_value, res->queue_id,
+                       filter.len, filter.priority);
+               ret = rte_eth_dev_add_flex_filter(res->port_id, res->index_value,
+                               &filter, res->queue_id);
+
+       } else if (!strcmp(res->filter, "remove_flex_filter"))
+               ret = rte_eth_dev_remove_flex_filter(res->port_id,
+                       res->index_value);
+       else if (!strcmp(res->filter, "get_flex_filter"))
+               get_flex_filter(res->port_id, res->index_value);
+
+       if (ret < 0)
+               printf("flex filter setting error: (%s)\n", strerror(-ret));
+}
+
+cmdline_parse_token_num_t cmd_flex_filter_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_flex_filter_result,
+                               port_id, UINT8);
+cmdline_parse_token_string_t cmd_flex_filter_len =
+       TOKEN_STRING_INITIALIZER(struct cmd_flex_filter_result,
+                               len, "len");
+cmdline_parse_token_num_t cmd_flex_filter_len_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_flex_filter_result,
+                               len_value, UINT8);
+cmdline_parse_token_string_t cmd_flex_filter_bytes =
+       TOKEN_STRING_INITIALIZER(struct cmd_flex_filter_result,
+                               bytes, "bytes");
+cmdline_parse_token_string_t cmd_flex_filter_bytes_value =
+       TOKEN_STRING_INITIALIZER(struct cmd_flex_filter_result,
+                               bytes_value, NULL);
+cmdline_parse_token_string_t cmd_flex_filter_mask =
+       TOKEN_STRING_INITIALIZER(struct cmd_flex_filter_result,
+                               mask, "mask");
+cmdline_parse_token_string_t cmd_flex_filter_mask_value =
+       TOKEN_STRING_INITIALIZER(struct cmd_flex_filter_result,
+                               mask_value, NULL);
+cmdline_parse_token_string_t cmd_flex_filter_priority =
+       TOKEN_STRING_INITIALIZER(struct cmd_flex_filter_result,
+                               priority, "priority");
+cmdline_parse_token_num_t cmd_flex_filter_priority_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_flex_filter_result,
+                               priority_value, UINT8);
+cmdline_parse_token_string_t cmd_flex_filter_queue =
+       TOKEN_STRING_INITIALIZER(struct cmd_flex_filter_result,
+                               queue, "queue");
+cmdline_parse_token_num_t cmd_flex_filter_queue_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_flex_filter_result,
+                               queue_id, UINT16);
+cmdline_parse_token_string_t cmd_flex_filter_index =
+       TOKEN_STRING_INITIALIZER(struct cmd_flex_filter_result,
+                               index, "index");
+cmdline_parse_token_num_t cmd_flex_filter_index_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_flex_filter_result,
+                               index_value, UINT16);
+cmdline_parse_token_string_t cmd_flex_filter_add_filter =
+       TOKEN_STRING_INITIALIZER(struct cmd_flex_filter_result,
+                               filter, "add_flex_filter");
+cmdline_parse_inst_t cmd_add_flex_filter = {
+       .f = cmd_flex_filter_parsed,
+       .data = NULL,
+       .help_str = "add a flex filter",
+       .tokens = {
+               (void *)&cmd_flex_filter_add_filter,
+               (void *)&cmd_flex_filter_port_id,
+               (void *)&cmd_flex_filter_len,
+               (void *)&cmd_flex_filter_len_value,
+               (void *)&cmd_flex_filter_bytes,
+               (void *)&cmd_flex_filter_bytes_value,
+               (void *)&cmd_flex_filter_mask,
+               (void *)&cmd_flex_filter_mask_value,
+               (void *)&cmd_flex_filter_priority,
+               (void *)&cmd_flex_filter_priority_value,
+               (void *)&cmd_flex_filter_queue,
+               (void *)&cmd_flex_filter_queue_id,
+               (void *)&cmd_flex_filter_index,
+               (void *)&cmd_flex_filter_index_value,
+               NULL,
+       },
+};
+
+cmdline_parse_token_string_t cmd_flex_filter_remove_filter =
+       TOKEN_STRING_INITIALIZER(struct cmd_flex_filter_result,
+                               filter, "remove_flex_filter");
+cmdline_parse_inst_t cmd_remove_flex_filter = {
+       .f = cmd_flex_filter_parsed,
+       .data = NULL,
+       .help_str = "remove a flex filter",
+       .tokens = {
+               (void *)&cmd_flex_filter_remove_filter,
+               (void *)&cmd_flex_filter_port_id,
+               (void *)&cmd_flex_filter_index,
+               (void *)&cmd_flex_filter_index_value,
+               NULL,
+       },
+};
+
+cmdline_parse_token_string_t cmd_flex_filter_get_filter =
+       TOKEN_STRING_INITIALIZER(struct cmd_flex_filter_result,
+                               filter, "get_flex_filter");
+cmdline_parse_inst_t cmd_get_flex_filter = {
+       .f = cmd_flex_filter_parsed,
+       .data = NULL,
+       .help_str = "get a flex filter",
+       .tokens = {
+               (void *)&cmd_flex_filter_get_filter,
+               (void *)&cmd_flex_filter_port_id,
+               (void *)&cmd_flex_filter_index,
+               (void *)&cmd_flex_filter_index_value,
+               NULL,
+       },
+};
+
+/* ******************************************************************************** */
+
+/* list of instructions */
+cmdline_parse_ctx_t main_ctx[] = {
+       (cmdline_parse_inst_t *)&cmd_help_brief,
+       (cmdline_parse_inst_t *)&cmd_help_long,
+       (cmdline_parse_inst_t *)&cmd_quit,
+       (cmdline_parse_inst_t *)&cmd_showport,
+       (cmdline_parse_inst_t *)&cmd_showportall,
+       (cmdline_parse_inst_t *)&cmd_showcfg,
+       (cmdline_parse_inst_t *)&cmd_start,
+       (cmdline_parse_inst_t *)&cmd_start_tx_first,
+       (cmdline_parse_inst_t *)&cmd_set_link_up,
+       (cmdline_parse_inst_t *)&cmd_set_link_down,
+       (cmdline_parse_inst_t *)&cmd_reset,
+       (cmdline_parse_inst_t *)&cmd_set_numbers,
+       (cmdline_parse_inst_t *)&cmd_set_txpkts,
+       (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,
+       (cmdline_parse_inst_t *)&cmd_set_bypass_timeout,
+       (cmdline_parse_inst_t *)&cmd_show_bypass_config,
+#endif
+       (cmdline_parse_inst_t *)&cmd_vlan_offload,
+       (cmdline_parse_inst_t *)&cmd_vlan_tpid,
+       (cmdline_parse_inst_t *)&cmd_rx_vlan_filter_all,
+       (cmdline_parse_inst_t *)&cmd_rx_vlan_filter,
+       (cmdline_parse_inst_t *)&cmd_tx_vlan_set,
+       (cmdline_parse_inst_t *)&cmd_tx_vlan_reset,
+       (cmdline_parse_inst_t *)&cmd_tx_vlan_set_pvid,
+       (cmdline_parse_inst_t *)&cmd_tx_cksum_set,
+       (cmdline_parse_inst_t *)&cmd_link_flow_control_set,
+       (cmdline_parse_inst_t *)&cmd_priority_flow_control_set,
+       (cmdline_parse_inst_t *)&cmd_config_dcb,
+       (cmdline_parse_inst_t *)&cmd_read_reg,
+       (cmdline_parse_inst_t *)&cmd_read_reg_bit_field,
+       (cmdline_parse_inst_t *)&cmd_read_reg_bit,
+       (cmdline_parse_inst_t *)&cmd_write_reg,
+       (cmdline_parse_inst_t *)&cmd_write_reg_bit_field,
+       (cmdline_parse_inst_t *)&cmd_write_reg_bit,
+       (cmdline_parse_inst_t *)&cmd_read_rxd_txd,
+       (cmdline_parse_inst_t *)&cmd_add_signature_filter,
+       (cmdline_parse_inst_t *)&cmd_upd_signature_filter,
+       (cmdline_parse_inst_t *)&cmd_rm_signature_filter,
+       (cmdline_parse_inst_t *)&cmd_add_perfect_filter,
+       (cmdline_parse_inst_t *)&cmd_upd_perfect_filter,
+       (cmdline_parse_inst_t *)&cmd_rm_perfect_filter,
+       (cmdline_parse_inst_t *)&cmd_set_masks_filter,
+       (cmdline_parse_inst_t *)&cmd_set_ipv6_masks_filter,
+       (cmdline_parse_inst_t *)&cmd_stop,
+       (cmdline_parse_inst_t *)&cmd_mac_addr,
+       (cmdline_parse_inst_t *)&cmd_set_qmap,
+       (cmdline_parse_inst_t *)&cmd_operate_port,
+       (cmdline_parse_inst_t *)&cmd_operate_specific_port,
+       (cmdline_parse_inst_t *)&cmd_config_speed_all,
+       (cmdline_parse_inst_t *)&cmd_config_speed_specific,
+       (cmdline_parse_inst_t *)&cmd_config_rx_tx,
+       (cmdline_parse_inst_t *)&cmd_config_mtu,
+       (cmdline_parse_inst_t *)&cmd_config_max_pkt_len,
+       (cmdline_parse_inst_t *)&cmd_config_rx_mode_flag,
+       (cmdline_parse_inst_t *)&cmd_config_rss,
+       (cmdline_parse_inst_t *)&cmd_config_rss_reta,
+       (cmdline_parse_inst_t *)&cmd_showport_reta,
+       (cmdline_parse_inst_t *)&cmd_config_burst,
+       (cmdline_parse_inst_t *)&cmd_config_thresh,
+       (cmdline_parse_inst_t *)&cmd_config_threshold,
+       (cmdline_parse_inst_t *)&cmd_set_vf_rxmode,
+       (cmdline_parse_inst_t *)&cmd_set_uc_hash_filter,
+       (cmdline_parse_inst_t *)&cmd_set_uc_all_hash_filter,
+       (cmdline_parse_inst_t *)&cmd_vf_mac_addr_filter ,
+       (cmdline_parse_inst_t *)&cmd_set_vf_traffic,
+       (cmdline_parse_inst_t *)&cmd_vf_rxvlan_filter,
+       (cmdline_parse_inst_t *)&cmd_queue_rate_limit,
+       (cmdline_parse_inst_t *)&cmd_vf_rate_limit,
+       (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,
+       (cmdline_parse_inst_t *)&cmd_add_ethertype_filter,
+       (cmdline_parse_inst_t *)&cmd_remove_ethertype_filter,
+       (cmdline_parse_inst_t *)&cmd_get_ethertype_filter,
+       (cmdline_parse_inst_t *)&cmd_add_syn_filter,
+       (cmdline_parse_inst_t *)&cmd_remove_syn_filter,
+       (cmdline_parse_inst_t *)&cmd_get_syn_filter,
+       (cmdline_parse_inst_t *)&cmd_add_2tuple_filter,
+       (cmdline_parse_inst_t *)&cmd_remove_2tuple_filter,
+       (cmdline_parse_inst_t *)&cmd_get_2tuple_filter,
+       (cmdline_parse_inst_t *)&cmd_add_5tuple_filter,
+       (cmdline_parse_inst_t *)&cmd_remove_5tuple_filter,
+       (cmdline_parse_inst_t *)&cmd_get_5tuple_filter,
+       (cmdline_parse_inst_t *)&cmd_add_flex_filter,
+       (cmdline_parse_inst_t *)&cmd_remove_flex_filter,
+       (cmdline_parse_inst_t *)&cmd_get_flex_filter,
+       NULL,
+};
+
+/* prompt function, called from main on MASTER lcore */
+void
+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;
+       }
+       cmdline_interact(cl);
+       cmdline_stdin_exit(cl);
+}
+
+static void
+cmd_reconfig_device_queue(portid_t id, uint8_t dev, uint8_t queue)
+{
+       if (id < nb_ports) {
+               /* check if need_reconfig has been set to 1 */
+               if (ports[id].need_reconfig == 0)
+                       ports[id].need_reconfig = dev;
+               /* check if need_reconfig_queues has been set to 1 */
+               if (ports[id].need_reconfig_queues == 0)
+                       ports[id].need_reconfig_queues = queue;
+       } else {
+               portid_t pid;
+
+               for (pid = 0; pid < nb_ports; pid++) {
+                       /* check if need_reconfig has been set to 1 */
+                       if (ports[pid].need_reconfig == 0)
+                               ports[pid].need_reconfig = dev;
+                       /* check if need_reconfig_queues has been set to 1 */
+                       if (ports[pid].need_reconfig_queues == 0)
+                               ports[pid].need_reconfig_queues = queue;
+               }
+       }
+}
+
+#ifdef RTE_NIC_BYPASS
+uint8_t
+bypass_is_supported(portid_t port_id)
+{
+       struct rte_port   *port;
+       struct rte_pci_id *pci_id;
+
+       if (port_id >= nb_ports) {
+               printf("\tPort id must be less than %d.\n", nb_ports);
+               return 0;
+       }
+
+       /* Get the device id. */
+       port    = &ports[port_id];
+       pci_id = &port->dev_info.pci_dev->id;
+
+       /* Check if NIC supports bypass. */
+       if (pci_id->device_id == IXGBE_DEV_ID_82599_BYPASS) {
+               return 1;
+       }
+       else {
+               printf("\tBypass not supported for port_id = %d.\n", port_id);
+               return 0;
+       }
+}
+#endif