app/testpmd: add csum parse-tunnel command
[dpdk.git] / app / test-pmd / cmdline.c
index 345be11..7d45439 100644 (file)
@@ -59,6 +59,7 @@
 #include <rte_cycles.h>
 #include <rte_memory.h>
 #include <rte_memzone.h>
+#include <rte_malloc.h>
 #include <rte_launch.h>
 #include <rte_tailq.h>
 #include <rte_eal.h>
@@ -74,6 +75,7 @@
 #include <rte_ethdev.h>
 #include <rte_string_fns.h>
 #include <rte_devargs.h>
+#include <rte_eth_ctrl.h>
 
 #include <cmdline_rdline.h>
 #include <cmdline_parse.h>
@@ -171,7 +173,7 @@ static void cmd_help_long_parsed(void *parsed_result,
                        " statistics.\n\n"
 
                        "quit\n"
-                       "    Quit to prompt in Linux and reboot on Baremetal.\n\n"
+                       "    Quit to prompt.\n\n"
                );
        }
 
@@ -183,14 +185,19 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "Display:\n"
                        "--------\n\n"
 
-                       "show port (info|stats|fdir|stat_qmap) (port_id|all)\n"
+                       "show port (info|stats|xstats|fdir|stat_qmap) (port_id|all)\n"
                        "    Display information for port_id, or all.\n\n"
 
+                       "show port X rss reta (size) (mask0,mask1,...)\n"
+                       "    Display the rss redirection table entry indicated"
+                       " by masks on port X. size is used to indicate the"
+                       " hardware supported reta size\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 port (info|stats|xstats|fdir|stat_qmap) (port_id|all)\n"
                        "    Clear information for port_id, or all.\n\n"
 
                        "show config (rxtx|cores|fwd)\n"
@@ -285,6 +292,20 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "    Set the outer VLAN TPID for Packet Filtering on"
                        " a port\n\n"
 
+                       "tunnel_filter add (port_id) (outer_mac) (inner_mac) (ip_addr) "
+                       "(inner_vlan) (tunnel_type) (filter_type) (tenant_id) (queue_id)\n"
+                       "   add a tunnel filter of a port.\n\n"
+
+                       "tunnel_filter rm (port_id) (outer_mac) (inner_mac) (ip_addr) "
+                       "(inner_vlan) (tunnel_type) (filter_type) (tenant_id) (queue_id)\n"
+                       "   remove a tunnel filter of a port.\n\n"
+
+                       "rx_vxlan_port add (udp_port) (port_id)\n"
+                       "    Add an UDP port for VXLAN packet filter on a port\n\n"
+
+                       "rx_vxlan_port rm (udp_port) (port_id)\n"
+                       "    Remove an UDP port for VXLAN packet filter 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"
@@ -296,15 +317,33 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "    Disable hardware insertion of a VLAN header in"
                        " packets sent on a port.\n\n"
 
-                       "tx_checksum set mask (port_id)\n"
-                       "    Enable hardware insertion of checksum offload with"
-                       " the 4-bit mask, 0~0xf, in packets sent on a port.\n"
-                       "        bit 0 - insert ip   checksum offload if set\n"
-                       "        bit 1 - insert udp  checksum offload if set\n"
-                       "        bit 2 - insert tcp  checksum offload if set\n"
-                       "        bit 3 - insert sctp checksum offload if set\n"
+                       "csum set (ip|udp|tcp|sctp|vxlan) (hw|sw) (port_id)\n"
+                       "    Select hardware or software calculation of the"
+                       " checksum with when transmitting a packet using the"
+                       " csum forward engine.\n"
+                       "    ip|udp|tcp|sctp always concern the inner layer.\n"
+                       "    vxlan concerns the outer IP and UDP layer (in"
+                       " case the packet is recognized as a vxlan packet by"
+                       " the forward engine)\n"
+                       "    Please check the NIC datasheet for HW limits.\n\n"
+
+                       "csum parse-tunnel (on|off) (tx_port_id)\n"
+                       "    If disabled, treat tunnel packets as non-tunneled"
+                       " packets (treat inner headers as payload). The port\n"
+                       "    argument is the port used for TX in csum forward"
+                       " engine.\n\n"
+
+                       "csum show (port_id)\n"
+                       "    Display tx checksum offload configuration\n\n"
+
+                       "tso set (segsize) (portid)\n"
+                       "    Enable TCP Segmentation Offload in csum forward"
+                       " engine.\n"
                        "    Please check the NIC datasheet for HW limits.\n\n"
 
+                       "tso show (portid)"
+                       "    Display the status of TCP Segmentation Offload.\n\n"
+
                        "set fwd (%s)\n"
                        "    Set packet forwarding mode.\n\n"
 
@@ -351,9 +390,14 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "    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"
+                       "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) (mac_addr)"
+                       " (exact-mac#exact-mac-vlan#hashmac|hashmac-vlan) on|off\n"
+                       "   Add/Remove unicast or multicast MAC addr filter"
+                       " for a VF.\n\n"
+
                        "set port (port_id) vf (vf_id) rxmode (AUPE|ROPE|BAM"
                        "|MPE) (on|off)\n"
                        "    AUPE:accepts untagged VLAN;"
@@ -439,7 +483,15 @@ static void cmd_help_long_parsed(void *parsed_result,
 
                        "set bonding xmit_balance_policy (port_id) (l2|l23|l34)\n"
                        "       Set the transmit balance policy for bonded device running in balance mode.\n\n"
+
+                       "set bonding mon_period (port_id) (value)\n"
+                       "       Set the bonding link status monitoring polling period in ms.\n\n"
 #endif
+                       "set link-up port (port_id)\n"
+                       "       Set link up for a port.\n\n"
+
+                       "set link-down port (port_id)\n"
+                       "       Set link down for a port.\n\n"
 
                        , list_pkt_forwarding_modes()
                );
@@ -527,7 +579,8 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "port close (port_id|all)\n"
                        "    Close all ports or port_id.\n\n"
 
-                       "port config (port_id|all) speed (10|100|1000|10000|auto)"
+                       "port config (port_id|all)"
+                       " speed (10|100|1000|10000|40000|auto)"
                        " duplex (half|full|auto)\n"
                        "    Set speed and duplex for all ports or port_id\n\n"
 
@@ -565,6 +618,10 @@ static void cmd_help_long_parsed(void *parsed_result,
                        " tx rs bit threshold.\n\n"
                        "port config mtu X value\n"
                        "    Set the MTU of port X to a given value\n\n"
+
+                       "port (port_id) (rxq|txq) (queue_id) (start|stop)\n"
+                       "    Start/stop a rx/tx queue of port X. Only take effect"
+                       " when port X is started\n"
                );
        }
 
@@ -604,15 +661,10 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "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"
+                       "ethertype_filter (port_id) (add|del)"
+                       " (mac_addr|mac_ignr) (mac_address) ethertype"
+                       " (ether_type) (drop|fwd) queue (queue_id)\n"
+                       "    Add/Del an 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)"
@@ -655,6 +707,56 @@ static void cmd_help_long_parsed(void *parsed_result,
 
                        "get_flex_filter (port_id) index (idx)\n"
                        "    get info of a flex filter.\n\n"
+
+                       "flow_director_filter (port_id) (add|del)"
+                       " flow (ip4|ip4-frag|ip6|ip6-frag)"
+                       " src (src_ip_address) dst (dst_ip_address)"
+                       " flexbytes (flexbytes_value)"
+                       " (drop|fwd) queue (queue_id) fd_id (fd_id_value)\n"
+                       "    Add/Del an IP type flow director filter.\n\n"
+
+                       "flow_director_filter (port_id) (add|del)"
+                       " flow (udp4|tcp4|udp6|tcp6)"
+                       " src (src_ip_address) (src_port)"
+                       " dst (dst_ip_address) (dst_port)"
+                       " flexbytes (flexbytes_value)"
+                       " (drop|fwd) queue (queue_id) fd_id (fd_id_value)\n"
+                       "    Add/Del an UDP/TCP type flow director filter.\n\n"
+
+                       "flow_director_filter (port_id) (add|del)"
+                       " flow (sctp4|sctp6)"
+                       " src (src_ip_address) dst (dst_ip_address)"
+                       " tag (verification_tag)"
+                       " flexbytes (flexbytes_value) (drop|fwd)"
+                       " queue (queue_id) fd_id (fd_id_value)\n"
+                       "    Add/Del a SCTP type flow director filter.\n\n"
+
+                       "flush_flow_director (port_id)\n"
+                       "    Flush all flow director entries of a device.\n\n"
+
+                       "flow_director_flex_mask (port_id)"
+                       " flow (ip4|ip4-frag|tcp4|udp4|sctp4|ip6|ip6-frag|tcp6|udp6|sctp6|all)"
+                       " (mask)\n"
+                       "    Configure mask of flex payload.\n\n"
+
+                       "flow_director_flex_payload (port_id)"
+                       " (l2|l3|l4) (config)\n"
+                       "    Configure flex payload selection.\n\n"
+
+                       "get_sym_hash_ena_per_port (port_id)\n"
+                       "    get symmetric hash enable configuration per port.\n\n"
+
+                       "set_sym_hash_ena_per_port (port_id) (enable|disable)\n"
+                       "    set symmetric hash enable configuration per port"
+                       " to enable or disable.\n\n"
+
+                       "get_hash_global_config (port_id)\n"
+                       "    Get the global configurations of hash filters.\n\n"
+
+                       "set_hash_global_config (port_id) (toeplitz|simple_xor|default)"
+                       " (ip4|ip4-frag|tcp4|udp4|#sctp4|ip6|ip6-frag|tcp6|udp6|sctp6)"
+                       " (enable|disable)\n"
+                       "    Set the global configurations of hash filters.\n\n"
                );
        }
 }
@@ -801,7 +903,9 @@ cmd_config_speed_all_parsed(void *parsed_result,
        else if (!strcmp(res->value1, "1000"))
                link_speed = ETH_LINK_SPEED_1000;
        else if (!strcmp(res->value1, "10000"))
-               link_speed = ETH_LINK_SPEED_10000;
+               link_speed = ETH_LINK_SPEED_10G;
+       else if (!strcmp(res->value1, "40000"))
+               link_speed = ETH_LINK_SPEED_40G;
        else if (!strcmp(res->value1, "auto"))
                link_speed = ETH_LINK_SPEED_AUTONEG;
        else {
@@ -839,7 +943,7 @@ cmdline_parse_token_string_t cmd_config_speed_all_item1 =
        TOKEN_STRING_INITIALIZER(struct cmd_config_speed_all, item1, "speed");
 cmdline_parse_token_string_t cmd_config_speed_all_value1 =
        TOKEN_STRING_INITIALIZER(struct cmd_config_speed_all, value1,
-                                               "10#100#1000#10000#auto");
+                                               "10#100#1000#10000#40000#auto");
 cmdline_parse_token_string_t cmd_config_speed_all_item2 =
        TOKEN_STRING_INITIALIZER(struct cmd_config_speed_all, item2, "duplex");
 cmdline_parse_token_string_t cmd_config_speed_all_value2 =
@@ -849,7 +953,7 @@ cmdline_parse_token_string_t cmd_config_speed_all_value2 =
 cmdline_parse_inst_t cmd_config_speed_all = {
        .f = cmd_config_speed_all_parsed,
        .data = NULL,
-       .help_str = "port config all speed 10|100|1000|10000|auto duplex "
+       .help_str = "port config all speed 10|100|1000|10000|40000|auto duplex "
                                                        "half|full|auto",
        .tokens = {
                (void *)&cmd_config_speed_all_port,
@@ -901,6 +1005,8 @@ cmd_config_speed_specific_parsed(void *parsed_result,
                link_speed = ETH_LINK_SPEED_1000;
        else if (!strcmp(res->value1, "10000"))
                link_speed = ETH_LINK_SPEED_10000;
+       else if (!strcmp(res->value1, "40000"))
+               link_speed = ETH_LINK_SPEED_40G;
        else if (!strcmp(res->value1, "auto"))
                link_speed = ETH_LINK_SPEED_AUTONEG;
        else {
@@ -939,7 +1045,7 @@ cmdline_parse_token_string_t cmd_config_speed_specific_item1 =
                                                                "speed");
 cmdline_parse_token_string_t cmd_config_speed_specific_value1 =
        TOKEN_STRING_INITIALIZER(struct cmd_config_speed_specific, value1,
-                                               "10#100#1000#10000#auto");
+                                               "10#100#1000#10000#40000#auto");
 cmdline_parse_token_string_t cmd_config_speed_specific_item2 =
        TOKEN_STRING_INITIALIZER(struct cmd_config_speed_specific, item2,
                                                                "duplex");
@@ -950,7 +1056,7 @@ cmdline_parse_token_string_t cmd_config_speed_specific_value2 =
 cmdline_parse_inst_t cmd_config_speed_specific = {
        .f = cmd_config_speed_specific_parsed,
        .data = NULL,
-       .help_str = "port config X speed 10|100|1000|10000|auto duplex "
+       .help_str = "port config X speed 10|100|1000|10000|40000|auto duplex "
                                                        "half|full|auto",
        .tokens = {
                (void *)&cmd_config_speed_specific_port,
@@ -1425,6 +1531,100 @@ cmdline_parse_inst_t cmd_config_rss_hash_key = {
        },
 };
 
+/* *** configure port rxq/txq start/stop *** */
+struct cmd_config_rxtx_queue {
+       cmdline_fixed_string_t port;
+       uint8_t portid;
+       cmdline_fixed_string_t rxtxq;
+       uint16_t qid;
+       cmdline_fixed_string_t opname;
+};
+
+static void
+cmd_config_rxtx_queue_parsed(void *parsed_result,
+                       __attribute__((unused)) struct cmdline *cl,
+                       __attribute__((unused)) void *data)
+{
+       struct cmd_config_rxtx_queue *res = parsed_result;
+       uint8_t isrx;
+       uint8_t isstart;
+       int ret = 0;
+
+       if (test_done == 0) {
+               printf("Please stop forwarding first\n");
+               return;
+       }
+
+       if (port_id_is_invalid(res->portid))
+               return;
+
+       if (port_is_started(res->portid) != 1) {
+               printf("Please start port %u first\n", res->portid);
+               return;
+       }
+
+       if (!strcmp(res->rxtxq, "rxq"))
+               isrx = 1;
+       else if (!strcmp(res->rxtxq, "txq"))
+               isrx = 0;
+       else {
+               printf("Unknown parameter\n");
+               return;
+       }
+
+       if (isrx && rx_queue_id_is_invalid(res->qid))
+               return;
+       else if (!isrx && tx_queue_id_is_invalid(res->qid))
+               return;
+
+       if (!strcmp(res->opname, "start"))
+               isstart = 1;
+       else if (!strcmp(res->opname, "stop"))
+               isstart = 0;
+       else {
+               printf("Unknown parameter\n");
+               return;
+       }
+
+       if (isstart && isrx)
+               ret = rte_eth_dev_rx_queue_start(res->portid, res->qid);
+       else if (!isstart && isrx)
+               ret = rte_eth_dev_rx_queue_stop(res->portid, res->qid);
+       else if (isstart && !isrx)
+               ret = rte_eth_dev_tx_queue_start(res->portid, res->qid);
+       else
+               ret = rte_eth_dev_tx_queue_stop(res->portid, res->qid);
+
+       if (ret == -ENOTSUP)
+               printf("Function not supported in PMD driver\n");
+}
+
+cmdline_parse_token_string_t cmd_config_rxtx_queue_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_queue, port, "port");
+cmdline_parse_token_num_t cmd_config_rxtx_queue_portid =
+       TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_queue, portid, UINT8);
+cmdline_parse_token_string_t cmd_config_rxtx_queue_rxtxq =
+       TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_queue, rxtxq, "rxq#txq");
+cmdline_parse_token_num_t cmd_config_rxtx_queue_qid =
+       TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_queue, qid, UINT16);
+cmdline_parse_token_string_t cmd_config_rxtx_queue_opname =
+       TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_queue, opname,
+                                               "start#stop");
+
+cmdline_parse_inst_t cmd_config_rxtx_queue = {
+       .f = cmd_config_rxtx_queue_parsed,
+       .data = NULL,
+       .help_str = "port X rxq|txq ID start|stop",
+       .tokens = {
+               (void *)&cmd_config_speed_all_port,
+               (void *)&cmd_config_rxtx_queue_portid,
+               (void *)&cmd_config_rxtx_queue_rxtxq,
+               (void *)&cmd_config_rxtx_queue_qid,
+               (void *)&cmd_config_rxtx_queue_opname,
+               NULL,
+       },
+};
+
 /* *** Configure RSS RETA *** */
 struct cmd_config_rss_reta {
        cmdline_fixed_string_t port;
@@ -1436,11 +1636,13 @@ struct cmd_config_rss_reta {
 };
 
 static int
-parse_reta_config(const char *str, struct rte_eth_rss_reta *reta_conf)
+parse_reta_config(const char *str,
+                 struct rte_eth_rss_reta_entry64 *reta_conf,
+                 uint16_t nb_entries)
 {
        int i;
        unsigned size;
-       uint8_t hash_index;
+       uint16_t hash_index, idx, shift;
        uint8_t nb_queue;
        char s[256];
        const char *p, *p0 = str;
@@ -1468,24 +1670,23 @@ parse_reta_config(const char *str, struct rte_eth_rss_reta *reta_conf)
                for (i = 0; i < _NUM_FLD; i++) {
                        errno = 0;
                        int_fld[i] = strtoul(str_fld[i], &end, 0);
-                       if (errno != 0 || end == str_fld[i] || int_fld[i] > 255)
+                       if (errno != 0 || end == str_fld[i] ||
+                                       int_fld[i] > 65535)
                                return -1;
                }
 
-               hash_index = (uint8_t)int_fld[FLD_HASH_INDEX];
+               hash_index = (uint16_t)int_fld[FLD_HASH_INDEX];
                nb_queue = (uint8_t)int_fld[FLD_QUEUE];
 
-               if (hash_index >= ETH_RSS_RETA_NUM_ENTRIES) {
-                       printf("Invalid RETA hash index=%d",hash_index);
+               if (hash_index >= nb_entries) {
+                       printf("Invalid RETA hash index=%d\n", hash_index);
                        return -1;
                }
 
-               if (hash_index < ETH_RSS_RETA_NUM_ENTRIES/2)
-                       reta_conf->mask_lo |= (1ULL << hash_index);
-               else
-                       reta_conf->mask_hi |= (1ULL << (hash_index - ETH_RSS_RETA_NUM_ENTRIES/2));
-
-               reta_conf->reta[hash_index] = nb_queue;
+               idx = hash_index / RTE_RETA_GROUP_SIZE;
+               shift = hash_index % RTE_RETA_GROUP_SIZE;
+               reta_conf[idx].mask |= (1ULL << shift);
+               reta_conf[idx].reta[shift] = nb_queue;
        }
 
        return 0;
@@ -1493,22 +1694,42 @@ parse_reta_config(const char *str, struct rte_eth_rss_reta *reta_conf)
 
 static void
 cmd_set_rss_reta_parsed(void *parsed_result,
-                               __attribute__((unused)) struct cmdline *cl,
-                               __attribute__((unused)) void *data)
+                       __attribute__((unused)) struct cmdline *cl,
+                       __attribute__((unused)) void *data)
 {
        int ret;
-       struct rte_eth_rss_reta reta_conf;
+       struct rte_eth_dev_info dev_info;
+       struct rte_eth_rss_reta_entry64 reta_conf[8];
        struct cmd_config_rss_reta *res = parsed_result;
 
-       memset(&reta_conf,0,sizeof(struct rte_eth_rss_reta));
+       memset(&dev_info, 0, sizeof(dev_info));
+       rte_eth_dev_info_get(res->port_id, &dev_info);
+       if (dev_info.reta_size == 0) {
+               printf("Redirection table size is 0 which is "
+                                       "invalid for RSS\n");
+               return;
+       } else
+               printf("The reta size of port %d is %u\n",
+                       res->port_id, dev_info.reta_size);
+       if (dev_info.reta_size > ETH_RSS_RETA_SIZE_512) {
+               printf("Currently do not support more than %u entries of "
+                       "redirection table\n", ETH_RSS_RETA_SIZE_512);
+               return;
+       }
+
+       memset(reta_conf, 0, sizeof(reta_conf));
        if (!strcmp(res->list_name, "reta")) {
-               if (parse_reta_config(res->list_of_items, &reta_conf)) {
-                       printf("Invalid RSS Redirection Table config entered\n");
+               if (parse_reta_config(res->list_of_items, reta_conf,
+                                               dev_info.reta_size)) {
+                       printf("Invalid RSS Redirection Table "
+                                       "config entered\n");
                        return;
                }
-               ret = rte_eth_dev_rss_reta_update(res->port_id, &reta_conf);
+               ret = rte_eth_dev_rss_reta_update(res->port_id,
+                               reta_conf, dev_info.reta_size);
                if (ret != 0)
-                       printf("Bad redirection table parameter, return code = %d \n",ret);
+                       printf("Bad redirection table parameter, "
+                                       "return code = %d \n", ret);
        }
 }
 
@@ -1547,56 +1768,103 @@ struct cmd_showport_reta {
        uint8_t port_id;
        cmdline_fixed_string_t rss;
        cmdline_fixed_string_t reta;
-       uint64_t mask_lo;
-       uint64_t mask_hi;
+       uint16_t size;
+       cmdline_fixed_string_t list_of_items;
 };
 
-static void cmd_showport_reta_parsed(void *parsed_result,
-                               __attribute__((unused)) struct cmdline *cl,
-                               __attribute__((unused)) void *data)
+static int
+showport_parse_reta_config(struct rte_eth_rss_reta_entry64 *conf,
+                          uint16_t nb_entries,
+                          char *str)
 {
-       struct cmd_showport_reta *res = parsed_result;
-       struct rte_eth_rss_reta reta_conf;
+       uint32_t size;
+       const char *p, *p0 = str;
+       char s[256];
+       char *end;
+       char *str_fld[8];
+       uint16_t i, num = nb_entries / RTE_RETA_GROUP_SIZE;
+       int ret;
 
-       if ((res->mask_lo == 0) && (res->mask_hi == 0)) {
-               printf("Invalid RSS Redirection Table config entered\n");
-               return;
+       p = strchr(p0, '(');
+       if (p == NULL)
+               return -1;
+       p++;
+       p0 = strchr(p, ')');
+       if (p0 == NULL)
+               return -1;
+       size = p0 - p;
+       if (size >= sizeof(s)) {
+               printf("The string size exceeds the internal buffer size\n");
+               return -1;
+       }
+       snprintf(s, sizeof(s), "%.*s", size, p);
+       ret = rte_strsplit(s, sizeof(s), str_fld, num, ',');
+       if (ret <= 0 || ret != num) {
+               printf("The bits of masks do not match the number of "
+                                       "reta entries: %u\n", num);
+               return -1;
        }
+       for (i = 0; i < ret; i++)
+               conf[i].mask = (uint64_t)strtoul(str_fld[i], &end, 0);
+
+       return 0;
+}
 
-       reta_conf.mask_lo = res->mask_lo;
-       reta_conf.mask_hi = res->mask_hi;
+static void
+cmd_showport_reta_parsed(void *parsed_result,
+                        __attribute__((unused)) struct cmdline *cl,
+                        __attribute__((unused)) void *data)
+{
+       struct cmd_showport_reta *res = parsed_result;
+       struct rte_eth_rss_reta_entry64 reta_conf[8];
+       struct rte_eth_dev_info dev_info;
+
+       memset(&dev_info, 0, sizeof(dev_info));
+       rte_eth_dev_info_get(res->port_id, &dev_info);
+       if (dev_info.reta_size == 0 || res->size != dev_info.reta_size ||
+                               res->size > ETH_RSS_RETA_SIZE_512) {
+               printf("Invalid redirection table size: %u\n", res->size);
+               return;
+       }
 
-       port_rss_reta_info(res->port_id,&reta_conf);
+       memset(reta_conf, 0, sizeof(reta_conf));
+       if (showport_parse_reta_config(reta_conf, res->size,
+                               res->list_of_items) < 0) {
+               printf("Invalid string: %s for reta masks\n",
+                                       res->list_of_items);
+               return;
+       }
+       port_rss_reta_info(res->port_id, reta_conf, res->size);
 }
 
 cmdline_parse_token_string_t cmd_showport_reta_show =
-        TOKEN_STRING_INITIALIZER(struct  cmd_showport_reta, show, "show");
+       TOKEN_STRING_INITIALIZER(struct  cmd_showport_reta, show, "show");
 cmdline_parse_token_string_t cmd_showport_reta_port =
-        TOKEN_STRING_INITIALIZER(struct  cmd_showport_reta, port, "port");
+       TOKEN_STRING_INITIALIZER(struct  cmd_showport_reta, port, "port");
 cmdline_parse_token_num_t cmd_showport_reta_port_id =
-        TOKEN_NUM_INITIALIZER(struct cmd_showport_reta, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_showport_reta, port_id, UINT8);
 cmdline_parse_token_string_t cmd_showport_reta_rss =
-        TOKEN_STRING_INITIALIZER(struct cmd_showport_reta, rss, "rss");
+       TOKEN_STRING_INITIALIZER(struct cmd_showport_reta, rss, "rss");
 cmdline_parse_token_string_t cmd_showport_reta_reta =
-        TOKEN_STRING_INITIALIZER(struct cmd_showport_reta, reta, "reta");
-cmdline_parse_token_num_t cmd_showport_reta_mask_lo =
-        TOKEN_NUM_INITIALIZER(struct cmd_showport_reta,mask_lo,UINT64);
-cmdline_parse_token_num_t cmd_showport_reta_mask_hi =
-       TOKEN_NUM_INITIALIZER(struct cmd_showport_reta,mask_hi,UINT64);
+       TOKEN_STRING_INITIALIZER(struct cmd_showport_reta, reta, "reta");
+cmdline_parse_token_num_t cmd_showport_reta_size =
+       TOKEN_NUM_INITIALIZER(struct cmd_showport_reta, size, UINT16);
+cmdline_parse_token_string_t cmd_showport_reta_list_of_items =
+       TOKEN_STRING_INITIALIZER(struct cmd_showport_reta,
+                                       list_of_items, NULL);
 
 cmdline_parse_inst_t cmd_showport_reta = {
        .f = cmd_showport_reta_parsed,
        .data = NULL,
-       .help_str = "show port X rss reta mask_lo mask_hi (X = port number)\n\
-                       (mask_lo and mask_hi is UINT64)",
+       .help_str = "show port X rss reta (size) (mask0,mask1,...)",
        .tokens = {
                (void *)&cmd_showport_reta_show,
                (void *)&cmd_showport_reta_port,
                (void *)&cmd_showport_reta_port_id,
                (void *)&cmd_showport_reta_rss,
                (void *)&cmd_showport_reta_reta,
-               (void *)&cmd_showport_reta_mask_lo,
-               (void *)&cmd_showport_reta_mask_hi,
+               (void *)&cmd_showport_reta_size,
+               (void *)&cmd_showport_reta_list_of_items,
                NULL,
        },
 };
@@ -1835,17 +2103,17 @@ cmd_config_thresh_parsed(void *parsed_result,
        }
 
        if (!strcmp(res->name, "txpt"))
-               tx_thresh.pthresh = res->value;
+               tx_pthresh = res->value;
        else if(!strcmp(res->name, "txht"))
-               tx_thresh.hthresh = res->value;
+               tx_hthresh = res->value;
        else if(!strcmp(res->name, "txwt"))
-               tx_thresh.wthresh = res->value;
+               tx_wthresh = res->value;
        else if(!strcmp(res->name, "rxpt"))
-               rx_thresh.pthresh = res->value;
+               rx_pthresh = res->value;
        else if(!strcmp(res->name, "rxht"))
-               rx_thresh.hthresh = res->value;
+               rx_hthresh = res->value;
        else if(!strcmp(res->name, "rxwt"))
-               rx_thresh.wthresh = res->value;
+               rx_wthresh = res->value;
        else {
                printf("Unknown parameter\n");
                return;
@@ -1973,7 +2241,7 @@ cmdline_parse_inst_t cmd_stop = {
 
 /* *** SET CORELIST and PORTLIST CONFIGURATION *** */
 
-static unsigned int
+unsigned int
 parse_item_list(char* str, const char* item_name, unsigned int max_items,
                unsigned int *parsed_items, int check_unique_values)
 {
@@ -2054,6 +2322,11 @@ static void cmd_set_list_parsed(void *parsed_result,
        } parsed_items;
        unsigned int nb_item;
 
+       if (test_done == 0) {
+               printf("Please stop forwarding first\n");
+               return;
+       }
+
        res = parsed_result;
        if (!strcmp(res->list_name, "corelist")) {
                nb_item = parse_item_list(res->list_of_items, "core",
@@ -2108,6 +2381,10 @@ static void cmd_set_mask_parsed(void *parsed_result,
 {
        struct cmd_setmask_result *res = parsed_result;
 
+       if (test_done == 0) {
+               printf("Please stop forwarding first\n");
+               return;
+       }
        if (!strcmp(res->mask, "coremask"))
                set_fwd_lcores_mask(res->hexavalue);
        else if (!strcmp(res->mask, "portmask"))
@@ -2612,47 +2889,280 @@ cmdline_parse_inst_t cmd_tx_vlan_reset = {
 
 
 /* *** ENABLE HARDWARE INSERTION OF CHECKSUM IN TX PACKETS *** */
-struct cmd_tx_cksum_set_result {
-       cmdline_fixed_string_t tx_cksum;
-       cmdline_fixed_string_t set;
-       uint8_t cksum_mask;
+struct cmd_csum_result {
+       cmdline_fixed_string_t csum;
+       cmdline_fixed_string_t mode;
+       cmdline_fixed_string_t proto;
+       cmdline_fixed_string_t hwsw;
        uint8_t port_id;
 };
 
 static void
-cmd_tx_cksum_set_parsed(void *parsed_result,
+csum_show(int port_id)
+{
+       struct rte_eth_dev_info dev_info;
+       uint16_t ol_flags;
+
+       ol_flags = ports[port_id].tx_ol_flags;
+       printf("Parse tunnel is %s\n",
+               (ol_flags & TESTPMD_TX_OFFLOAD_PARSE_TUNNEL) ? "on" : "off");
+       printf("IP checksum offload is %s\n",
+               (ol_flags & TESTPMD_TX_OFFLOAD_IP_CKSUM) ? "hw" : "sw");
+       printf("UDP checksum offload is %s\n",
+               (ol_flags & TESTPMD_TX_OFFLOAD_UDP_CKSUM) ? "hw" : "sw");
+       printf("TCP checksum offload is %s\n",
+               (ol_flags & TESTPMD_TX_OFFLOAD_TCP_CKSUM) ? "hw" : "sw");
+       printf("SCTP checksum offload is %s\n",
+               (ol_flags & TESTPMD_TX_OFFLOAD_SCTP_CKSUM) ? "hw" : "sw");
+       printf("VxLAN checksum offload is %s\n",
+               (ol_flags & TESTPMD_TX_OFFLOAD_VXLAN_CKSUM) ? "hw" : "sw");
+
+       /* display warnings if configuration is not supported by the NIC */
+       rte_eth_dev_info_get(port_id, &dev_info);
+       if ((ol_flags & TESTPMD_TX_OFFLOAD_IP_CKSUM) &&
+               (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_IPV4_CKSUM) == 0) {
+               printf("Warning: hardware IP checksum enabled but not "
+                       "supported by port %d\n", port_id);
+       }
+       if ((ol_flags & TESTPMD_TX_OFFLOAD_UDP_CKSUM) &&
+               (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_UDP_CKSUM) == 0) {
+               printf("Warning: hardware UDP checksum enabled but not "
+                       "supported by port %d\n", port_id);
+       }
+       if ((ol_flags & TESTPMD_TX_OFFLOAD_TCP_CKSUM) &&
+               (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_TCP_CKSUM) == 0) {
+               printf("Warning: hardware TCP checksum enabled but not "
+                       "supported by port %d\n", port_id);
+       }
+       if ((ol_flags & TESTPMD_TX_OFFLOAD_SCTP_CKSUM) &&
+               (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_SCTP_CKSUM) == 0) {
+               printf("Warning: hardware SCTP checksum enabled but not "
+                       "supported by port %d\n", port_id);
+       }
+
+}
+
+static void
+cmd_csum_parsed(void *parsed_result,
                       __attribute__((unused)) struct cmdline *cl,
                       __attribute__((unused)) void *data)
 {
-       struct cmd_tx_cksum_set_result *res = parsed_result;
+       struct cmd_csum_result *res = parsed_result;
+       int hw = 0;
+       uint16_t mask = 0;
+
+       if (port_id_is_invalid(res->port_id)) {
+               printf("invalid port %d\n", res->port_id);
+               return;
+       }
+
+       if (!strcmp(res->mode, "set")) {
+
+               if (!strcmp(res->hwsw, "hw"))
+                       hw = 1;
+
+               if (!strcmp(res->proto, "ip")) {
+                       mask = TESTPMD_TX_OFFLOAD_IP_CKSUM;
+               } else if (!strcmp(res->proto, "udp")) {
+                       mask = TESTPMD_TX_OFFLOAD_UDP_CKSUM;
+               } else if (!strcmp(res->proto, "tcp")) {
+                       mask = TESTPMD_TX_OFFLOAD_TCP_CKSUM;
+               } else if (!strcmp(res->proto, "sctp")) {
+                       mask = TESTPMD_TX_OFFLOAD_SCTP_CKSUM;
+               } else if (!strcmp(res->proto, "vxlan")) {
+                       mask = TESTPMD_TX_OFFLOAD_VXLAN_CKSUM;
+               }
 
-       tx_cksum_set(res->port_id, res->cksum_mask);
+               if (hw)
+                       ports[res->port_id].tx_ol_flags |= mask;
+               else
+                       ports[res->port_id].tx_ol_flags &= (~mask);
+       }
+       csum_show(res->port_id);
 }
 
-cmdline_parse_token_string_t cmd_tx_cksum_set_tx_cksum =
-       TOKEN_STRING_INITIALIZER(struct cmd_tx_cksum_set_result,
-                               tx_cksum, "tx_checksum");
-cmdline_parse_token_string_t cmd_tx_cksum_set_set =
-       TOKEN_STRING_INITIALIZER(struct cmd_tx_cksum_set_result,
-                               set, "set");
-cmdline_parse_token_num_t cmd_tx_cksum_set_cksum_mask =
-       TOKEN_NUM_INITIALIZER(struct cmd_tx_cksum_set_result,
-                               cksum_mask, UINT8);
-cmdline_parse_token_num_t cmd_tx_cksum_set_portid =
-       TOKEN_NUM_INITIALIZER(struct cmd_tx_cksum_set_result,
+cmdline_parse_token_string_t cmd_csum_csum =
+       TOKEN_STRING_INITIALIZER(struct cmd_csum_result,
+                               csum, "csum");
+cmdline_parse_token_string_t cmd_csum_mode =
+       TOKEN_STRING_INITIALIZER(struct cmd_csum_result,
+                               mode, "set");
+cmdline_parse_token_string_t cmd_csum_proto =
+       TOKEN_STRING_INITIALIZER(struct cmd_csum_result,
+                               proto, "ip#tcp#udp#sctp#vxlan");
+cmdline_parse_token_string_t cmd_csum_hwsw =
+       TOKEN_STRING_INITIALIZER(struct cmd_csum_result,
+                               hwsw, "hw#sw");
+cmdline_parse_token_num_t cmd_csum_portid =
+       TOKEN_NUM_INITIALIZER(struct cmd_csum_result,
+                               port_id, UINT8);
+
+cmdline_parse_inst_t cmd_csum_set = {
+       .f = cmd_csum_parsed,
+       .data = NULL,
+       .help_str = "enable/disable hardware calculation of L3/L4 checksum when "
+               "using csum forward engine: csum set ip|tcp|udp|sctp|vxlan hw|sw <port>",
+       .tokens = {
+               (void *)&cmd_csum_csum,
+               (void *)&cmd_csum_mode,
+               (void *)&cmd_csum_proto,
+               (void *)&cmd_csum_hwsw,
+               (void *)&cmd_csum_portid,
+               NULL,
+       },
+};
+
+cmdline_parse_token_string_t cmd_csum_mode_show =
+       TOKEN_STRING_INITIALIZER(struct cmd_csum_result,
+                               mode, "show");
+
+cmdline_parse_inst_t cmd_csum_show = {
+       .f = cmd_csum_parsed,
+       .data = NULL,
+       .help_str = "show checksum offload configuration: csum show <port>",
+       .tokens = {
+               (void *)&cmd_csum_csum,
+               (void *)&cmd_csum_mode_show,
+               (void *)&cmd_csum_portid,
+               NULL,
+       },
+};
+
+/* Enable/disable tunnel parsing */
+struct cmd_csum_tunnel_result {
+       cmdline_fixed_string_t csum;
+       cmdline_fixed_string_t parse;
+       cmdline_fixed_string_t onoff;
+       uint8_t port_id;
+};
+
+static void
+cmd_csum_tunnel_parsed(void *parsed_result,
+                      __attribute__((unused)) struct cmdline *cl,
+                      __attribute__((unused)) void *data)
+{
+       struct cmd_csum_tunnel_result *res = parsed_result;
+
+       if (port_id_is_invalid(res->port_id)) {
+               printf("invalid port %d\n", res->port_id);
+               return;
+       }
+
+       if (!strcmp(res->onoff, "on"))
+               ports[res->port_id].tx_ol_flags |=
+                       TESTPMD_TX_OFFLOAD_PARSE_TUNNEL;
+       else
+               ports[res->port_id].tx_ol_flags &=
+                       (~TESTPMD_TX_OFFLOAD_PARSE_TUNNEL);
+
+       csum_show(res->port_id);
+}
+
+cmdline_parse_token_string_t cmd_csum_tunnel_csum =
+       TOKEN_STRING_INITIALIZER(struct cmd_csum_tunnel_result,
+                               csum, "csum");
+cmdline_parse_token_string_t cmd_csum_tunnel_parse =
+       TOKEN_STRING_INITIALIZER(struct cmd_csum_tunnel_result,
+                               parse, "parse_tunnel");
+cmdline_parse_token_string_t cmd_csum_tunnel_onoff =
+       TOKEN_STRING_INITIALIZER(struct cmd_csum_tunnel_result,
+                               onoff, "on#off");
+cmdline_parse_token_num_t cmd_csum_tunnel_portid =
+       TOKEN_NUM_INITIALIZER(struct cmd_csum_tunnel_result,
+                               port_id, UINT8);
+
+cmdline_parse_inst_t cmd_csum_tunnel = {
+       .f = cmd_csum_tunnel_parsed,
+       .data = NULL,
+       .help_str = "enable/disable parsing of tunnels for csum engine: "
+       "csum parse_tunnel on|off <tx-port>",
+       .tokens = {
+               (void *)&cmd_csum_tunnel_csum,
+               (void *)&cmd_csum_tunnel_parse,
+               (void *)&cmd_csum_tunnel_onoff,
+               (void *)&cmd_csum_tunnel_portid,
+               NULL,
+       },
+};
+
+/* *** ENABLE HARDWARE SEGMENTATION IN TX PACKETS *** */
+struct cmd_tso_set_result {
+       cmdline_fixed_string_t tso;
+       cmdline_fixed_string_t mode;
+       uint16_t tso_segsz;
+       uint8_t port_id;
+};
+
+static void
+cmd_tso_set_parsed(void *parsed_result,
+                      __attribute__((unused)) struct cmdline *cl,
+                      __attribute__((unused)) void *data)
+{
+       struct cmd_tso_set_result *res = parsed_result;
+       struct rte_eth_dev_info dev_info;
+
+       if (port_id_is_invalid(res->port_id))
+               return;
+
+       if (!strcmp(res->mode, "set"))
+               ports[res->port_id].tso_segsz = res->tso_segsz;
+
+       if (ports[res->port_id].tso_segsz == 0)
+               printf("TSO is disabled\n");
+       else
+               printf("TSO segment size is %d\n",
+                       ports[res->port_id].tso_segsz);
+
+       /* display warnings if configuration is not supported by the NIC */
+       rte_eth_dev_info_get(res->port_id, &dev_info);
+       if ((ports[res->port_id].tso_segsz != 0) &&
+               (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_TCP_TSO) == 0) {
+               printf("Warning: TSO enabled but not "
+                       "supported by port %d\n", res->port_id);
+       }
+}
+
+cmdline_parse_token_string_t cmd_tso_set_tso =
+       TOKEN_STRING_INITIALIZER(struct cmd_tso_set_result,
+                               tso, "tso");
+cmdline_parse_token_string_t cmd_tso_set_mode =
+       TOKEN_STRING_INITIALIZER(struct cmd_tso_set_result,
+                               mode, "set");
+cmdline_parse_token_num_t cmd_tso_set_tso_segsz =
+       TOKEN_NUM_INITIALIZER(struct cmd_tso_set_result,
+                               tso_segsz, UINT16);
+cmdline_parse_token_num_t cmd_tso_set_portid =
+       TOKEN_NUM_INITIALIZER(struct cmd_tso_set_result,
                                port_id, UINT8);
 
-cmdline_parse_inst_t cmd_tx_cksum_set = {
-       .f = cmd_tx_cksum_set_parsed,
+cmdline_parse_inst_t cmd_tso_set = {
+       .f = cmd_tso_set_parsed,
+       .data = NULL,
+       .help_str = "Set TSO segment size for csum engine (0 to disable): "
+       "tso set <tso_segsz> <port>",
+       .tokens = {
+               (void *)&cmd_tso_set_tso,
+               (void *)&cmd_tso_set_mode,
+               (void *)&cmd_tso_set_tso_segsz,
+               (void *)&cmd_tso_set_portid,
+               NULL,
+       },
+};
+
+cmdline_parse_token_string_t cmd_tso_show_mode =
+       TOKEN_STRING_INITIALIZER(struct cmd_tso_set_result,
+                               mode, "show");
+
+
+cmdline_parse_inst_t cmd_tso_show = {
+       .f = cmd_tso_set_parsed,
        .data = NULL,
-       .help_str = "enable hardware insertion of L3/L4checksum with a given "
-       "mask in packets sent on a port, the bit mapping is given as, Bit 0 for ip"
-       "Bit 1 for UDP, Bit 2 for TCP, Bit 3 for SCTP",
+       .help_str = "Show TSO segment size for csum engine: "
+       "tso show <port>",
        .tokens = {
-               (void *)&cmd_tx_cksum_set_tx_cksum,
-               (void *)&cmd_tx_cksum_set_set,
-               (void *)&cmd_tx_cksum_set_cksum_mask,
-               (void *)&cmd_tx_cksum_set_portid,
+               (void *)&cmd_tso_set_tso,
+               (void *)&cmd_tso_show_mode,
+               (void *)&cmd_tso_set_portid,
                NULL,
        },
 };
@@ -3515,7 +4025,7 @@ static void cmd_create_bonded_device_parsed(void *parsed_result,
 
                /* Update number of ports */
                nb_ports = rte_eth_dev_count();
-               reconfig(port_id);
+               reconfig(port_id, res->socket);
                rte_eth_promiscuous_enable(port_id);
        }
 
@@ -3606,6 +4116,65 @@ cmdline_parse_inst_t cmd_set_bond_mac_addr = {
                }
 };
 
+
+/* *** SET LINK STATUS MONITORING POLLING PERIOD ON BONDED DEVICE *** */
+struct cmd_set_bond_mon_period_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t bonding;
+       cmdline_fixed_string_t mon_period;
+       uint8_t port_num;
+       uint32_t period_ms;
+};
+
+static void cmd_set_bond_mon_period_parsed(void *parsed_result,
+               __attribute__((unused))  struct cmdline *cl,
+               __attribute__((unused)) void *data)
+{
+       struct cmd_set_bond_mon_period_result *res = parsed_result;
+       int ret;
+
+       if (res->port_num >= nb_ports) {
+               printf("Port id %d must be less than %d\n", res->port_num, nb_ports);
+               return;
+       }
+
+       ret = rte_eth_bond_link_monitoring_set(res->port_num, res->period_ms);
+
+       /* check the return value and print it if is < 0 */
+       if (ret < 0)
+               printf("set_bond_mac_addr error: (%s)\n", strerror(-ret));
+}
+
+cmdline_parse_token_string_t cmd_set_bond_mon_period_set =
+               TOKEN_STRING_INITIALIZER(struct cmd_set_bond_mon_period_result,
+                               set, "set");
+cmdline_parse_token_string_t cmd_set_bond_mon_period_bonding =
+               TOKEN_STRING_INITIALIZER(struct cmd_set_bond_mon_period_result,
+                               bonding, "bonding");
+cmdline_parse_token_string_t cmd_set_bond_mon_period_mon_period =
+               TOKEN_STRING_INITIALIZER(struct cmd_set_bond_mon_period_result,
+                               mon_period,     "mon_period");
+cmdline_parse_token_num_t cmd_set_bond_mon_period_portnum =
+               TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mon_period_result,
+                               port_num, UINT8);
+cmdline_parse_token_num_t cmd_set_bond_mon_period_period_ms =
+               TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mon_period_result,
+                               period_ms, UINT32);
+
+cmdline_parse_inst_t cmd_set_bond_mon_period = {
+               .f = cmd_set_bond_mon_period_parsed,
+               .data = (void *) 0,
+               .help_str = "set bonding mon_period (port_id) (period_ms): ",
+               .tokens = {
+                               (void *)&cmd_set_bond_mon_period_set,
+                               (void *)&cmd_set_bond_mon_period_bonding,
+                               (void *)&cmd_set_bond_mon_period_mon_period,
+                               (void *)&cmd_set_bond_mon_period_portnum,
+                               (void *)&cmd_set_bond_mon_period_period_ms,
+                               NULL
+               }
+};
+
 #endif /* RTE_LIBRTE_PMD_BOND */
 
 /* *** SET FORWARDING MODE *** */
@@ -5015,12 +5584,18 @@ static void cmd_showportall_parsed(void *parsed_result,
                if (!strcmp(res->what, "stats"))
                        for (i = 0; i < nb_ports; i++)
                                nic_stats_clear(i);
+               else if (!strcmp(res->what, "xstats"))
+                       for (i = 0; i < nb_ports; i++)
+                               nic_xstats_clear(i);
        } else if (!strcmp(res->what, "info"))
                for (i = 0; i < nb_ports; i++)
                        port_infos_display(i);
        else if (!strcmp(res->what, "stats"))
                for (i = 0; i < nb_ports; i++)
                        nic_stats_display(i);
+       else if (!strcmp(res->what, "xstats"))
+               for (i = 0; i < nb_ports; i++)
+                       nic_xstats_display(i);
        else if (!strcmp(res->what, "fdir"))
                for (i = 0; i < nb_ports; i++)
                        fdir_get_infos(i);
@@ -5036,13 +5611,13 @@ cmdline_parse_token_string_t cmd_showportall_port =
        TOKEN_STRING_INITIALIZER(struct cmd_showportall_result, port, "port");
 cmdline_parse_token_string_t cmd_showportall_what =
        TOKEN_STRING_INITIALIZER(struct cmd_showportall_result, what,
-                                "info#stats#fdir#stat_qmap");
+                                "info#stats#xstats#fdir#stat_qmap");
 cmdline_parse_token_string_t cmd_showportall_all =
        TOKEN_STRING_INITIALIZER(struct cmd_showportall_result, all, "all");
 cmdline_parse_inst_t cmd_showportall = {
        .f = cmd_showportall_parsed,
        .data = NULL,
-       .help_str = "show|clear port info|stats|fdir|stat_qmap all",
+       .help_str = "show|clear port info|stats|xstats|fdir|stat_qmap all",
        .tokens = {
                (void *)&cmd_showportall_show,
                (void *)&cmd_showportall_port,
@@ -5068,10 +5643,14 @@ static void cmd_showport_parsed(void *parsed_result,
        if (!strcmp(res->show, "clear")) {
                if (!strcmp(res->what, "stats"))
                        nic_stats_clear(res->portnum);
+               else if (!strcmp(res->what, "xstats"))
+                       nic_xstats_clear(res->portnum);
        } else if (!strcmp(res->what, "info"))
                port_infos_display(res->portnum);
        else if (!strcmp(res->what, "stats"))
                nic_stats_display(res->portnum);
+       else if (!strcmp(res->what, "xstats"))
+               nic_xstats_display(res->portnum);
        else if (!strcmp(res->what, "fdir"))
                 fdir_get_infos(res->portnum);
        else if (!strcmp(res->what, "stat_qmap"))
@@ -5085,14 +5664,14 @@ cmdline_parse_token_string_t cmd_showport_port =
        TOKEN_STRING_INITIALIZER(struct cmd_showport_result, port, "port");
 cmdline_parse_token_string_t cmd_showport_what =
        TOKEN_STRING_INITIALIZER(struct cmd_showport_result, what,
-                                "info#stats#fdir#stat_qmap");
+                                "info#stats#xstats#fdir#stat_qmap");
 cmdline_parse_token_num_t cmd_showport_portnum =
-       TOKEN_NUM_INITIALIZER(struct cmd_showport_result, portnum, INT32);
+       TOKEN_NUM_INITIALIZER(struct cmd_showport_result, portnum, UINT8);
 
 cmdline_parse_inst_t cmd_showport = {
        .f = cmd_showport_parsed,
        .data = NULL,
-       .help_str = "show|clear port info|stats|fdir|stat_qmap X (X = port number)",
+       .help_str = "show|clear port info|stats|xstats|fdir|stat_qmap X (X = port number)",
        .tokens = {
                (void *)&cmd_showport_show,
                (void *)&cmd_showport_port,
@@ -5696,55 +6275,162 @@ cmdline_parse_inst_t cmd_set_uc_all_hash_filter = {
        },
 };
 
-/* *** CONFIGURE VF TRAFFIC CONTROL *** */
-struct cmd_set_vf_traffic {
+/* *** CONFIGURE MACVLAN FILTER FOR VF(s) *** */
+struct cmd_set_vf_macvlan_filter {
        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;
+       struct ether_addr address;
+       cmdline_fixed_string_t filter_type;
        cmdline_fixed_string_t mode;
 };
 
 static void
-cmd_set_vf_traffic_parsed(void *parsed_result,
+cmd_set_vf_macvlan_parsed(void *parsed_result,
                       __attribute__((unused)) struct cmdline *cl,
                       __attribute__((unused)) void *data)
 {
-       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;
+       int is_on, ret = 0;
+       struct cmd_set_vf_macvlan_filter *res = parsed_result;
+       struct rte_eth_mac_filter filter;
+
+       memset(&filter, 0, sizeof(struct rte_eth_mac_filter));
+
+       (void)rte_memcpy(&filter.mac_addr, &res->address, ETHER_ADDR_LEN);
+
+       /* set VF MAC filter */
+       filter.is_vf = 1;
+
+       /* set VF ID */
+       filter.dst_id = res->vf_id;
+
+       if (!strcmp(res->filter_type, "exact-mac"))
+               filter.filter_type = RTE_MAC_PERFECT_MATCH;
+       else if (!strcmp(res->filter_type, "exact-mac-vlan"))
+               filter.filter_type = RTE_MACVLAN_PERFECT_MATCH;
+       else if (!strcmp(res->filter_type, "hashmac"))
+               filter.filter_type = RTE_MAC_HASH_MATCH;
+       else if (!strcmp(res->filter_type, "hashmac-vlan"))
+               filter.filter_type = RTE_MACVLAN_HASH_MATCH;
+
+       is_on = (strcmp(res->mode, "on") == 0) ? 1 : 0;
+
+       if (is_on)
+               ret = rte_eth_dev_filter_ctrl(res->port_id,
+                                       RTE_ETH_FILTER_MACVLAN,
+                                       RTE_ETH_FILTER_ADD,
+                                        &filter);
+       else
+               ret = rte_eth_dev_filter_ctrl(res->port_id,
+                                       RTE_ETH_FILTER_MACVLAN,
+                                       RTE_ETH_FILTER_DELETE,
+                                       &filter);
+
+       if (ret < 0)
+               printf("bad set MAC hash parameter, return code = %d\n", ret);
 
-       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,
+cmdline_parse_token_string_t cmd_set_vf_macvlan_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vf_macvlan_filter,
                                 set, "set");
-cmdline_parse_token_string_t cmd_setvf_traffic_port =
-       TOKEN_STRING_INITIALIZER(struct cmd_set_vf_traffic,
+cmdline_parse_token_string_t cmd_set_vf_macvlan_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vf_macvlan_filter,
                                 port, "port");
-cmdline_parse_token_num_t cmd_setvf_traffic_portid =
-       TOKEN_NUM_INITIALIZER(struct cmd_set_vf_traffic,
+cmdline_parse_token_num_t cmd_set_vf_macvlan_portid =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_vf_macvlan_filter,
                              port_id, UINT8);
-cmdline_parse_token_string_t cmd_setvf_traffic_vf =
-       TOKEN_STRING_INITIALIZER(struct cmd_set_vf_traffic,
+cmdline_parse_token_string_t cmd_set_vf_macvlan_vf =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vf_macvlan_filter,
                                 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 =
+cmdline_parse_token_num_t cmd_set_vf_macvlan_vf_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_vf_macvlan_filter,
+                               vf_id, UINT8);
+cmdline_parse_token_etheraddr_t cmd_set_vf_macvlan_mac =
+       TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_vf_macvlan_filter,
+                               address);
+cmdline_parse_token_string_t cmd_set_vf_macvlan_filter_type =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vf_macvlan_filter,
+                               filter_type, "exact-mac#exact-mac-vlan"
+                               "#hashmac#hashmac-vlan");
+cmdline_parse_token_string_t cmd_set_vf_macvlan_mode =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vf_macvlan_filter,
+                                mode, "on#off");
+
+cmdline_parse_inst_t cmd_set_vf_macvlan_filter = {
+       .f = cmd_set_vf_macvlan_parsed,
+       .data = NULL,
+       .help_str = "set port (portid) vf (vfid) (mac-addr) "
+                       "(exact-mac|exact-mac-vlan|hashmac|hashmac-vlan) "
+                       "on|off\n"
+                       "exact match rule:exact match of MAC or MAC and VLAN; "
+                       "hash match rule: hash match of MAC and exact match "
+                       "of VLAN",
+       .tokens = {
+               (void *)&cmd_set_vf_macvlan_set,
+               (void *)&cmd_set_vf_macvlan_port,
+               (void *)&cmd_set_vf_macvlan_portid,
+               (void *)&cmd_set_vf_macvlan_vf,
+               (void *)&cmd_set_vf_macvlan_vf_id,
+               (void *)&cmd_set_vf_macvlan_mac,
+               (void *)&cmd_set_vf_macvlan_filter_type,
+               (void *)&cmd_set_vf_macvlan_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_set_vf_traffic_parsed(void *parsed_result,
+                      __attribute__((unused)) struct cmdline *cl,
+                      __attribute__((unused)) void *data)
+{
+       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;
+
+       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)",
+       .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,
@@ -6112,6 +6798,205 @@ cmdline_parse_inst_t cmd_vf_rate_limit = {
        },
 };
 
+/* *** ADD TUNNEL FILTER OF A PORT *** */
+struct cmd_tunnel_filter_result {
+       cmdline_fixed_string_t cmd;
+       cmdline_fixed_string_t what;
+       uint8_t port_id;
+       struct ether_addr outer_mac;
+       struct ether_addr inner_mac;
+       cmdline_ipaddr_t ip_value;
+       uint16_t inner_vlan;
+       cmdline_fixed_string_t tunnel_type;
+       cmdline_fixed_string_t filter_type;
+       uint32_t tenant_id;
+       uint16_t queue_num;
+};
+
+static void
+cmd_tunnel_filter_parsed(void *parsed_result,
+                         __attribute__((unused)) struct cmdline *cl,
+                         __attribute__((unused)) void *data)
+{
+       struct cmd_tunnel_filter_result *res = parsed_result;
+       struct rte_eth_tunnel_filter_conf tunnel_filter_conf;
+       int ret = 0;
+
+       tunnel_filter_conf.outer_mac = &res->outer_mac;
+       tunnel_filter_conf.inner_mac = &res->inner_mac;
+       tunnel_filter_conf.inner_vlan = res->inner_vlan;
+
+       if (res->ip_value.family == AF_INET) {
+               tunnel_filter_conf.ip_addr.ipv4_addr =
+                       res->ip_value.addr.ipv4.s_addr;
+               tunnel_filter_conf.ip_type = RTE_TUNNEL_IPTYPE_IPV4;
+       } else {
+               memcpy(&(tunnel_filter_conf.ip_addr.ipv6_addr),
+                       &(res->ip_value.addr.ipv6),
+                       sizeof(struct in6_addr));
+               tunnel_filter_conf.ip_type = RTE_TUNNEL_IPTYPE_IPV6;
+       }
+
+       if (!strcmp(res->filter_type, "imac-ivlan"))
+               tunnel_filter_conf.filter_type = RTE_TUNNEL_FILTER_IMAC_IVLAN;
+       else if (!strcmp(res->filter_type, "imac-ivlan-tenid"))
+               tunnel_filter_conf.filter_type =
+                       RTE_TUNNEL_FILTER_IMAC_IVLAN_TENID;
+       else if (!strcmp(res->filter_type, "imac-tenid"))
+               tunnel_filter_conf.filter_type = RTE_TUNNEL_FILTER_IMAC_TENID;
+       else if (!strcmp(res->filter_type, "imac"))
+               tunnel_filter_conf.filter_type = ETH_TUNNEL_FILTER_IMAC;
+       else if (!strcmp(res->filter_type, "omac-imac-tenid"))
+               tunnel_filter_conf.filter_type =
+                       RTE_TUNNEL_FILTER_OMAC_TENID_IMAC;
+       else {
+               printf("The filter type is not supported");
+               return;
+       }
+
+       if (!strcmp(res->tunnel_type, "vxlan"))
+               tunnel_filter_conf.tunnel_type = RTE_TUNNEL_TYPE_VXLAN;
+       else {
+               printf("Only VXLAN is supported now.\n");
+               return;
+       }
+
+       tunnel_filter_conf.tenant_id = res->tenant_id;
+       tunnel_filter_conf.queue_id = res->queue_num;
+       if (!strcmp(res->what, "add"))
+               ret = rte_eth_dev_filter_ctrl(res->port_id,
+                                       RTE_ETH_FILTER_TUNNEL,
+                                       RTE_ETH_FILTER_ADD,
+                                       &tunnel_filter_conf);
+       else
+               ret = rte_eth_dev_filter_ctrl(res->port_id,
+                                       RTE_ETH_FILTER_TUNNEL,
+                                       RTE_ETH_FILTER_DELETE,
+                                       &tunnel_filter_conf);
+       if (ret < 0)
+               printf("cmd_tunnel_filter_parsed error: (%s)\n",
+                               strerror(-ret));
+
+}
+cmdline_parse_token_string_t cmd_tunnel_filter_cmd =
+       TOKEN_STRING_INITIALIZER(struct cmd_tunnel_filter_result,
+       cmd, "tunnel_filter");
+cmdline_parse_token_string_t cmd_tunnel_filter_what =
+       TOKEN_STRING_INITIALIZER(struct cmd_tunnel_filter_result,
+       what, "add#rm");
+cmdline_parse_token_num_t cmd_tunnel_filter_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_tunnel_filter_result,
+       port_id, UINT8);
+cmdline_parse_token_etheraddr_t cmd_tunnel_filter_outer_mac =
+       TOKEN_ETHERADDR_INITIALIZER(struct cmd_tunnel_filter_result,
+       outer_mac);
+cmdline_parse_token_etheraddr_t cmd_tunnel_filter_inner_mac =
+       TOKEN_ETHERADDR_INITIALIZER(struct cmd_tunnel_filter_result,
+       inner_mac);
+cmdline_parse_token_num_t cmd_tunnel_filter_innner_vlan =
+       TOKEN_NUM_INITIALIZER(struct cmd_tunnel_filter_result,
+       inner_vlan, UINT16);
+cmdline_parse_token_ipaddr_t cmd_tunnel_filter_ip_value =
+       TOKEN_IPADDR_INITIALIZER(struct cmd_tunnel_filter_result,
+       ip_value);
+cmdline_parse_token_string_t cmd_tunnel_filter_tunnel_type =
+       TOKEN_STRING_INITIALIZER(struct cmd_tunnel_filter_result,
+       tunnel_type, "vxlan");
+
+cmdline_parse_token_string_t cmd_tunnel_filter_filter_type =
+       TOKEN_STRING_INITIALIZER(struct cmd_tunnel_filter_result,
+       filter_type, "imac-ivlan#imac-ivlan-tenid#imac-tenid#"
+               "imac#omac-imac-tenid");
+cmdline_parse_token_num_t cmd_tunnel_filter_tenant_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_tunnel_filter_result,
+       tenant_id, UINT32);
+cmdline_parse_token_num_t cmd_tunnel_filter_queue_num =
+       TOKEN_NUM_INITIALIZER(struct cmd_tunnel_filter_result,
+       queue_num, UINT16);
+
+cmdline_parse_inst_t cmd_tunnel_filter = {
+       .f = cmd_tunnel_filter_parsed,
+       .data = (void *)0,
+       .help_str = "add/rm tunnel filter of a port: "
+                       "tunnel_filter add port_id outer_mac inner_mac ip "
+                       "inner_vlan tunnel_type(vxlan) filter_type "
+                       "(imac-ivlan|imac-ivlan-tenid|imac-tenid|"
+                       "imac|omac-imac-tenid) "
+                       "tenant_id queue_num",
+       .tokens = {
+               (void *)&cmd_tunnel_filter_cmd,
+               (void *)&cmd_tunnel_filter_what,
+               (void *)&cmd_tunnel_filter_port_id,
+               (void *)&cmd_tunnel_filter_outer_mac,
+               (void *)&cmd_tunnel_filter_inner_mac,
+               (void *)&cmd_tunnel_filter_ip_value,
+               (void *)&cmd_tunnel_filter_innner_vlan,
+               (void *)&cmd_tunnel_filter_tunnel_type,
+               (void *)&cmd_tunnel_filter_filter_type,
+               (void *)&cmd_tunnel_filter_tenant_id,
+               (void *)&cmd_tunnel_filter_queue_num,
+               NULL,
+       },
+};
+
+/* *** CONFIGURE TUNNEL UDP PORT *** */
+struct cmd_tunnel_udp_config {
+       cmdline_fixed_string_t cmd;
+       cmdline_fixed_string_t what;
+       uint16_t udp_port;
+       uint8_t port_id;
+};
+
+static void
+cmd_tunnel_udp_config_parsed(void *parsed_result,
+                         __attribute__((unused)) struct cmdline *cl,
+                         __attribute__((unused)) void *data)
+{
+       struct cmd_tunnel_udp_config *res = parsed_result;
+       struct rte_eth_udp_tunnel tunnel_udp;
+       int ret;
+
+       tunnel_udp.udp_port = res->udp_port;
+
+       if (!strcmp(res->cmd, "rx_vxlan_port"))
+               tunnel_udp.prot_type = RTE_TUNNEL_TYPE_VXLAN;
+
+       if (!strcmp(res->what, "add"))
+               ret = rte_eth_dev_udp_tunnel_add(res->port_id, &tunnel_udp);
+       else
+               ret = rte_eth_dev_udp_tunnel_delete(res->port_id, &tunnel_udp);
+
+       if (ret < 0)
+               printf("udp tunneling add error: (%s)\n", strerror(-ret));
+}
+
+cmdline_parse_token_string_t cmd_tunnel_udp_config_cmd =
+       TOKEN_STRING_INITIALIZER(struct cmd_tunnel_udp_config,
+                               cmd, "rx_vxlan_port");
+cmdline_parse_token_string_t cmd_tunnel_udp_config_what =
+       TOKEN_STRING_INITIALIZER(struct cmd_tunnel_udp_config,
+                               what, "add#rm");
+cmdline_parse_token_num_t cmd_tunnel_udp_config_udp_port =
+       TOKEN_NUM_INITIALIZER(struct cmd_tunnel_udp_config,
+                               udp_port, UINT16);
+cmdline_parse_token_num_t cmd_tunnel_udp_config_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_tunnel_udp_config,
+                               port_id, UINT8);
+
+cmdline_parse_inst_t cmd_tunnel_udp_config = {
+       .f = cmd_tunnel_udp_config_parsed,
+       .data = (void *)0,
+       .help_str = "add/rm an tunneling UDP port filter: "
+                       "rx_vxlan_port add udp_port port_id",
+       .tokens = {
+               (void *)&cmd_tunnel_udp_config_cmd,
+               (void *)&cmd_tunnel_udp_config_what,
+               (void *)&cmd_tunnel_udp_config_udp_port,
+               (void *)&cmd_tunnel_udp_config_port_id,
+               NULL,
+       },
+};
+
 /* *** CONFIGURE VM MIRROR VLAN/POOL RULE *** */
 struct cmd_set_mirror_mask_result {
        cmdline_fixed_string_t set;
@@ -6376,8 +7261,6 @@ 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
@@ -6474,135 +7357,6 @@ cmdline_parse_inst_t cmd_dump_one = {
        },
 };
 
-/* *** 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;
@@ -7304,6 +8058,1029 @@ cmdline_parse_inst_t cmd_get_flex_filter = {
        },
 };
 
+/* *** Filters Control *** */
+
+/* *** deal with ethertype filter *** */
+struct cmd_ethertype_filter_result {
+       cmdline_fixed_string_t filter;
+       uint8_t port_id;
+       cmdline_fixed_string_t ops;
+       cmdline_fixed_string_t mac;
+       struct ether_addr mac_addr;
+       cmdline_fixed_string_t ethertype;
+       uint16_t ethertype_value;
+       cmdline_fixed_string_t drop;
+       cmdline_fixed_string_t queue;
+       uint16_t  queue_id;
+};
+
+cmdline_parse_token_string_t cmd_ethertype_filter_filter =
+       TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result,
+                                filter, "ethertype_filter");
+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_ops =
+       TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result,
+                                ops, "add#del");
+cmdline_parse_token_string_t cmd_ethertype_filter_mac =
+       TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result,
+                                mac, "mac_addr#mac_ignr");
+cmdline_parse_token_etheraddr_t cmd_ethertype_filter_mac_addr =
+       TOKEN_ETHERADDR_INITIALIZER(struct cmd_ethertype_filter_result,
+                                    mac_addr);
+cmdline_parse_token_string_t cmd_ethertype_filter_ethertype =
+       TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result,
+                                ethertype, "ethertype");
+cmdline_parse_token_num_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_drop =
+       TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result,
+                                drop, "drop#fwd");
+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);
+
+static void
+cmd_ethertype_filter_parsed(void *parsed_result,
+                         __attribute__((unused)) struct cmdline *cl,
+                         __attribute__((unused)) void *data)
+{
+       struct cmd_ethertype_filter_result *res = parsed_result;
+       struct rte_eth_ethertype_filter filter;
+       int ret = 0;
+
+       ret = rte_eth_dev_filter_supported(res->port_id,
+                       RTE_ETH_FILTER_ETHERTYPE);
+       if (ret < 0) {
+               printf("ethertype filter is not supported on port %u.\n",
+                       res->port_id);
+               return;
+       }
+
+       memset(&filter, 0, sizeof(filter));
+       if (!strcmp(res->mac, "mac_addr")) {
+               filter.flags |= RTE_ETHTYPE_FLAGS_MAC;
+               (void)rte_memcpy(&filter.mac_addr, &res->mac_addr,
+                       sizeof(struct ether_addr));
+       }
+       if (!strcmp(res->drop, "drop"))
+               filter.flags |= RTE_ETHTYPE_FLAGS_DROP;
+       filter.ether_type = res->ethertype_value;
+       filter.queue = res->queue_id;
+
+       if (!strcmp(res->ops, "add"))
+               ret = rte_eth_dev_filter_ctrl(res->port_id,
+                               RTE_ETH_FILTER_ETHERTYPE,
+                               RTE_ETH_FILTER_ADD,
+                               &filter);
+       else
+               ret = rte_eth_dev_filter_ctrl(res->port_id,
+                               RTE_ETH_FILTER_ETHERTYPE,
+                               RTE_ETH_FILTER_DELETE,
+                               &filter);
+       if (ret < 0)
+               printf("ethertype filter programming error: (%s)\n",
+                       strerror(-ret));
+}
+
+cmdline_parse_inst_t cmd_ethertype_filter = {
+       .f = cmd_ethertype_filter_parsed,
+       .data = NULL,
+       .help_str = "add or delete an ethertype filter entry",
+       .tokens = {
+               (void *)&cmd_ethertype_filter_filter,
+               (void *)&cmd_ethertype_filter_port_id,
+               (void *)&cmd_ethertype_filter_ops,
+               (void *)&cmd_ethertype_filter_mac,
+               (void *)&cmd_ethertype_filter_mac_addr,
+               (void *)&cmd_ethertype_filter_ethertype,
+               (void *)&cmd_ethertype_filter_ethertype_value,
+               (void *)&cmd_ethertype_filter_drop,
+               (void *)&cmd_ethertype_filter_queue,
+               (void *)&cmd_ethertype_filter_queue_id,
+               NULL,
+       },
+};
+
+/* *** deal with flow director filter *** */
+struct cmd_flow_director_result {
+       cmdline_fixed_string_t flow_director_filter;
+       uint8_t port_id;
+       cmdline_fixed_string_t ops;
+       cmdline_fixed_string_t flow;
+       cmdline_fixed_string_t flow_type;
+       cmdline_fixed_string_t src;
+       cmdline_ipaddr_t ip_src;
+       uint16_t port_src;
+       cmdline_fixed_string_t dst;
+       cmdline_ipaddr_t ip_dst;
+       uint16_t port_dst;
+       cmdline_fixed_string_t verify_tag;
+       uint32_t verify_tag_value;
+       cmdline_fixed_string_t flexbytes;
+       cmdline_fixed_string_t flexbytes_value;
+       cmdline_fixed_string_t drop;
+       cmdline_fixed_string_t queue;
+       uint16_t  queue_id;
+       cmdline_fixed_string_t fd_id;
+       uint32_t  fd_id_value;
+};
+
+static inline int
+parse_flexbytes(const char *q_arg, uint8_t *flexbytes, uint16_t max_num)
+{
+       char s[256];
+       const char *p, *p0 = q_arg;
+       char *end;
+       unsigned long int_fld;
+       char *str_fld[max_num];
+       int i;
+       unsigned size;
+       int ret = -1;
+
+       p = strchr(p0, '(');
+       if (p == NULL)
+               return -1;
+       ++p;
+       p0 = strchr(p, ')');
+       if (p0 == NULL)
+               return -1;
+
+       size = p0 - p;
+       if (size >= sizeof(s))
+               return -1;
+
+       snprintf(s, sizeof(s), "%.*s", size, p);
+       ret = rte_strsplit(s, sizeof(s), str_fld, max_num, ',');
+       if (ret < 0 || ret > max_num)
+               return -1;
+       for (i = 0; i < ret; i++) {
+               errno = 0;
+               int_fld = strtoul(str_fld[i], &end, 0);
+               if (errno != 0 || *end != '\0' || int_fld > UINT8_MAX)
+                       return -1;
+               flexbytes[i] = (uint8_t)int_fld;
+       }
+       return ret;
+}
+
+static enum rte_eth_flow_type
+str2flowtype(char *string)
+{
+       uint8_t i = 0;
+       static const struct {
+               char str[32];
+               enum rte_eth_flow_type type;
+       } flowtype_str[] = {
+               {"ip4", RTE_ETH_FLOW_TYPE_IPV4_OTHER},
+               {"ip4-frag", RTE_ETH_FLOW_TYPE_FRAG_IPV4},
+               {"udp4", RTE_ETH_FLOW_TYPE_UDPV4},
+               {"tcp4", RTE_ETH_FLOW_TYPE_TCPV4},
+               {"sctp4", RTE_ETH_FLOW_TYPE_SCTPV4},
+               {"ip6", RTE_ETH_FLOW_TYPE_IPV6_OTHER},
+               {"ip6-frag", RTE_ETH_FLOW_TYPE_FRAG_IPV6},
+               {"udp6", RTE_ETH_FLOW_TYPE_UDPV6},
+               {"tcp6", RTE_ETH_FLOW_TYPE_TCPV6},
+               {"sctp6", RTE_ETH_FLOW_TYPE_TCPV6},
+       };
+
+       for (i = 0; i < RTE_DIM(flowtype_str); i++) {
+               if (!strcmp(flowtype_str[i].str, string))
+                       return flowtype_str[i].type;
+       }
+       return RTE_ETH_FLOW_TYPE_NONE;
+}
+
+#define IPV4_ADDR_TO_UINT(ip_addr, ip) \
+do { \
+       if ((ip_addr).family == AF_INET) \
+               (ip) = (ip_addr).addr.ipv4.s_addr; \
+       else { \
+               printf("invalid parameter.\n"); \
+               return; \
+       } \
+} while (0)
+
+#define IPV6_ADDR_TO_ARRAY(ip_addr, ip) \
+do { \
+       if ((ip_addr).family == AF_INET6) \
+               (void)rte_memcpy(&(ip), \
+                                &((ip_addr).addr.ipv6), \
+                                sizeof(struct in6_addr)); \
+       else { \
+               printf("invalid parameter.\n"); \
+               return; \
+       } \
+} while (0)
+
+static void
+cmd_flow_director_filter_parsed(void *parsed_result,
+                         __attribute__((unused)) struct cmdline *cl,
+                         __attribute__((unused)) void *data)
+{
+       struct cmd_flow_director_result *res = parsed_result;
+       struct rte_eth_fdir_filter entry;
+       uint8_t flexbytes[RTE_ETH_FDIR_MAX_FLEXLEN];
+       int ret = 0;
+
+       ret = rte_eth_dev_filter_supported(res->port_id, RTE_ETH_FILTER_FDIR);
+       if (ret < 0) {
+               printf("flow director is not supported on port %u.\n",
+                       res->port_id);
+               return;
+       }
+       memset(flexbytes, 0, sizeof(flexbytes));
+       memset(&entry, 0, sizeof(struct rte_eth_fdir_filter));
+       ret = parse_flexbytes(res->flexbytes_value,
+                                       flexbytes,
+                                       RTE_ETH_FDIR_MAX_FLEXLEN);
+       if (ret < 0) {
+               printf("error: Cannot parse flexbytes input.\n");
+               return;
+       }
+
+       entry.input.flow_type = str2flowtype(res->flow_type);
+       switch (entry.input.flow_type) {
+       case RTE_ETH_FLOW_TYPE_IPV4_OTHER:
+       case RTE_ETH_FLOW_TYPE_UDPV4:
+       case RTE_ETH_FLOW_TYPE_TCPV4:
+               IPV4_ADDR_TO_UINT(res->ip_dst,
+                       entry.input.flow.ip4_flow.dst_ip);
+               IPV4_ADDR_TO_UINT(res->ip_src,
+                       entry.input.flow.ip4_flow.src_ip);
+               /* need convert to big endian. */
+               entry.input.flow.udp4_flow.dst_port =
+                               rte_cpu_to_be_16(res->port_dst);
+               entry.input.flow.udp4_flow.src_port =
+                               rte_cpu_to_be_16(res->port_src);
+               break;
+       case RTE_ETH_FLOW_TYPE_SCTPV4:
+               IPV4_ADDR_TO_UINT(res->ip_dst,
+                       entry.input.flow.sctp4_flow.ip.dst_ip);
+               IPV4_ADDR_TO_UINT(res->ip_src,
+                       entry.input.flow.sctp4_flow.ip.src_ip);
+               /* need convert to big endian. */
+               entry.input.flow.sctp4_flow.verify_tag =
+                               rte_cpu_to_be_32(res->verify_tag_value);
+               break;
+       case RTE_ETH_FLOW_TYPE_IPV6_OTHER:
+       case RTE_ETH_FLOW_TYPE_UDPV6:
+       case RTE_ETH_FLOW_TYPE_TCPV6:
+               IPV6_ADDR_TO_ARRAY(res->ip_dst,
+                       entry.input.flow.ipv6_flow.dst_ip);
+               IPV6_ADDR_TO_ARRAY(res->ip_src,
+                       entry.input.flow.ipv6_flow.src_ip);
+               /* need convert to big endian. */
+               entry.input.flow.udp6_flow.dst_port =
+                               rte_cpu_to_be_16(res->port_dst);
+               entry.input.flow.udp6_flow.src_port =
+                               rte_cpu_to_be_16(res->port_src);
+               break;
+       case RTE_ETH_FLOW_TYPE_SCTPV6:
+               IPV6_ADDR_TO_ARRAY(res->ip_dst,
+                       entry.input.flow.sctp6_flow.ip.dst_ip);
+               IPV6_ADDR_TO_ARRAY(res->ip_src,
+                       entry.input.flow.sctp6_flow.ip.src_ip);
+               /* need convert to big endian. */
+               entry.input.flow.sctp6_flow.verify_tag =
+                               rte_cpu_to_be_32(res->verify_tag_value);
+               break;
+       default:
+               printf("invalid parameter.\n");
+               return;
+       }
+       (void)rte_memcpy(entry.input.flow_ext.flexbytes,
+                  flexbytes,
+                  RTE_ETH_FDIR_MAX_FLEXLEN);
+
+       entry.action.flex_off = 0;  /*use 0 by default */
+       if (!strcmp(res->drop, "drop"))
+               entry.action.behavior = RTE_ETH_FDIR_REJECT;
+       else
+               entry.action.behavior = RTE_ETH_FDIR_ACCEPT;
+       /* set to report FD ID by default */
+       entry.action.report_status = RTE_ETH_FDIR_REPORT_ID;
+       entry.action.rx_queue = res->queue_id;
+       entry.soft_id = res->fd_id_value;
+       if (!strcmp(res->ops, "add"))
+               ret = rte_eth_dev_filter_ctrl(res->port_id, RTE_ETH_FILTER_FDIR,
+                                            RTE_ETH_FILTER_ADD, &entry);
+       else
+               ret = rte_eth_dev_filter_ctrl(res->port_id, RTE_ETH_FILTER_FDIR,
+                                            RTE_ETH_FILTER_DELETE, &entry);
+       if (ret < 0)
+               printf("flow director programming error: (%s)\n",
+                       strerror(-ret));
+}
+
+cmdline_parse_token_string_t cmd_flow_director_filter =
+       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
+                                flow_director_filter, "flow_director_filter");
+cmdline_parse_token_num_t cmd_flow_director_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
+                             port_id, UINT8);
+cmdline_parse_token_string_t cmd_flow_director_ops =
+       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
+                                ops, "add#del");
+cmdline_parse_token_string_t cmd_flow_director_flow =
+       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
+                                flow, "flow");
+cmdline_parse_token_string_t cmd_flow_director_flow_type =
+       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
+                                flow_type,
+                                "ip4#ip4-frag#tcp4#udp4#sctp4#"
+                                "ip6#ip6-frag#tcp6#udp6#sctp6");
+cmdline_parse_token_string_t cmd_flow_director_src =
+       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
+                                src, "src");
+cmdline_parse_token_ipaddr_t cmd_flow_director_ip_src =
+       TOKEN_IPADDR_INITIALIZER(struct cmd_flow_director_result,
+                                ip_src);
+cmdline_parse_token_num_t cmd_flow_director_port_src =
+       TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
+                             port_src, UINT16);
+cmdline_parse_token_string_t cmd_flow_director_dst =
+       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
+                                dst, "dst");
+cmdline_parse_token_ipaddr_t cmd_flow_director_ip_dst =
+       TOKEN_IPADDR_INITIALIZER(struct cmd_flow_director_result,
+                                ip_dst);
+cmdline_parse_token_num_t cmd_flow_director_port_dst =
+       TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
+                             port_dst, UINT16);
+cmdline_parse_token_string_t cmd_flow_director_verify_tag =
+       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
+                                 verify_tag, "verify_tag");
+cmdline_parse_token_num_t cmd_flow_director_verify_tag_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
+                             verify_tag_value, UINT32);
+cmdline_parse_token_string_t cmd_flow_director_flexbytes =
+       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
+                                flexbytes, "flexbytes");
+cmdline_parse_token_string_t cmd_flow_director_flexbytes_value =
+       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
+                             flexbytes_value, NULL);
+cmdline_parse_token_string_t cmd_flow_director_drop =
+       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
+                                drop, "drop#fwd");
+cmdline_parse_token_string_t cmd_flow_director_queue =
+       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
+                                queue, "queue");
+cmdline_parse_token_num_t cmd_flow_director_queue_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
+                             queue_id, UINT16);
+cmdline_parse_token_string_t cmd_flow_director_fd_id =
+       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
+                                fd_id, "fd_id");
+cmdline_parse_token_num_t cmd_flow_director_fd_id_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
+                             fd_id_value, UINT32);
+
+cmdline_parse_inst_t cmd_add_del_ip_flow_director = {
+       .f = cmd_flow_director_filter_parsed,
+       .data = NULL,
+       .help_str = "add or delete an ip flow director entry on NIC",
+       .tokens = {
+               (void *)&cmd_flow_director_filter,
+               (void *)&cmd_flow_director_port_id,
+               (void *)&cmd_flow_director_ops,
+               (void *)&cmd_flow_director_flow,
+               (void *)&cmd_flow_director_flow_type,
+               (void *)&cmd_flow_director_src,
+               (void *)&cmd_flow_director_ip_src,
+               (void *)&cmd_flow_director_dst,
+               (void *)&cmd_flow_director_ip_dst,
+               (void *)&cmd_flow_director_flexbytes,
+               (void *)&cmd_flow_director_flexbytes_value,
+               (void *)&cmd_flow_director_drop,
+               (void *)&cmd_flow_director_queue,
+               (void *)&cmd_flow_director_queue_id,
+               (void *)&cmd_flow_director_fd_id,
+               (void *)&cmd_flow_director_fd_id_value,
+               NULL,
+       },
+};
+
+cmdline_parse_inst_t cmd_add_del_udp_flow_director = {
+       .f = cmd_flow_director_filter_parsed,
+       .data = NULL,
+       .help_str = "add or delete an udp/tcp flow director entry on NIC",
+       .tokens = {
+               (void *)&cmd_flow_director_filter,
+               (void *)&cmd_flow_director_port_id,
+               (void *)&cmd_flow_director_ops,
+               (void *)&cmd_flow_director_flow,
+               (void *)&cmd_flow_director_flow_type,
+               (void *)&cmd_flow_director_src,
+               (void *)&cmd_flow_director_ip_src,
+               (void *)&cmd_flow_director_port_src,
+               (void *)&cmd_flow_director_dst,
+               (void *)&cmd_flow_director_ip_dst,
+               (void *)&cmd_flow_director_port_dst,
+               (void *)&cmd_flow_director_flexbytes,
+               (void *)&cmd_flow_director_flexbytes_value,
+               (void *)&cmd_flow_director_drop,
+               (void *)&cmd_flow_director_queue,
+               (void *)&cmd_flow_director_queue_id,
+               (void *)&cmd_flow_director_fd_id,
+               (void *)&cmd_flow_director_fd_id_value,
+               NULL,
+       },
+};
+
+cmdline_parse_inst_t cmd_add_del_sctp_flow_director = {
+       .f = cmd_flow_director_filter_parsed,
+       .data = NULL,
+       .help_str = "add or delete a sctp flow director entry on NIC",
+       .tokens = {
+               (void *)&cmd_flow_director_filter,
+               (void *)&cmd_flow_director_port_id,
+               (void *)&cmd_flow_director_ops,
+               (void *)&cmd_flow_director_flow,
+               (void *)&cmd_flow_director_flow_type,
+               (void *)&cmd_flow_director_src,
+               (void *)&cmd_flow_director_ip_src,
+               (void *)&cmd_flow_director_dst,
+               (void *)&cmd_flow_director_ip_dst,
+               (void *)&cmd_flow_director_verify_tag,
+               (void *)&cmd_flow_director_verify_tag_value,
+               (void *)&cmd_flow_director_flexbytes,
+               (void *)&cmd_flow_director_flexbytes_value,
+               (void *)&cmd_flow_director_drop,
+               (void *)&cmd_flow_director_queue,
+               (void *)&cmd_flow_director_queue_id,
+               (void *)&cmd_flow_director_fd_id,
+               (void *)&cmd_flow_director_fd_id_value,
+               NULL,
+       },
+};
+
+struct cmd_flush_flow_director_result {
+       cmdline_fixed_string_t flush_flow_director;
+       uint8_t port_id;
+};
+
+cmdline_parse_token_string_t cmd_flush_flow_director_flush =
+       TOKEN_STRING_INITIALIZER(struct cmd_flush_flow_director_result,
+                                flush_flow_director, "flush_flow_director");
+cmdline_parse_token_num_t cmd_flush_flow_director_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_flush_flow_director_result,
+                             port_id, UINT8);
+
+static void
+cmd_flush_flow_director_parsed(void *parsed_result,
+                         __attribute__((unused)) struct cmdline *cl,
+                         __attribute__((unused)) void *data)
+{
+       struct cmd_flow_director_result *res = parsed_result;
+       int ret = 0;
+
+       ret = rte_eth_dev_filter_supported(res->port_id, RTE_ETH_FILTER_FDIR);
+       if (ret < 0) {
+               printf("flow director is not supported on port %u.\n",
+                       res->port_id);
+               return;
+       }
+
+       ret = rte_eth_dev_filter_ctrl(res->port_id, RTE_ETH_FILTER_FDIR,
+                       RTE_ETH_FILTER_FLUSH, NULL);
+       if (ret < 0)
+               printf("flow director table flushing error: (%s)\n",
+                       strerror(-ret));
+}
+
+cmdline_parse_inst_t cmd_flush_flow_director = {
+       .f = cmd_flush_flow_director_parsed,
+       .data = NULL,
+       .help_str = "flush all flow director entries of a device on NIC",
+       .tokens = {
+               (void *)&cmd_flush_flow_director_flush,
+               (void *)&cmd_flush_flow_director_port_id,
+               NULL,
+       },
+};
+
+/* *** deal with flow director mask on flexible payload *** */
+struct cmd_flow_director_flex_mask_result {
+       cmdline_fixed_string_t flow_director_flexmask;
+       uint8_t port_id;
+       cmdline_fixed_string_t flow;
+       cmdline_fixed_string_t flow_type;
+       cmdline_fixed_string_t mask;
+};
+
+static void
+cmd_flow_director_flex_mask_parsed(void *parsed_result,
+                         __attribute__((unused)) struct cmdline *cl,
+                         __attribute__((unused)) void *data)
+{
+       struct cmd_flow_director_flex_mask_result *res = parsed_result;
+       struct rte_eth_fdir_flex_mask flex_mask;
+       struct rte_port *port;
+       enum rte_eth_flow_type i;
+       int ret;
+
+       if (res->port_id > nb_ports) {
+               printf("Invalid port, range is [0, %d]\n", nb_ports - 1);
+               return;
+       }
+
+       port = &ports[res->port_id];
+       /** Check if the port is not started **/
+       if (port->port_status != RTE_PORT_STOPPED) {
+               printf("Please stop port %d first\n", res->port_id);
+               return;
+       }
+
+       memset(&flex_mask, 0, sizeof(struct rte_eth_fdir_flex_mask));
+       ret = parse_flexbytes(res->mask,
+                       flex_mask.mask,
+                       RTE_ETH_FDIR_MAX_FLEXLEN);
+       if (ret < 0) {
+               printf("error: Cannot parse mask input.\n");
+               return;
+       }
+       if (!strcmp(res->flow_type, "all")) {
+               for (i = RTE_ETH_FLOW_TYPE_UDPV4;
+                    i <= RTE_ETH_FLOW_TYPE_FRAG_IPV6;
+                    i++) {
+                       flex_mask.flow_type = i;
+                       fdir_set_flex_mask(res->port_id, &flex_mask);
+               }
+               cmd_reconfig_device_queue(res->port_id, 1, 0);
+               return;
+       }
+       flex_mask.flow_type = str2flowtype(res->flow_type);
+       fdir_set_flex_mask(res->port_id, &flex_mask);
+       cmd_reconfig_device_queue(res->port_id, 1, 1);
+}
+
+cmdline_parse_token_string_t cmd_flow_director_flexmask =
+       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_flex_mask_result,
+                                flow_director_flexmask,
+                                "flow_director_flex_mask");
+cmdline_parse_token_num_t cmd_flow_director_flexmask_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_flow_director_flex_mask_result,
+                             port_id, UINT8);
+cmdline_parse_token_string_t cmd_flow_director_flexmask_flow =
+       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_flex_mask_result,
+                                flow, "flow");
+cmdline_parse_token_string_t cmd_flow_director_flexmask_flow_type =
+       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_flex_mask_result,
+                                flow_type,
+                               "ip4#ip4-frag#tcp4#udp4#sctp4#"
+                               "ip6#ip6-frag#tcp6#udp6#sctp6#all");
+cmdline_parse_token_string_t cmd_flow_director_flexmask_mask =
+       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_flex_mask_result,
+                                mask, NULL);
+
+cmdline_parse_inst_t cmd_set_flow_director_flex_mask = {
+       .f = cmd_flow_director_flex_mask_parsed,
+       .data = NULL,
+       .help_str = "set flow director's flex mask on NIC",
+       .tokens = {
+               (void *)&cmd_flow_director_flexmask,
+               (void *)&cmd_flow_director_flexmask_port_id,
+               (void *)&cmd_flow_director_flexmask_flow,
+               (void *)&cmd_flow_director_flexmask_flow_type,
+               (void *)&cmd_flow_director_flexmask_mask,
+               NULL,
+       },
+};
+
+/* *** deal with flow director flexible payload configuration *** */
+struct cmd_flow_director_flexpayload_result {
+       cmdline_fixed_string_t flow_director_flexpayload;
+       uint8_t port_id;
+       cmdline_fixed_string_t payload_layer;
+       cmdline_fixed_string_t payload_cfg;
+};
+
+static inline int
+parse_offsets(const char *q_arg, uint16_t *offsets, uint16_t max_num)
+{
+       char s[256];
+       const char *p, *p0 = q_arg;
+       char *end;
+       unsigned long int_fld;
+       char *str_fld[max_num];
+       int i;
+       unsigned size;
+       int ret = -1;
+
+       p = strchr(p0, '(');
+       if (p == NULL)
+               return -1;
+       ++p;
+       p0 = strchr(p, ')');
+       if (p0 == NULL)
+               return -1;
+
+       size = p0 - p;
+       if (size >= sizeof(s))
+               return -1;
+
+       snprintf(s, sizeof(s), "%.*s", size, p);
+       ret = rte_strsplit(s, sizeof(s), str_fld, max_num, ',');
+       if (ret < 0 || ret > max_num)
+               return -1;
+       for (i = 0; i < ret; i++) {
+               errno = 0;
+               int_fld = strtoul(str_fld[i], &end, 0);
+               if (errno != 0 || *end != '\0' || int_fld > UINT16_MAX)
+                       return -1;
+               offsets[i] = (uint16_t)int_fld;
+       }
+       return ret;
+}
+
+static void
+cmd_flow_director_flxpld_parsed(void *parsed_result,
+                         __attribute__((unused)) struct cmdline *cl,
+                         __attribute__((unused)) void *data)
+{
+       struct cmd_flow_director_flexpayload_result *res = parsed_result;
+       struct rte_eth_flex_payload_cfg flex_cfg;
+       struct rte_port *port;
+       int ret = 0;
+
+       if (res->port_id > nb_ports) {
+               printf("Invalid port, range is [0, %d]\n", nb_ports - 1);
+               return;
+       }
+
+       port = &ports[res->port_id];
+       /** Check if the port is not started **/
+       if (port->port_status != RTE_PORT_STOPPED) {
+               printf("Please stop port %d first\n", res->port_id);
+               return;
+       }
+
+       memset(&flex_cfg, 0, sizeof(struct rte_eth_flex_payload_cfg));
+
+       if (!strcmp(res->payload_layer, "l2"))
+               flex_cfg.type = RTE_ETH_L2_PAYLOAD;
+       else if (!strcmp(res->payload_layer, "l3"))
+               flex_cfg.type = RTE_ETH_L3_PAYLOAD;
+       else if (!strcmp(res->payload_layer, "l4"))
+               flex_cfg.type = RTE_ETH_L4_PAYLOAD;
+
+       ret = parse_offsets(res->payload_cfg, flex_cfg.src_offset,
+                           RTE_ETH_FDIR_MAX_FLEXLEN);
+       if (ret < 0) {
+               printf("error: Cannot parse flex payload input.\n");
+               return;
+       }
+
+       fdir_set_flex_payload(res->port_id, &flex_cfg);
+       cmd_reconfig_device_queue(res->port_id, 1, 1);
+}
+
+cmdline_parse_token_string_t cmd_flow_director_flexpayload =
+       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_flexpayload_result,
+                                flow_director_flexpayload,
+                                "flow_director_flex_payload");
+cmdline_parse_token_num_t cmd_flow_director_flexpayload_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_flow_director_flexpayload_result,
+                             port_id, UINT8);
+cmdline_parse_token_string_t cmd_flow_director_flexpayload_payload_layer =
+       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_flexpayload_result,
+                                payload_layer, "l2#l3#l4");
+cmdline_parse_token_string_t cmd_flow_director_flexpayload_payload_cfg =
+       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_flexpayload_result,
+                                payload_cfg, NULL);
+
+cmdline_parse_inst_t cmd_set_flow_director_flex_payload = {
+       .f = cmd_flow_director_flxpld_parsed,
+       .data = NULL,
+       .help_str = "set flow director's flex payload on NIC",
+       .tokens = {
+               (void *)&cmd_flow_director_flexpayload,
+               (void *)&cmd_flow_director_flexpayload_port_id,
+               (void *)&cmd_flow_director_flexpayload_payload_layer,
+               (void *)&cmd_flow_director_flexpayload_payload_cfg,
+               NULL,
+       },
+};
+
+/* *** Classification Filters Control *** */
+/* *** Get symmetric hash enable per port *** */
+struct cmd_get_sym_hash_ena_per_port_result {
+       cmdline_fixed_string_t get_sym_hash_ena_per_port;
+       uint8_t port_id;
+};
+
+static void
+cmd_get_sym_hash_per_port_parsed(void *parsed_result,
+                                __rte_unused struct cmdline *cl,
+                                __rte_unused void *data)
+{
+       struct cmd_get_sym_hash_ena_per_port_result *res = parsed_result;
+       struct rte_eth_hash_filter_info info;
+       int ret;
+
+       if (rte_eth_dev_filter_supported(res->port_id,
+                               RTE_ETH_FILTER_HASH) < 0) {
+               printf("RTE_ETH_FILTER_HASH not supported on port: %d\n",
+                                                       res->port_id);
+               return;
+       }
+
+       memset(&info, 0, sizeof(info));
+       info.info_type = RTE_ETH_HASH_FILTER_SYM_HASH_ENA_PER_PORT;
+       ret = rte_eth_dev_filter_ctrl(res->port_id, RTE_ETH_FILTER_HASH,
+                                               RTE_ETH_FILTER_GET, &info);
+
+       if (ret < 0) {
+               printf("Cannot get symmetric hash enable per port "
+                                       "on port %u\n", res->port_id);
+               return;
+       }
+
+       printf("Symmetric hash is %s on port %u\n", info.info.enable ?
+                               "enabled" : "disabled", res->port_id);
+}
+
+cmdline_parse_token_string_t cmd_get_sym_hash_ena_per_port_all =
+       TOKEN_STRING_INITIALIZER(struct cmd_get_sym_hash_ena_per_port_result,
+               get_sym_hash_ena_per_port, "get_sym_hash_ena_per_port");
+cmdline_parse_token_num_t cmd_get_sym_hash_ena_per_port_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_get_sym_hash_ena_per_port_result,
+               port_id, UINT8);
+
+cmdline_parse_inst_t cmd_get_sym_hash_ena_per_port = {
+       .f = cmd_get_sym_hash_per_port_parsed,
+       .data = NULL,
+       .help_str = "get_sym_hash_ena_per_port port_id",
+       .tokens = {
+               (void *)&cmd_get_sym_hash_ena_per_port_all,
+               (void *)&cmd_get_sym_hash_ena_per_port_port_id,
+               NULL,
+       },
+};
+
+/* *** Set symmetric hash enable per port *** */
+struct cmd_set_sym_hash_ena_per_port_result {
+       cmdline_fixed_string_t set_sym_hash_ena_per_port;
+       cmdline_fixed_string_t enable;
+       uint8_t port_id;
+};
+
+static void
+cmd_set_sym_hash_per_port_parsed(void *parsed_result,
+                                __rte_unused struct cmdline *cl,
+                                __rte_unused void *data)
+{
+       struct cmd_set_sym_hash_ena_per_port_result *res = parsed_result;
+       struct rte_eth_hash_filter_info info;
+       int ret;
+
+       if (rte_eth_dev_filter_supported(res->port_id,
+                               RTE_ETH_FILTER_HASH) < 0) {
+               printf("RTE_ETH_FILTER_HASH not supported on port: %d\n",
+                                                       res->port_id);
+               return;
+       }
+
+       memset(&info, 0, sizeof(info));
+       info.info_type = RTE_ETH_HASH_FILTER_SYM_HASH_ENA_PER_PORT;
+       if (!strcmp(res->enable, "enable"))
+               info.info.enable = 1;
+       ret = rte_eth_dev_filter_ctrl(res->port_id, RTE_ETH_FILTER_HASH,
+                                       RTE_ETH_FILTER_SET, &info);
+       if (ret < 0) {
+               printf("Cannot set symmetric hash enable per port on "
+                                       "port %u\n", res->port_id);
+               return;
+       }
+       printf("Symmetric hash has been set to %s on port %u\n",
+                                       res->enable, res->port_id);
+}
+
+cmdline_parse_token_string_t cmd_set_sym_hash_ena_per_port_all =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_sym_hash_ena_per_port_result,
+               set_sym_hash_ena_per_port, "set_sym_hash_ena_per_port");
+cmdline_parse_token_num_t cmd_set_sym_hash_ena_per_port_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_sym_hash_ena_per_port_result,
+               port_id, UINT8);
+cmdline_parse_token_string_t cmd_set_sym_hash_ena_per_port_enable =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_sym_hash_ena_per_port_result,
+               enable, "enable#disable");
+
+cmdline_parse_inst_t cmd_set_sym_hash_ena_per_port = {
+       .f = cmd_set_sym_hash_per_port_parsed,
+       .data = NULL,
+       .help_str = "set_sym_hash_ena_per_port port_id enable|disable",
+       .tokens = {
+               (void *)&cmd_set_sym_hash_ena_per_port_all,
+               (void *)&cmd_set_sym_hash_ena_per_port_port_id,
+               (void *)&cmd_set_sym_hash_ena_per_port_enable,
+               NULL,
+       },
+};
+
+/* Get global config of hash function */
+struct cmd_get_hash_global_config_result {
+       cmdline_fixed_string_t get_hash_global_config;
+       uint8_t port_id;
+};
+
+static char *
+flowtype_to_str(enum rte_eth_flow_type ftype)
+{
+       uint16_t i;
+       static struct {
+               char str[16];
+               enum rte_eth_flow_type ftype;
+       } ftype_table[] = {
+               {"ip4", RTE_ETH_FLOW_TYPE_IPV4_OTHER},
+               {"ip4-frag", RTE_ETH_FLOW_TYPE_FRAG_IPV4},
+               {"udp4", RTE_ETH_FLOW_TYPE_UDPV4},
+               {"tcp4", RTE_ETH_FLOW_TYPE_TCPV4},
+               {"sctp4", RTE_ETH_FLOW_TYPE_SCTPV4},
+               {"ip6", RTE_ETH_FLOW_TYPE_IPV6_OTHER},
+               {"ip6-frag", RTE_ETH_FLOW_TYPE_FRAG_IPV6},
+               {"udp6", RTE_ETH_FLOW_TYPE_UDPV6},
+               {"tcp6", RTE_ETH_FLOW_TYPE_TCPV6},
+               {"sctp6", RTE_ETH_FLOW_TYPE_TCPV6},
+       };
+
+       for (i = 0; i < RTE_DIM(ftype_table); i++) {
+               if (ftype_table[i].ftype == ftype)
+                       return ftype_table[i].str;
+       }
+
+       return NULL;
+}
+
+static void
+cmd_get_hash_global_config_parsed(void *parsed_result,
+                                 __rte_unused struct cmdline *cl,
+                                 __rte_unused void *data)
+{
+       struct cmd_get_hash_global_config_result *res = parsed_result;
+       struct rte_eth_hash_filter_info info;
+       uint32_t idx, offset, i;
+       char *str;
+       int ret;
+
+       if (rte_eth_dev_filter_supported(res->port_id,
+                       RTE_ETH_FILTER_HASH) < 0) {
+               printf("RTE_ETH_FILTER_HASH not supported on port %d\n",
+                                                       res->port_id);
+               return;
+       }
+
+       memset(&info, 0, sizeof(info));
+       info.info_type = RTE_ETH_HASH_FILTER_GLOBAL_CONFIG;
+       ret = rte_eth_dev_filter_ctrl(res->port_id, RTE_ETH_FILTER_HASH,
+                                       RTE_ETH_FILTER_GET, &info);
+       if (ret < 0) {
+               printf("Cannot get hash global configurations by port %d\n",
+                                                       res->port_id);
+               return;
+       }
+
+       switch (info.info.global_conf.hash_func) {
+       case RTE_ETH_HASH_FUNCTION_TOEPLITZ:
+               printf("Hash function is Toeplitz\n");
+               break;
+       case RTE_ETH_HASH_FUNCTION_SIMPLE_XOR:
+               printf("Hash function is Simple XOR\n");
+               break;
+       default:
+               printf("Unknown hash function\n");
+               break;
+       }
+
+       for (i = 0; i < RTE_ETH_FLOW_TYPE_MAX; i++) {
+               idx = i / UINT32_BIT;
+               offset = i % UINT32_BIT;
+               if (!(info.info.global_conf.valid_bit_mask[idx] &
+                                               (1UL << offset)))
+                       continue;
+               str = flowtype_to_str((enum rte_eth_flow_type)i);
+               if (!str)
+                       continue;
+               printf("Symmetric hash is %s globally for flow type %s "
+                                                       "by port %d\n",
+                       ((info.info.global_conf.sym_hash_enable_mask[idx] &
+                       (1UL << offset)) ? "enabled" : "disabled"), str,
+                                                       res->port_id);
+       }
+}
+
+cmdline_parse_token_string_t cmd_get_hash_global_config_all =
+       TOKEN_STRING_INITIALIZER(struct cmd_get_hash_global_config_result,
+               get_hash_global_config, "get_hash_global_config");
+cmdline_parse_token_num_t cmd_get_hash_global_config_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_get_hash_global_config_result,
+               port_id, UINT8);
+
+cmdline_parse_inst_t cmd_get_hash_global_config = {
+       .f = cmd_get_hash_global_config_parsed,
+       .data = NULL,
+       .help_str = "get_hash_global_config port_id",
+       .tokens = {
+               (void *)&cmd_get_hash_global_config_all,
+               (void *)&cmd_get_hash_global_config_port_id,
+               NULL,
+       },
+};
+
+/* Set global config of hash function */
+struct cmd_set_hash_global_config_result {
+       cmdline_fixed_string_t set_hash_global_config;
+       uint8_t port_id;
+       cmdline_fixed_string_t hash_func;
+       cmdline_fixed_string_t flow_type;
+       cmdline_fixed_string_t enable;
+};
+
+static void
+cmd_set_hash_global_config_parsed(void *parsed_result,
+                                 __rte_unused struct cmdline *cl,
+                                 __rte_unused void *data)
+{
+       struct cmd_set_hash_global_config_result *res = parsed_result;
+       struct rte_eth_hash_filter_info info;
+       uint32_t ftype, idx, offset;
+       int ret;
+
+       if (rte_eth_dev_filter_supported(res->port_id,
+                               RTE_ETH_FILTER_HASH) < 0) {
+               printf("RTE_ETH_FILTER_HASH not supported on port %d\n",
+                                                       res->port_id);
+               return;
+       }
+       memset(&info, 0, sizeof(info));
+       info.info_type = RTE_ETH_HASH_FILTER_GLOBAL_CONFIG;
+       if (!strcmp(res->hash_func, "toeplitz"))
+               info.info.global_conf.hash_func =
+                       RTE_ETH_HASH_FUNCTION_TOEPLITZ;
+       else if (!strcmp(res->hash_func, "simple_xor"))
+               info.info.global_conf.hash_func =
+                       RTE_ETH_HASH_FUNCTION_SIMPLE_XOR;
+       else if (!strcmp(res->hash_func, "default"))
+               info.info.global_conf.hash_func =
+                       RTE_ETH_HASH_FUNCTION_DEFAULT;
+
+       ftype = str2flowtype(res->flow_type);
+       idx = ftype / (CHAR_BIT * sizeof(uint32_t));
+       offset = ftype % (CHAR_BIT * sizeof(uint32_t));
+       info.info.global_conf.valid_bit_mask[idx] |= (1UL << offset);
+       if (!strcmp(res->enable, "enable"))
+               info.info.global_conf.sym_hash_enable_mask[idx] |=
+                                               (1UL << offset);
+       ret = rte_eth_dev_filter_ctrl(res->port_id, RTE_ETH_FILTER_HASH,
+                                       RTE_ETH_FILTER_SET, &info);
+       if (ret < 0)
+               printf("Cannot set global hash configurations by port %d\n",
+                                                       res->port_id);
+       else
+               printf("Global hash configurations have been set "
+                       "succcessfully by port %d\n", res->port_id);
+}
+
+cmdline_parse_token_string_t cmd_set_hash_global_config_all =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_hash_global_config_result,
+               set_hash_global_config, "set_hash_global_config");
+cmdline_parse_token_num_t cmd_set_hash_global_config_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_hash_global_config_result,
+               port_id, UINT8);
+cmdline_parse_token_string_t cmd_set_hash_global_config_hash_func =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_hash_global_config_result,
+               hash_func, "toeplitz#simple_xor#default");
+cmdline_parse_token_string_t cmd_set_hash_global_config_flow_type =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_hash_global_config_result,
+               flow_type,
+               "ip4#ip4-frag#tcp4#udp4#sctp4#ip6#ip6-frag#tcp6#udp6#sctp6");
+cmdline_parse_token_string_t cmd_set_hash_global_config_enable =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_hash_global_config_result,
+               enable, "enable#disable");
+
+cmdline_parse_inst_t cmd_set_hash_global_config = {
+       .f = cmd_set_hash_global_config_parsed,
+       .data = NULL,
+       .help_str = "set_hash_global_config port_id "
+               "toeplitz|simple_xor|default "
+               "ip4|ip4-frag|tcp4|udp4|#sctp4|ip6|ip6-frag|tcp6|udp6|sctp6 "
+               "enable|disable",
+       .tokens = {
+               (void *)&cmd_set_hash_global_config_all,
+               (void *)&cmd_set_hash_global_config_port_id,
+               (void *)&cmd_set_hash_global_config_hash_func,
+               (void *)&cmd_set_hash_global_config_flow_type,
+               (void *)&cmd_set_hash_global_config_enable,
+               NULL,
+       },
+};
+
 /* ******************************************************************************** */
 
 /* list of instructions */
@@ -7346,6 +9123,7 @@ cmdline_parse_ctx_t main_ctx[] = {
        (cmdline_parse_inst_t *) &cmd_create_bonded_device,
        (cmdline_parse_inst_t *) &cmd_set_bond_mac_addr,
        (cmdline_parse_inst_t *) &cmd_set_balance_xmit_policy,
+       (cmdline_parse_inst_t *) &cmd_set_bond_mon_period,
 #endif
        (cmdline_parse_inst_t *)&cmd_vlan_offload,
        (cmdline_parse_inst_t *)&cmd_vlan_tpid,
@@ -7354,7 +9132,11 @@ cmdline_parse_ctx_t main_ctx[] = {
        (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_csum_set,
+       (cmdline_parse_inst_t *)&cmd_csum_show,
+       (cmdline_parse_inst_t *)&cmd_csum_tunnel,
+       (cmdline_parse_inst_t *)&cmd_tso_set,
+       (cmdline_parse_inst_t *)&cmd_tso_show,
        (cmdline_parse_inst_t *)&cmd_link_flow_control_set,
        (cmdline_parse_inst_t *)&cmd_link_flow_control_set_rx,
        (cmdline_parse_inst_t *)&cmd_link_flow_control_set_tx,
@@ -7393,6 +9175,7 @@ cmdline_parse_ctx_t main_ctx[] = {
        (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_rxtx_queue,
        (cmdline_parse_inst_t *)&cmd_config_rss_reta,
        (cmdline_parse_inst_t *)&cmd_showport_reta,
        (cmdline_parse_inst_t *)&cmd_config_burst,
@@ -7401,11 +9184,14 @@ cmdline_parse_ctx_t main_ctx[] = {
        (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_vf_mac_addr_filter,
+       (cmdline_parse_inst_t *)&cmd_set_vf_macvlan_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_tunnel_filter,
+       (cmdline_parse_inst_t *)&cmd_tunnel_udp_config,
        (cmdline_parse_inst_t *)&cmd_set_mirror_mask,
        (cmdline_parse_inst_t *)&cmd_set_mirror_link,
        (cmdline_parse_inst_t *)&cmd_reset_mirror_rule,
@@ -7414,9 +9200,7 @@ cmdline_parse_ctx_t main_ctx[] = {
        (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_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,
@@ -7429,6 +9213,16 @@ cmdline_parse_ctx_t main_ctx[] = {
        (cmdline_parse_inst_t *)&cmd_add_flex_filter,
        (cmdline_parse_inst_t *)&cmd_remove_flex_filter,
        (cmdline_parse_inst_t *)&cmd_get_flex_filter,
+       (cmdline_parse_inst_t *)&cmd_add_del_ip_flow_director,
+       (cmdline_parse_inst_t *)&cmd_add_del_udp_flow_director,
+       (cmdline_parse_inst_t *)&cmd_add_del_sctp_flow_director,
+       (cmdline_parse_inst_t *)&cmd_flush_flow_director,
+       (cmdline_parse_inst_t *)&cmd_set_flow_director_flex_mask,
+       (cmdline_parse_inst_t *)&cmd_set_flow_director_flex_payload,
+       (cmdline_parse_inst_t *)&cmd_get_sym_hash_ena_per_port,
+       (cmdline_parse_inst_t *)&cmd_set_sym_hash_ena_per_port,
+       (cmdline_parse_inst_t *)&cmd_get_hash_global_config,
+       (cmdline_parse_inst_t *)&cmd_set_hash_global_config,
        NULL,
 };