New upstream version 18.02
[deb_dpdk.git] / app / test-pmd / cmdline.c
index 09a2832..d1dc1de 100644 (file)
@@ -1,42 +1,12 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
- *   Copyright(c) 2014 6WIND S.A.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2016 Intel Corporation.
+ * Copyright(c) 2014 6WIND S.A.
  */
 
 #include <stdarg.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdint.h>
-#include <stdarg.h>
 #include <string.h>
 #include <termios.h>
 #include <unistd.h>
@@ -75,6 +45,8 @@
 #include <rte_string_fns.h>
 #include <rte_devargs.h>
 #include <rte_eth_ctrl.h>
+#include <rte_flow.h>
+#include <rte_gro.h>
 
 #include <cmdline_rdline.h>
 #include <cmdline_parse.h>
 #include <cmdline.h>
 #ifdef RTE_LIBRTE_PMD_BOND
 #include <rte_eth_bond.h>
+#include <rte_eth_bond_8023ad.h>
+#endif
+#ifdef RTE_LIBRTE_DPAA_PMD
+#include <rte_pmd_dpaa.h>
+#endif
+#ifdef RTE_LIBRTE_IXGBE_PMD
+#include <rte_pmd_ixgbe.h>
+#endif
+#ifdef RTE_LIBRTE_I40E_PMD
+#include <rte_pmd_i40e.h>
+#endif
+#ifdef RTE_LIBRTE_BNXT_PMD
+#include <rte_pmd_bnxt.h>
 #endif
-
 #include "testpmd.h"
+#include "cmdline_mtr.h"
+#include "cmdline_tm.h"
 
 static struct cmdline *testpmd_cl;
 
@@ -125,7 +111,7 @@ cmdline_parse_token_string_t cmd_help_brief_help =
 cmdline_parse_inst_t cmd_help_brief = {
        .f = cmd_help_brief_parsed,
        .data = NULL,
-       .help_str = "show help",
+       .help_str = "help: Show help",
        .tokens = {
                (void *)&cmd_help_brief_help,
                NULL,
@@ -180,7 +166,7 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "Display:\n"
                        "--------\n\n"
 
-                       "show port (info|stats|xstats|fdir|stat_qmap|dcb_tc) (port_id|all)\n"
+                       "show port (info|stats|xstats|fdir|stat_qmap|dcb_tc|cap) (port_id|all)\n"
                        "    Display information for port_id, or all.\n\n"
 
                        "show port X rss reta (size) (mask0,mask1,...)\n"
@@ -208,6 +194,39 @@ static void cmd_help_long_parsed(void *parsed_result,
 
                        "read txd (port_id) (queue_id) (txd_id)\n"
                        "    Display a TX descriptor of a port TX queue.\n\n"
+
+                       "ddp get list (port_id)\n"
+                       "    Get ddp profile info list\n\n"
+
+                       "ddp get info (profile_path)\n"
+                       "    Get ddp profile information.\n\n"
+
+                       "show vf stats (port_id) (vf_id)\n"
+                       "    Display a VF's statistics.\n\n"
+
+                       "clear vf stats (port_id) (vf_id)\n"
+                       "    Reset a VF's statistics.\n\n"
+
+                       "show port (port_id) pctype mapping\n"
+                       "    Get flow ptype to pctype mapping on a port\n\n"
+
+                       "show port meter stats (port_id) (meter_id) (clear)\n"
+                       "    Get meter stats on a port\n\n"
+                        "show port tm cap (port_id)\n"
+                        "       Display the port TM capability.\n\n"
+
+                        "show port tm level cap (port_id) (level_id)\n"
+                        "       Display the port TM hierarchical level capability.\n\n"
+
+                        "show port tm node cap (port_id) (node_id)\n"
+                        "       Display the port TM node capability.\n\n"
+
+                        "show port tm node type (port_id) (node_id)\n"
+                        "       Display the port TM node type.\n\n"
+
+                        "show port tm node stats (port_id) (node_id) (clear)\n"
+                        "       Display the port TM node stats.\n\n"
+
                );
        }
 
@@ -226,6 +245,9 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "set verbose (level)\n"
                        "    Set the debug verbosity level X.\n\n"
 
+                       "set log global|(type) (level)\n"
+                       "    Set the log level.\n\n"
+
                        "set nbport (num)\n"
                        "    Set number of ports.\n\n"
 
@@ -260,12 +282,66 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "set portlist (x[,y]*)\n"
                        "    Set the list of forwarding ports.\n\n"
 
+                       "set tx loopback (port_id) (on|off)\n"
+                       "    Enable or disable tx loopback.\n\n"
+
+                       "set all queues drop (port_id) (on|off)\n"
+                       "    Set drop enable bit for all queues.\n\n"
+
+                       "set vf split drop (port_id) (vf_id) (on|off)\n"
+                       "    Set split drop enable bit for a VF from the PF.\n\n"
+
+                       "set vf mac antispoof (port_id) (vf_id) (on|off).\n"
+                       "    Set MAC antispoof for a VF from the PF.\n\n"
+
+                       "set macsec offload (port_id) on encrypt (on|off) replay-protect (on|off)\n"
+                       "    Enable MACsec offload.\n\n"
+
+                       "set macsec offload (port_id) off\n"
+                       "    Disable MACsec offload.\n\n"
+
+                       "set macsec sc (tx|rx) (port_id) (mac) (pi)\n"
+                       "    Configure MACsec secure connection (SC).\n\n"
+
+                       "set macsec sa (tx|rx) (port_id) (idx) (an) (pn) (key)\n"
+                       "    Configure MACsec secure association (SA).\n\n"
+
+                       "set vf broadcast (port_id) (vf_id) (on|off)\n"
+                       "    Set VF broadcast for a VF from the PF.\n\n"
+
                        "vlan set strip (on|off) (port_id)\n"
                        "    Set the VLAN strip on a port.\n\n"
 
                        "vlan set stripq (on|off) (port_id,queue_id)\n"
                        "    Set the VLAN strip for a queue on a port.\n\n"
 
+                       "set vf vlan stripq (port_id) (vf_id) (on|off)\n"
+                       "    Set the VLAN strip for all queues in a pool for a VF from the PF.\n\n"
+
+                       "set vf vlan insert (port_id) (vf_id) (vlan_id)\n"
+                       "    Set VLAN insert for a VF from the PF.\n\n"
+
+                       "set vf vlan antispoof (port_id) (vf_id) (on|off)\n"
+                       "    Set VLAN antispoof for a VF from the PF.\n\n"
+
+                       "set vf vlan tag (port_id) (vf_id) (on|off)\n"
+                       "    Set VLAN tag for a VF from the PF.\n\n"
+
+                       "set vf tx max-bandwidth (port_id) (vf_id) (bandwidth)\n"
+                       "    Set a VF's max bandwidth(Mbps).\n\n"
+
+                       "set vf tc tx min-bandwidth (port_id) (vf_id) (bw1, bw2, ...)\n"
+                       "    Set all TCs' min bandwidth(%%) on a VF.\n\n"
+
+                       "set vf tc tx max-bandwidth (port_id) (vf_id) (tc_no) (bandwidth)\n"
+                       "    Set a TC's max bandwidth(Mbps) on a VF.\n\n"
+
+                       "set tx strict-link-priority (port_id) (tc_bitmap)\n"
+                       "    Set some TCs' strict link priority mode on a physical port.\n\n"
+
+                       "set tc tx min-bandwidth (port_id) (bw1, bw2, ...)\n"
+                       "    Set all TCs' min bandwidth(%%) for all PF and VFs.\n\n"
+
                        "vlan set filter (on|off) (port_id)\n"
                        "    Set the VLAN filter on a port.\n\n"
 
@@ -347,6 +423,28 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "tso show (portid)"
                        "    Display the status of TCP Segmentation Offload.\n\n"
 
+                       "set port (port_id) gro on|off\n"
+                       "    Enable or disable Generic Receive Offload in"
+                       " csum forwarding engine.\n\n"
+
+                       "show port (port_id) gro\n"
+                       "    Display GRO configuration.\n\n"
+
+                       "set gro flush (cycles)\n"
+                       "    Set the cycle to flush GROed packets from"
+                       " reassembly tables.\n\n"
+
+                       "set port (port_id) gso (on|off)"
+                       "    Enable or disable Generic Segmentation Offload in"
+                       " csum forwarding engine.\n\n"
+
+                       "set gso segsz (length)\n"
+                       "    Set max packet length for output GSO segments,"
+                       " including packet header and payload.\n\n"
+
+                       "show port (port_id) gso\n"
+                       "    Show GSO configuration.\n\n"
+
                        "set fwd (%s)\n"
                        "    Set packet forwarding mode.\n\n"
 
@@ -356,9 +454,18 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "mac_addr remove (port_id) (XX:XX:XX:XX:XX:XX)\n"
                        "    Remove a MAC address from port_id.\n\n"
 
+                       "mac_addr set (port_id) (XX:XX:XX:XX:XX:XX)\n"
+                       "    Set the default MAC address for port_id.\n\n"
+
                        "mac_addr add port (port_id) vf (vf_id) (mac_address)\n"
                        "    Add a MAC address for a VF on the port.\n\n"
 
+                       "set vf mac addr (port_id) (vf_id) (XX:XX:XX:XX:XX:XX)\n"
+                       "    Set the MAC address for a VF from the PF.\n\n"
+
+                       "set eth-peer (port_id) (peer_addr)\n"
+                       "    set the peer address for certain port.\n\n"
+
                        "set port (port_id) uta (mac_address|all) (on|off)\n"
                        "    Add/Remove a or all unicast hash filter(s)"
                        "from port X.\n\n"
@@ -369,6 +476,12 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "set allmulti (port_id|all) (on|off)\n"
                        "    Set the allmulti mode on port_id, or all.\n\n"
 
+                       "set vf promisc (port_id) (vf_id) (on|off)\n"
+                       "    Set unicast promiscuous mode for a VF from the PF.\n\n"
+
+                       "set vf allmulti (port_id) (vf_id) (on|off)\n"
+                       "    Set multicast promiscuous mode for a VF from the PF.\n\n"
+
                        "set flow_ctrl rx (on|off) tx (on|off) (high_water)"
                        " (low_water) (pause_time) (send_xon) mac_ctrl_frame_fwd"
                        " (on|off) autoneg (on|off) (port_id)\n"
@@ -393,6 +506,10 @@ 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 xstats-hide-zero on|off\n"
+                       "    Set the option to hide the zero values"
+                       " for xstats display.\n"
+
                        "set port (port_id) vf (vf_id) rx|tx on|off\n"
                        "    Enable/Disable a VF receive/tranmit from a port\n\n"
 
@@ -438,7 +555,6 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "   Flush (default) or don't flush RX streams before"
                        " forwarding. Mainly used with PCAP drivers.\n\n"
 
-                       #ifdef RTE_NIC_BYPASS
                        "set bypass mode (normal|bypass|isolate) (port_id)\n"
                        "   Set the bypass mode for the lowest port on bypass enabled"
                        " NIC.\n\n"
@@ -461,7 +577,7 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "show bypass config (port_id)\n"
                        "   Show the bypass configuration for a bypass enabled NIC"
                        " using the lowest port on the NIC.\n\n"
-#endif
+
 #ifdef RTE_LIBRTE_PMD_BOND
                        "create bonded device (mode) (socket)\n"
                        "       Create a new bonded device with specific bonding mode and socket.\n\n"
@@ -484,11 +600,18 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "set bonding mac_addr (port_id) (address)\n"
                        "       Set the MAC address of a bonded device.\n\n"
 
+                       "set bonding mode IEEE802.3AD aggregator policy (port_id) (agg_name)"
+                       "       Set Aggregation mode for IEEE802.3AD (mode 4)"
+
                        "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"
+
+                       "set bonding lacp dedicated_queues <port_id> (enable|disable)\n"
+                       "       Enable/disable dedicated queues for LACP control traffic.\n\n"
+
 #endif
                        "set link-up port (port_id)\n"
                        "       Set link up for a port.\n\n"
@@ -517,6 +640,140 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "E-tag set filter del e-tag-id (value) port (port_id)\n"
                        "    Delete an E-tag forwarding filter on a port\n\n"
 
+#if defined RTE_LIBRTE_PMD_SOFTNIC && defined RTE_LIBRTE_SCHED
+                       "set port tm hierarchy default (port_id)\n"
+                       "       Set default traffic Management hierarchy on a port\n\n"
+
+#endif
+                       "ddp add (port_id) (profile_path[,backup_profile_path])\n"
+                       "    Load a profile package on a port\n\n"
+
+                       "ddp del (port_id) (backup_profile_path)\n"
+                       "    Delete a profile package from a port\n\n"
+
+                       "ptype mapping get (port_id) (valid_only)\n"
+                       "    Get ptype mapping on a port\n\n"
+
+                       "ptype mapping replace (port_id) (target) (mask) (pky_type)\n"
+                       "    Replace target with the pkt_type in ptype mapping\n\n"
+
+                       "ptype mapping reset (port_id)\n"
+                       "    Reset ptype mapping on a port\n\n"
+
+                       "ptype mapping update (port_id) (hw_ptype) (sw_ptype)\n"
+                       "    Update a ptype mapping item on a port\n\n"
+
+                       "set port (port_id) queue-region region_id (value) "
+                       "queue_start_index (value) queue_num (value)\n"
+                       "    Set a queue region on a port\n\n"
+
+                       "set port (port_id) queue-region region_id (value) "
+                       "flowtype (value)\n"
+                       "    Set a flowtype region index on a port\n\n"
+
+                       "set port (port_id) queue-region UP (value) region_id (value)\n"
+                       "    Set the mapping of User Priority to "
+                       "queue region on a port\n\n"
+
+                       "set port (port_id) queue-region flush (on|off)\n"
+                       "    flush all queue region related configuration\n\n"
+
+                       "show port meter cap (port_id)\n"
+                       "    Show port meter capability information\n\n"
+
+                       "add port meter profile srtcm_rfc2697 (port_id) (profile_id) (cir) (cbs) (ebs)\n"
+                       "    meter profile add - srtcm rfc 2697\n\n"
+
+                       "add port meter profile trtcm_rfc2698 (port_id) (profile_id) (cir) (pir) (cbs) (pbs)\n"
+                       "    meter profile add - trtcm rfc 2698\n\n"
+
+                       "add port meter profile trtcm_rfc4115 (port_id) (profile_id) (cir) (eir) (cbs) (ebs)\n"
+                       "    meter profile add - trtcm rfc 4115\n\n"
+
+                       "del port meter profile (port_id) (profile_id)\n"
+                       "    meter profile delete\n\n"
+
+                       "create port meter (port_id) (mtr_id) (profile_id) (meter_enable)\n"
+                       "(g_action) (y_action) (r_action) (stats_mask) (shared)\n"
+                       "(use_pre_meter_color) [(dscp_tbl_entry0) (dscp_tbl_entry1)...\n"
+                       "(dscp_tbl_entry63)]\n"
+                       "    meter create\n\n"
+
+                       "enable port meter (port_id) (mtr_id)\n"
+                       "    meter enable\n\n"
+
+                       "disable port meter (port_id) (mtr_id)\n"
+                       "    meter disable\n\n"
+
+                       "del port meter (port_id) (mtr_id)\n"
+                       "    meter delete\n\n"
+
+                       "set port meter profile (port_id) (mtr_id) (profile_id)\n"
+                       "    meter update meter profile\n\n"
+
+                       "set port meter dscp table (port_id) (mtr_id) [(dscp_tbl_entry0)\n"
+                       "(dscp_tbl_entry1)...(dscp_tbl_entry63)]\n"
+                       "    update meter dscp table entries\n\n"
+
+                       "set port meter policer action (port_id) (mtr_id) (action_mask)\n"
+                       "(action0) [(action1) (action2)]\n"
+                       "    meter update policer action\n\n"
+
+                       "set port meter stats mask (port_id) (mtr_id) (stats_mask)\n"
+                       "    meter update stats\n\n"
+
+                       "show port (port_id) queue-region\n"
+                       "    show all queue region related configuration info\n\n"
+
+                       "add port tm node shaper profile (port_id) (shaper_profile_id)"
+                       " (tb_rate) (tb_size) (packet_length_adjust)\n"
+                       "       Add port tm node private shaper profile.\n\n"
+
+                       "del port tm node shaper profile (port_id) (shaper_profile_id)\n"
+                       "       Delete port tm node private shaper profile.\n\n"
+
+                       "add port tm node shared shaper (port_id) (shared_shaper_id)"
+                       " (shaper_profile_id)\n"
+                       "       Add/update port tm node shared shaper.\n\n"
+
+                       "del port tm node shared shaper (port_id) (shared_shaper_id)\n"
+                       "       Delete port tm node shared shaper.\n\n"
+
+                       "set port tm node shaper profile (port_id) (node_id)"
+                       " (shaper_profile_id)\n"
+                       "       Set port tm node shaper profile.\n\n"
+
+                       "add port tm node wred profile (port_id) (wred_profile_id)"
+                       " (color_g) (min_th_g) (max_th_g) (maxp_inv_g) (wq_log2_g)"
+                       " (color_y) (min_th_y) (max_th_y) (maxp_inv_y) (wq_log2_y)"
+                       " (color_r) (min_th_r) (max_th_r) (maxp_inv_r) (wq_log2_r)\n"
+                       "       Add port tm node wred profile.\n\n"
+
+                       "del port tm node wred profile (port_id) (wred_profile_id)\n"
+                       "       Delete port tm node wred profile.\n\n"
+
+                       "add port tm nonleaf node (port_id) (node_id) (parent_node_id)"
+                       " (priority) (weight) (level_id) (shaper_profile_id)"
+                       " (n_sp_priorities) (stats_mask) (n_shared_shapers)"
+                       " [(shared_shaper_id_0) (shared_shaper_id_1)...]\n"
+                       "       Add port tm nonleaf node.\n\n"
+
+                       "add port tm leaf node (port_id) (node_id) (parent_node_id)"
+                       " (priority) (weight) (level_id) (shaper_profile_id)"
+                       " (cman_mode) (wred_profile_id) (stats_mask) (n_shared_shapers)"
+                       " [(shared_shaper_id_0) (shared_shaper_id_1)...]\n"
+                       "       Add port tm leaf node.\n\n"
+
+                       "del port tm node (port_id) (node_id)\n"
+                       "       Delete port tm node.\n\n"
+
+                       "set port tm node parent (port_id) (node_id) (parent_node_id)"
+                       " (priority) (weight)\n"
+                       "       Set port tm node parent.\n\n"
+
+                       "port tm hierarchy commit (port_id) (clean_on_fail)\n"
+                       "       Commit tm hierarchy.\n\n"
+
                        , list_pkt_forwarding_modes()
                );
        }
@@ -545,7 +802,7 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "    Detach physical or virtual dev by port_id\n\n"
 
                        "port config (port_id|all)"
-                       " speed (10|100|1000|10000|40000|100000|auto)"
+                       " speed (10|100|1000|10000|25000|40000|50000|100000|auto)"
                        " duplex (half|full|auto)\n"
                        "    Set speed and duplex for all ports or port_id\n\n"
 
@@ -555,13 +812,14 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "port config all max-pkt-len (value)\n"
                        "    Set the max packet length.\n\n"
 
-                       "port config all (crc-strip|scatter|rx-cksum|hw-vlan|hw-vlan-filter|"
+                       "port config all (crc-strip|scatter|rx-cksum|rx-timestamp|hw-vlan|hw-vlan-filter|"
                        "hw-vlan-strip|hw-vlan-extend|drop-en)"
                        " (on|off)\n"
                        "    Set crc-strip/scatter/rx-checksum/hardware-vlan/drop_en"
                        " for ports.\n\n"
 
-                       "port config all rss (all|ip|tcp|udp|sctp|ether|port|vxlan|geneve|nvgre|none)\n"
+                       "port config all rss (all|ip|tcp|udp|sctp|ether|port|vxlan|"
+                       "geneve|nvgre|none|<flowtype_id>)\n"
                        "    Set the RSS mode.\n\n"
 
                        "port config port-id rss reta (hash,queue)[,(hash,queue)]\n"
@@ -596,6 +854,22 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "port config (port_id|all) l2-tunnel E-tag"
                        " (enable|disable)\n"
                        "    Enable/disable the E-tag support.\n\n"
+
+                       "port config (port_id) pctype mapping reset\n"
+                       "    Reset flow type to pctype mapping on a port\n\n"
+
+                       "port config (port_id) pctype mapping update"
+                       " (pctype_id_0[,pctype_id_1]*) (flow_type_id)\n"
+                       "    Update a flow type to pctype mapping item on a port\n\n"
+
+                       "port config (port_id) pctype (pctype_id) hash_inset|"
+                       "fdir_inset|fdir_flx_inset get|set|clear field\n"
+                       " (field_idx)\n"
+                       "    Configure RSS|FDIR|FDIR_FLX input set for some pctype\n\n"
+
+                       "port config (port_id) pctype (pctype_id) hash_inset|"
+                       "fdir_inset|fdir_flx_inset clear all"
+                       "    Clear RSS|FDIR|FDIR_FLX input set completely for some pctype\n\n"
                );
        }
 
@@ -711,6 +985,11 @@ static void cmd_help_long_parsed(void *parsed_result,
                        " queue (queue_id) fd_id (fd_id_value)\n"
                        "    Add/Del a Tunnel flow director filter.\n\n"
 
+                       "flow_director_filter (port_id) mode raw (add|del|update)"
+                       " flow (flow_id) (drop|fwd) queue (queue_id)"
+                       " fd_id (fd_id_value) packet (packet file name)\n"
+                       "    Add/Del a raw type flow director filter.\n\n"
+
                        "flush_flow_director (port_id)\n"
                        "    Flush all flow director entries of a device.\n\n"
 
@@ -758,8 +1037,8 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "set_hash_input_set (port_id) (ipv4|ipv4-frag|"
                        "ipv4-tcp|ipv4-udp|ipv4-sctp|ipv4-other|ipv6|"
                        "ipv6-frag|ipv6-tcp|ipv6-udp|ipv6-sctp|ipv6-other|"
-                       "l2_payload) (ovlan|ivlan|src-ipv4|dst-ipv4|src-ipv6|"
-                       "dst-ipv6|ipv4-tos|ipv4-proto|ipv6-tc|"
+                       "l2_payload|<flowtype_id>) (ovlan|ivlan|src-ipv4|dst-ipv4|"
+                       "src-ipv6|dst-ipv6|ipv4-tos|ipv4-proto|ipv6-tc|"
                        "ipv6-next-header|udp-src-port|udp-dst-port|"
                        "tcp-src-port|tcp-dst-port|sctp-src-port|"
                        "sctp-dst-port|sctp-veri-tag|udp-key|gre-key|fld-1st|"
@@ -777,6 +1056,37 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "sctp-src-port|sctp-dst-port|sctp-veri-tag|none)"
                        " (select|add)\n"
                        "    Set the input set for FDir.\n\n"
+
+                       "flow validate {port_id}"
+                       " [group {group_id}] [priority {level}]"
+                       " [ingress] [egress]"
+                       " pattern {item} [/ {item} [...]] / end"
+                       " actions {action} [/ {action} [...]] / end\n"
+                       "    Check whether a flow rule can be created.\n\n"
+
+                       "flow create {port_id}"
+                       " [group {group_id}] [priority {level}]"
+                       " [ingress] [egress]"
+                       " pattern {item} [/ {item} [...]] / end"
+                       " actions {action} [/ {action} [...]] / end\n"
+                       "    Create a flow rule.\n\n"
+
+                       "flow destroy {port_id} rule {rule_id} [...]\n"
+                       "    Destroy specific flow rules.\n\n"
+
+                       "flow flush {port_id}\n"
+                       "    Destroy all flow rules.\n\n"
+
+                       "flow query {port_id} {rule_id} {action}\n"
+                       "    Query an existing flow rule.\n\n"
+
+                       "flow list {port_id} [group {group_id}] [...]\n"
+                       "    List existing flow rules sorted by priority,"
+                       " filtered by group identifiers.\n\n"
+
+                       "flow isolate {port_id} {boolean}\n"
+                       "    Restrict ingress traffic to the defined"
+                       " flow rules\n\n"
                );
        }
 }
@@ -792,7 +1102,8 @@ cmdline_parse_token_string_t cmd_help_long_section =
 cmdline_parse_inst_t cmd_help_long = {
        .f = cmd_help_long_parsed,
        .data = NULL,
-       .help_str = "show help",
+       .help_str = "help all|control|display|config|ports|register|filters: "
+               "Show help",
        .tokens = {
                (void *)&cmd_help_long_help,
                (void *)&cmd_help_long_section,
@@ -820,6 +1131,8 @@ static void cmd_operate_port_parsed(void *parsed_result,
                stop_port(RTE_PORT_ALL);
        else if (!strcmp(res->name, "close"))
                close_port(RTE_PORT_ALL);
+       else if (!strcmp(res->name, "reset"))
+               reset_port(RTE_PORT_ALL);
        else
                printf("Unknown parameter\n");
 }
@@ -829,14 +1142,14 @@ cmdline_parse_token_string_t cmd_operate_port_all_cmd =
                                                                "port");
 cmdline_parse_token_string_t cmd_operate_port_all_port =
        TOKEN_STRING_INITIALIZER(struct cmd_operate_port_result, name,
-                                               "start#stop#close");
+                                               "start#stop#close#reset");
 cmdline_parse_token_string_t cmd_operate_port_all_all =
        TOKEN_STRING_INITIALIZER(struct cmd_operate_port_result, value, "all");
 
 cmdline_parse_inst_t cmd_operate_port = {
        .f = cmd_operate_port_parsed,
        .data = NULL,
-       .help_str = "port start|stop|close all: start/stop/close all ports",
+       .help_str = "port start|stop|close all: Start/Stop/Close/Reset all ports",
        .tokens = {
                (void *)&cmd_operate_port_all_cmd,
                (void *)&cmd_operate_port_all_port,
@@ -864,6 +1177,8 @@ static void cmd_operate_specific_port_parsed(void *parsed_result,
                stop_port(res->value);
        else if (!strcmp(res->name, "close"))
                close_port(res->value);
+       else if (!strcmp(res->name, "reset"))
+               reset_port(res->value);
        else
                printf("Unknown parameter\n");
 }
@@ -873,7 +1188,7 @@ cmdline_parse_token_string_t cmd_operate_specific_port_cmd =
                                                        keyword, "port");
 cmdline_parse_token_string_t cmd_operate_specific_port_port =
        TOKEN_STRING_INITIALIZER(struct cmd_operate_specific_port_result,
-                                               name, "start#stop#close");
+                                               name, "start#stop#close#reset");
 cmdline_parse_token_num_t cmd_operate_specific_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_operate_specific_port_result,
                                                        value, UINT8);
@@ -881,7 +1196,7 @@ cmdline_parse_token_num_t cmd_operate_specific_port_id =
 cmdline_parse_inst_t cmd_operate_specific_port = {
        .f = cmd_operate_specific_port_parsed,
        .data = NULL,
-       .help_str = "port start|stop|close X: start/stop/close port X",
+       .help_str = "port start|stop|close <port_id>: Start/Stop/Close/Reset port_id",
        .tokens = {
                (void *)&cmd_operate_specific_port_cmd,
                (void *)&cmd_operate_specific_port_port,
@@ -922,8 +1237,8 @@ cmdline_parse_token_string_t cmd_operate_attach_port_identifier =
 cmdline_parse_inst_t cmd_operate_attach_port = {
        .f = cmd_operate_attach_port_parsed,
        .data = NULL,
-       .help_str = "port attach identifier, "
-               "identifier: pci address or virtual dev name",
+       .help_str = "port attach <identifier>: "
+               "(identifier: pci address or virtual dev name)",
        .tokens = {
                (void *)&cmd_operate_attach_port_port,
                (void *)&cmd_operate_attach_port_keyword,
@@ -936,7 +1251,7 @@ cmdline_parse_inst_t cmd_operate_attach_port = {
 struct cmd_operate_detach_port_result {
        cmdline_fixed_string_t port;
        cmdline_fixed_string_t keyword;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void cmd_operate_detach_port_parsed(void *parsed_result,
@@ -959,12 +1274,12 @@ cmdline_parse_token_string_t cmd_operate_detach_port_keyword =
                        keyword, "detach");
 cmdline_parse_token_num_t cmd_operate_detach_port_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_operate_detach_port_result,
-                       port_id, UINT8);
+                       port_id, UINT16);
 
 cmdline_parse_inst_t cmd_operate_detach_port = {
        .f = cmd_operate_detach_port_parsed,
        .data = NULL,
-       .help_str = "port detach port_id",
+       .help_str = "port detach <port_id>",
        .tokens = {
                (void *)&cmd_operate_detach_port_port,
                (void *)&cmd_operate_detach_port_keyword,
@@ -1016,8 +1331,12 @@ parse_and_check_speed_duplex(char *speedstr, char *duplexstr, uint32_t *speed)
                        *speed = ETH_LINK_SPEED_1G;
                } else if (!strcmp(speedstr, "10000")) {
                        *speed = ETH_LINK_SPEED_10G;
+               } else if (!strcmp(speedstr, "25000")) {
+                       *speed = ETH_LINK_SPEED_25G;
                } else if (!strcmp(speedstr, "40000")) {
                        *speed = ETH_LINK_SPEED_40G;
+               } else if (!strcmp(speedstr, "50000")) {
+                       *speed = ETH_LINK_SPEED_50G;
                } else if (!strcmp(speedstr, "100000")) {
                        *speed = ETH_LINK_SPEED_100G;
                } else if (!strcmp(speedstr, "auto")) {
@@ -1049,7 +1368,7 @@ cmd_config_speed_all_parsed(void *parsed_result,
                        &link_speed) < 0)
                return;
 
-       FOREACH_PORT(pid, ports) {
+       RTE_ETH_FOREACH_DEV(pid) {
                ports[pid].dev_conf.link_speeds = link_speed;
        }
 
@@ -1067,7 +1386,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#40000#100000#auto");
+                               "10#100#1000#10000#25000#40000#50000#100000#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 =
@@ -1077,7 +1396,8 @@ 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|40000|100000|auto duplex "
+       .help_str = "port config all speed "
+               "10|100|1000|10000|25000|40000|50000|100000|auto duplex "
                                                        "half|full|auto",
        .tokens = {
                (void *)&cmd_config_speed_all_port,
@@ -1141,7 +1461,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#40000#100000#auto");
+                               "10#100#1000#10000#25000#40000#50000#100000#auto");
 cmdline_parse_token_string_t cmd_config_speed_specific_item2 =
        TOKEN_STRING_INITIALIZER(struct cmd_config_speed_specific, item2,
                                                                "duplex");
@@ -1152,7 +1472,8 @@ 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|40000|100000|auto duplex "
+       .help_str = "port config <port_id> speed "
+               "10|100|1000|10000|25000|40000|50000|100000|auto duplex "
                                                        "half|full|auto",
        .tokens = {
                (void *)&cmd_config_speed_specific_port,
@@ -1191,6 +1512,8 @@ cmd_config_rx_tx_parsed(void *parsed_result,
                        printf("Warning: Either rx or tx queues should be non zero\n");
                        return;
                }
+               if (check_nb_rxq(res->value) != 0)
+                       return;
                nb_rxq = res->value;
        }
        else if (!strcmp(res->name, "txq")) {
@@ -1198,6 +1521,8 @@ cmd_config_rx_tx_parsed(void *parsed_result,
                        printf("Warning: Either rx or tx queues should be non zero\n");
                        return;
                }
+               if (check_nb_txq(res->value) != 0)
+                       return;
                nb_txq = res->value;
        }
        else if (!strcmp(res->name, "rxd")) {
@@ -1241,7 +1566,7 @@ cmdline_parse_token_num_t cmd_config_rx_tx_value =
 cmdline_parse_inst_t cmd_config_rx_tx = {
        .f = cmd_config_rx_tx_parsed,
        .data = NULL,
-       .help_str = "port config all rxq|txq|rxd|txd value",
+       .help_str = "port config all rxq|txq|rxd|txd <value>",
        .tokens = {
                (void *)&cmd_config_rx_tx_port,
                (void *)&cmd_config_rx_tx_keyword,
@@ -1267,29 +1592,36 @@ cmd_config_max_pkt_len_parsed(void *parsed_result,
                                __attribute__((unused)) void *data)
 {
        struct cmd_config_max_pkt_len_result *res = parsed_result;
+       portid_t pid;
 
        if (!all_ports_stopped()) {
                printf("Please stop all ports first\n");
                return;
        }
 
-       if (!strcmp(res->name, "max-pkt-len")) {
-               if (res->value < ETHER_MIN_LEN) {
-                       printf("max-pkt-len can not be less than %d\n",
-                                                       ETHER_MIN_LEN);
+       RTE_ETH_FOREACH_DEV(pid) {
+               struct rte_port *port = &ports[pid];
+               uint64_t rx_offloads = port->dev_conf.rxmode.offloads;
+
+               if (!strcmp(res->name, "max-pkt-len")) {
+                       if (res->value < ETHER_MIN_LEN) {
+                               printf("max-pkt-len can not be less than %d\n",
+                                               ETHER_MIN_LEN);
+                               return;
+                       }
+                       if (res->value == port->dev_conf.rxmode.max_rx_pkt_len)
+                               return;
+
+                       port->dev_conf.rxmode.max_rx_pkt_len = res->value;
+                       if (res->value > ETHER_MAX_LEN)
+                               rx_offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME;
+                       else
+                               rx_offloads &= ~DEV_RX_OFFLOAD_JUMBO_FRAME;
+                       port->dev_conf.rxmode.offloads = rx_offloads;
+               } else {
+                       printf("Unknown parameter\n");
                        return;
                }
-               if (res->value == rx_mode.max_rx_pkt_len)
-                       return;
-
-               rx_mode.max_rx_pkt_len = res->value;
-               if (res->value > ETHER_MAX_LEN)
-                       rx_mode.jumbo_frame = 1;
-               else
-                       rx_mode.jumbo_frame = 0;
-       } else {
-               printf("Unknown parameter\n");
-               return;
        }
 
        init_port_config();
@@ -1316,7 +1648,7 @@ cmdline_parse_token_num_t cmd_config_max_pkt_len_value =
 cmdline_parse_inst_t cmd_config_max_pkt_len = {
        .f = cmd_config_max_pkt_len_parsed,
        .data = NULL,
-       .help_str = "port config all max-pkt-len value",
+       .help_str = "port config all max-pkt-len <value>",
        .tokens = {
                (void *)&cmd_config_max_pkt_len_port,
                (void *)&cmd_config_max_pkt_len_keyword,
@@ -1332,7 +1664,7 @@ struct cmd_config_mtu_result {
        cmdline_fixed_string_t port;
        cmdline_fixed_string_t keyword;
        cmdline_fixed_string_t mtu;
-       uint8_t port_id;
+       portid_t port_id;
        uint16_t value;
 };
 
@@ -1360,14 +1692,14 @@ cmdline_parse_token_string_t cmd_config_mtu_mtu =
        TOKEN_STRING_INITIALIZER(struct cmd_config_mtu_result, keyword,
                                 "mtu");
 cmdline_parse_token_num_t cmd_config_mtu_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, port_id, UINT16);
 cmdline_parse_token_num_t cmd_config_mtu_value =
        TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, value, UINT16);
 
 cmdline_parse_inst_t cmd_config_mtu = {
        .f = cmd_config_mtu_parsed,
        .data = NULL,
-       .help_str = "port config mtu port_id value",
+       .help_str = "port config mtu <port_id> <value>",
        .tokens = {
                (void *)&cmd_config_mtu_port,
                (void *)&cmd_config_mtu_keyword,
@@ -1393,91 +1725,107 @@ cmd_config_rx_mode_flag_parsed(void *parsed_result,
                                __attribute__((unused)) void *data)
 {
        struct cmd_config_rx_mode_flag *res = parsed_result;
+       portid_t pid;
 
        if (!all_ports_stopped()) {
                printf("Please stop all ports first\n");
                return;
        }
 
-       if (!strcmp(res->name, "crc-strip")) {
-               if (!strcmp(res->value, "on"))
-                       rx_mode.hw_strip_crc = 1;
-               else if (!strcmp(res->value, "off"))
-                       rx_mode.hw_strip_crc = 0;
-               else {
-                       printf("Unknown parameter\n");
-                       return;
-               }
-       } else if (!strcmp(res->name, "scatter")) {
-               if (!strcmp(res->value, "on"))
-                       rx_mode.enable_scatter = 1;
-               else if (!strcmp(res->value, "off"))
-                       rx_mode.enable_scatter = 0;
-               else {
-                       printf("Unknown parameter\n");
-                       return;
-               }
-       } else if (!strcmp(res->name, "rx-cksum")) {
-               if (!strcmp(res->value, "on"))
-                       rx_mode.hw_ip_checksum = 1;
-               else if (!strcmp(res->value, "off"))
-                       rx_mode.hw_ip_checksum = 0;
-               else {
-                       printf("Unknown parameter\n");
-                       return;
-               }
-       } else if (!strcmp(res->name, "hw-vlan")) {
-               if (!strcmp(res->value, "on")) {
-                       rx_mode.hw_vlan_filter = 1;
-                       rx_mode.hw_vlan_strip  = 1;
-               }
-               else if (!strcmp(res->value, "off")) {
-                       rx_mode.hw_vlan_filter = 0;
-                       rx_mode.hw_vlan_strip  = 0;
-               }
-               else {
-                       printf("Unknown parameter\n");
-                       return;
-               }
-       } else if (!strcmp(res->name, "hw-vlan-filter")) {
-               if (!strcmp(res->value, "on"))
-                       rx_mode.hw_vlan_filter = 1;
-               else if (!strcmp(res->value, "off"))
-                       rx_mode.hw_vlan_filter = 0;
-               else {
-                       printf("Unknown parameter\n");
-                       return;
-               }
-       } else if (!strcmp(res->name, "hw-vlan-strip")) {
-               if (!strcmp(res->value, "on"))
-                       rx_mode.hw_vlan_strip  = 1;
-               else if (!strcmp(res->value, "off"))
-                       rx_mode.hw_vlan_strip  = 0;
-               else {
-                       printf("Unknown parameter\n");
-                       return;
-               }
-       } else if (!strcmp(res->name, "hw-vlan-extend")) {
-               if (!strcmp(res->value, "on"))
-                       rx_mode.hw_vlan_extend = 1;
-               else if (!strcmp(res->value, "off"))
-                       rx_mode.hw_vlan_extend = 0;
-               else {
-                       printf("Unknown parameter\n");
-                       return;
-               }
-       } else if (!strcmp(res->name, "drop-en")) {
-               if (!strcmp(res->value, "on"))
-                       rx_drop_en = 1;
-               else if (!strcmp(res->value, "off"))
-                       rx_drop_en = 0;
-               else {
+       RTE_ETH_FOREACH_DEV(pid) {
+               struct rte_port *port;
+               uint64_t rx_offloads;
+
+               port = &ports[pid];
+               rx_offloads = port->dev_conf.rxmode.offloads;
+               if (!strcmp(res->name, "crc-strip")) {
+                       if (!strcmp(res->value, "on"))
+                               rx_offloads |= DEV_RX_OFFLOAD_CRC_STRIP;
+                       else if (!strcmp(res->value, "off"))
+                               rx_offloads &= ~DEV_RX_OFFLOAD_CRC_STRIP;
+                       else {
+                               printf("Unknown parameter\n");
+                               return;
+                       }
+               } else if (!strcmp(res->name, "scatter")) {
+                       if (!strcmp(res->value, "on")) {
+                               rx_offloads |= DEV_RX_OFFLOAD_SCATTER;
+                       } else if (!strcmp(res->value, "off")) {
+                               rx_offloads &= ~DEV_RX_OFFLOAD_SCATTER;
+                       } else {
+                               printf("Unknown parameter\n");
+                               return;
+                       }
+               } else if (!strcmp(res->name, "rx-cksum")) {
+                       if (!strcmp(res->value, "on"))
+                               rx_offloads |= DEV_RX_OFFLOAD_CHECKSUM;
+                       else if (!strcmp(res->value, "off"))
+                               rx_offloads &= ~DEV_RX_OFFLOAD_CHECKSUM;
+                       else {
+                               printf("Unknown parameter\n");
+                               return;
+                       }
+               } else if (!strcmp(res->name, "rx-timestamp")) {
+                       if (!strcmp(res->value, "on"))
+                               rx_offloads |= DEV_RX_OFFLOAD_TIMESTAMP;
+                       else if (!strcmp(res->value, "off"))
+                               rx_offloads &= ~DEV_RX_OFFLOAD_TIMESTAMP;
+                       else {
+                               printf("Unknown parameter\n");
+                               return;
+                       }
+               } else if (!strcmp(res->name, "hw-vlan")) {
+                       if (!strcmp(res->value, "on")) {
+                               rx_offloads |= (DEV_RX_OFFLOAD_VLAN_FILTER |
+                                               DEV_RX_OFFLOAD_VLAN_STRIP);
+                       } else if (!strcmp(res->value, "off")) {
+                               rx_offloads &= ~(DEV_RX_OFFLOAD_VLAN_FILTER |
+                                               DEV_RX_OFFLOAD_VLAN_STRIP);
+                       } else {
+                               printf("Unknown parameter\n");
+                               return;
+                       }
+               } else if (!strcmp(res->name, "hw-vlan-filter")) {
+                       if (!strcmp(res->value, "on"))
+                               rx_offloads |= DEV_RX_OFFLOAD_VLAN_FILTER;
+                       else if (!strcmp(res->value, "off"))
+                               rx_offloads &= ~DEV_RX_OFFLOAD_VLAN_FILTER;
+                       else {
+                               printf("Unknown parameter\n");
+                               return;
+                       }
+               } else if (!strcmp(res->name, "hw-vlan-strip")) {
+                       if (!strcmp(res->value, "on"))
+                               rx_offloads |= DEV_RX_OFFLOAD_VLAN_STRIP;
+                       else if (!strcmp(res->value, "off"))
+                               rx_offloads &= ~DEV_RX_OFFLOAD_VLAN_STRIP;
+                       else {
+                               printf("Unknown parameter\n");
+                               return;
+                       }
+               } else if (!strcmp(res->name, "hw-vlan-extend")) {
+                       if (!strcmp(res->value, "on"))
+                               rx_offloads |= DEV_RX_OFFLOAD_VLAN_EXTEND;
+                       else if (!strcmp(res->value, "off"))
+                               rx_offloads &= ~DEV_RX_OFFLOAD_VLAN_EXTEND;
+                       else {
+                               printf("Unknown parameter\n");
+                               return;
+                       }
+               } else if (!strcmp(res->name, "drop-en")) {
+                       if (!strcmp(res->value, "on"))
+                               rx_drop_en = 1;
+                       else if (!strcmp(res->value, "off"))
+                               rx_drop_en = 0;
+                       else {
+                               printf("Unknown parameter\n");
+                               return;
+                       }
+               } else {
                        printf("Unknown parameter\n");
                        return;
                }
-       } else {
-               printf("Unknown parameter\n");
-               return;
+               port->dev_conf.rxmode.offloads = rx_offloads;
        }
 
        init_port_config();
@@ -1494,7 +1842,7 @@ cmdline_parse_token_string_t cmd_config_rx_mode_flag_all =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rx_mode_flag, all, "all");
 cmdline_parse_token_string_t cmd_config_rx_mode_flag_name =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rx_mode_flag, name,
-                                       "crc-strip#scatter#rx-cksum#hw-vlan#"
+                                       "crc-strip#scatter#rx-cksum#rx-timestamp#hw-vlan#"
                                        "hw-vlan-filter#hw-vlan-strip#hw-vlan-extend");
 cmdline_parse_token_string_t cmd_config_rx_mode_flag_value =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rx_mode_flag, value,
@@ -1503,7 +1851,7 @@ cmdline_parse_token_string_t cmd_config_rx_mode_flag_value =
 cmdline_parse_inst_t cmd_config_rx_mode_flag = {
        .f = cmd_config_rx_mode_flag_parsed,
        .data = NULL,
-       .help_str = "port config all crc-strip|scatter|rx-cksum|hw-vlan|"
+       .help_str = "port config all crc-strip|scatter|rx-cksum|rx-timestamp|hw-vlan|"
                "hw-vlan-filter|hw-vlan-strip|hw-vlan-extend on|off",
        .tokens = {
                (void *)&cmd_config_rx_mode_flag_port,
@@ -1530,7 +1878,7 @@ cmd_config_rss_parsed(void *parsed_result,
                        __attribute__((unused)) void *data)
 {
        struct cmd_config_rss *res = parsed_result;
-       struct rte_eth_rss_conf rss_conf;
+       struct rte_eth_rss_conf rss_conf = { .rss_key_len = 0, };
        int diag;
        uint8_t i;
 
@@ -1558,6 +1906,9 @@ cmd_config_rss_parsed(void *parsed_result,
                rss_conf.rss_hf = ETH_RSS_NVGRE;
        else if (!strcmp(res->value, "none"))
                rss_conf.rss_hf = 0;
+       else if (isdigit(res->value[0]) && atoi(res->value) > 0 &&
+                                               atoi(res->value) < 64)
+               rss_conf.rss_hf = 1ULL << atoi(res->value);
        else {
                printf("Unknown parameter\n");
                return;
@@ -1581,13 +1932,13 @@ cmdline_parse_token_string_t cmd_config_rss_all =
 cmdline_parse_token_string_t cmd_config_rss_name =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rss, name, "rss");
 cmdline_parse_token_string_t cmd_config_rss_value =
-       TOKEN_STRING_INITIALIZER(struct cmd_config_rss, value,
-               "all#ip#tcp#udp#sctp#ether#port#vxlan#geneve#nvgre#none");
+       TOKEN_STRING_INITIALIZER(struct cmd_config_rss, value, NULL);
 
 cmdline_parse_inst_t cmd_config_rss = {
        .f = cmd_config_rss_parsed,
        .data = NULL,
-       .help_str = "port config all rss all|ip|tcp|udp|sctp|ether|port|vxlan|geneve|nvgre|none",
+       .help_str = "port config all rss "
+               "all|ip|tcp|udp|sctp|ether|port|vxlan|geneve|nvgre|none|<flowtype_id>",
        .tokens = {
                (void *)&cmd_config_rss_port,
                (void *)&cmd_config_rss_keyword,
@@ -1602,7 +1953,7 @@ cmdline_parse_inst_t cmd_config_rss = {
 struct cmd_config_rss_hash_key {
        cmdline_fixed_string_t port;
        cmdline_fixed_string_t config;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t rss_hash_key;
        cmdline_fixed_string_t rss_type;
        cmdline_fixed_string_t key;
@@ -1684,7 +2035,7 @@ cmdline_parse_token_string_t cmd_config_rss_hash_key_config =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key, config,
                                 "config");
 cmdline_parse_token_num_t cmd_config_rss_hash_key_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_config_rss_hash_key, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_config_rss_hash_key, port_id, UINT16);
 cmdline_parse_token_string_t cmd_config_rss_hash_key_rss_hash_key =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key,
                                 rss_hash_key, "rss-hash-key");
@@ -1700,12 +2051,11 @@ cmdline_parse_token_string_t cmd_config_rss_hash_key_value =
 cmdline_parse_inst_t cmd_config_rss_hash_key = {
        .f = cmd_config_rss_hash_key_parsed,
        .data = NULL,
-       .help_str =
-               "port config X rss-hash-key ipv4|ipv4-frag|ipv4-tcp|ipv4-udp|"
-               "ipv4-sctp|ipv4-other|ipv6|ipv6-frag|ipv6-tcp|ipv6-udp|"
-               "ipv6-sctp|ipv6-other|l2-payload|"
-               "ipv6-ex|ipv6-tcp-ex|ipv6-udp-ex "
-               "<string of hexa digits (variable length, NIC dependent)>\n",
+       .help_str = "port config <port_id> rss-hash-key "
+               "ipv4|ipv4-frag|ipv4-tcp|ipv4-udp|ipv4-sctp|ipv4-other|"
+               "ipv6|ipv6-frag|ipv6-tcp|ipv6-udp|ipv6-sctp|ipv6-other|"
+               "l2-payload|ipv6-ex|ipv6-tcp-ex|ipv6-udp-ex "
+               "<string of hex digits (variable length, NIC dependent)>",
        .tokens = {
                (void *)&cmd_config_rss_hash_key_port,
                (void *)&cmd_config_rss_hash_key_config,
@@ -1720,7 +2070,7 @@ 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;
+       portid_t portid;
        cmdline_fixed_string_t rxtxq;
        uint16_t qid;
        cmdline_fixed_string_t opname;
@@ -1788,7 +2138,7 @@ cmd_config_rxtx_queue_parsed(void *parsed_result,
 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);
+       TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_queue, portid, UINT16);
 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 =
@@ -1800,7 +2150,7 @@ cmdline_parse_token_string_t cmd_config_rxtx_queue_opname =
 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",
+       .help_str = "port <port_id> rxq|txq <queue_id> start|stop",
        .tokens = {
                (void *)&cmd_config_speed_all_port,
                (void *)&cmd_config_rxtx_queue_portid,
@@ -1815,7 +2165,7 @@ cmdline_parse_inst_t cmd_config_rxtx_queue = {
 struct cmd_config_rss_reta {
        cmdline_fixed_string_t port;
        cmdline_fixed_string_t keyword;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t name;
        cmdline_fixed_string_t list_name;
        cmdline_fixed_string_t list_of_items;
@@ -1924,7 +2274,7 @@ cmdline_parse_token_string_t cmd_config_rss_reta_port =
 cmdline_parse_token_string_t cmd_config_rss_reta_keyword =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rss_reta, keyword, "config");
 cmdline_parse_token_num_t cmd_config_rss_reta_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_config_rss_reta, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_config_rss_reta, port_id, UINT16);
 cmdline_parse_token_string_t cmd_config_rss_reta_name =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rss_reta, name, "rss");
 cmdline_parse_token_string_t cmd_config_rss_reta_list_name =
@@ -1935,7 +2285,7 @@ cmdline_parse_token_string_t cmd_config_rss_reta_list_of_items =
 cmdline_parse_inst_t cmd_config_rss_reta = {
        .f = cmd_set_rss_reta_parsed,
        .data = NULL,
-       .help_str = "port config X rss reta (hash,queue)[,(hash,queue)]",
+       .help_str = "port config <port_id> rss reta <hash,queue[,hash,queue]*>",
        .tokens = {
                (void *)&cmd_config_rss_reta_port,
                (void *)&cmd_config_rss_reta_keyword,
@@ -1951,7 +2301,7 @@ cmdline_parse_inst_t cmd_config_rss_reta = {
 struct cmd_showport_reta {
        cmdline_fixed_string_t show;
        cmdline_fixed_string_t port;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t rss;
        cmdline_fixed_string_t reta;
        uint16_t size;
@@ -1968,7 +2318,9 @@ showport_parse_reta_config(struct rte_eth_rss_reta_entry64 *conf,
        char s[256];
        char *end;
        char *str_fld[8];
-       uint16_t i, num = nb_entries / RTE_RETA_GROUP_SIZE;
+       uint16_t i;
+       uint16_t num = (nb_entries + RTE_RETA_GROUP_SIZE - 1) /
+                       RTE_RETA_GROUP_SIZE;
        int ret;
 
        p = strchr(p0, '(');
@@ -2004,12 +2356,14 @@ cmd_showport_reta_parsed(void *parsed_result,
        struct cmd_showport_reta *res = parsed_result;
        struct rte_eth_rss_reta_entry64 reta_conf[8];
        struct rte_eth_dev_info dev_info;
+       uint16_t max_reta_size;
 
        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);
+       max_reta_size = RTE_MIN(dev_info.reta_size, ETH_RSS_RETA_SIZE_512);
+       if (res->size == 0 || res->size > max_reta_size) {
+               printf("Invalid redirection table size: %u (1-%u)\n",
+                       res->size, max_reta_size);
                return;
        }
 
@@ -2028,7 +2382,7 @@ cmdline_parse_token_string_t cmd_showport_reta_show =
 cmdline_parse_token_string_t cmd_showport_reta_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, UINT16);
 cmdline_parse_token_string_t cmd_showport_reta_rss =
        TOKEN_STRING_INITIALIZER(struct cmd_showport_reta, rss, "rss");
 cmdline_parse_token_string_t cmd_showport_reta_reta =
@@ -2042,7 +2396,7 @@ cmdline_parse_token_string_t cmd_showport_reta_list_of_items =
 cmdline_parse_inst_t cmd_showport_reta = {
        .f = cmd_showport_reta_parsed,
        .data = NULL,
-       .help_str = "show port X rss reta (size) (mask0,mask1,...)",
+       .help_str = "show port <port_id> rss reta <size> <mask0[,mask1]*>",
        .tokens = {
                (void *)&cmd_showport_reta_show,
                (void *)&cmd_showport_reta_port,
@@ -2059,7 +2413,7 @@ cmdline_parse_inst_t cmd_showport_reta = {
 struct cmd_showport_rss_hash {
        cmdline_fixed_string_t show;
        cmdline_fixed_string_t port;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t rss_hash;
        cmdline_fixed_string_t rss_type;
        cmdline_fixed_string_t key; /* optional argument */
@@ -2080,7 +2434,7 @@ cmdline_parse_token_string_t cmd_showport_rss_hash_show =
 cmdline_parse_token_string_t cmd_showport_rss_hash_port =
        TOKEN_STRING_INITIALIZER(struct cmd_showport_rss_hash, port, "port");
 cmdline_parse_token_num_t cmd_showport_rss_hash_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_showport_rss_hash, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_showport_rss_hash, port_id, UINT16);
 cmdline_parse_token_string_t cmd_showport_rss_hash_rss_hash =
        TOKEN_STRING_INITIALIZER(struct cmd_showport_rss_hash, rss_hash,
                                 "rss-hash");
@@ -2096,11 +2450,10 @@ cmdline_parse_token_string_t cmd_showport_rss_hash_rss_key =
 cmdline_parse_inst_t cmd_showport_rss_hash = {
        .f = cmd_showport_rss_hash_parsed,
        .data = NULL,
-       .help_str =
-               "show port X rss-hash ipv4|ipv4-frag|ipv4-tcp|ipv4-udp|"
-               "ipv4-sctp|ipv4-other|ipv6|ipv6-frag|ipv6-tcp|ipv6-udp|"
-               "ipv6-sctp|ipv6-other|l2-payload|"
-               "ipv6-ex|ipv6-tcp-ex|ipv6-udp-ex (X = port number)\n",
+       .help_str = "show port <port_id> rss-hash "
+               "ipv4|ipv4-frag|ipv4-tcp|ipv4-udp|ipv4-sctp|ipv4-other|"
+               "ipv6|ipv6-frag|ipv6-tcp|ipv6-udp|ipv6-sctp|ipv6-other|"
+               "l2-payload|ipv6-ex|ipv6-tcp-ex|ipv6-udp-ex",
        .tokens = {
                (void *)&cmd_showport_rss_hash_show,
                (void *)&cmd_showport_rss_hash_port,
@@ -2114,11 +2467,10 @@ cmdline_parse_inst_t cmd_showport_rss_hash = {
 cmdline_parse_inst_t cmd_showport_rss_hash_key = {
        .f = cmd_showport_rss_hash_parsed,
        .data = (void *)1,
-       .help_str =
-               "show port X rss-hash ipv4|ipv4-frag|ipv4-tcp|ipv4-udp|"
-               "ipv4-sctp|ipv4-other|ipv6|ipv6-frag|ipv6-tcp|ipv6-udp|"
-               "ipv6-sctp|ipv6-other|l2-payload|"
-               "ipv6-ex|ipv6-tcp-ex|ipv6-udp-ex key (X = port number)\n",
+       .help_str = "show port <port_id> rss-hash "
+               "ipv4|ipv4-frag|ipv4-tcp|ipv4-udp|ipv4-sctp|ipv4-other|"
+               "ipv6|ipv6-frag|ipv6-tcp|ipv6-udp|ipv6-sctp|ipv6-other|"
+               "l2-payload|ipv6-ex|ipv6-tcp-ex|ipv6-udp-ex key",
        .tokens = {
                (void *)&cmd_showport_rss_hash_show,
                (void *)&cmd_showport_rss_hash_port,
@@ -2134,7 +2486,7 @@ cmdline_parse_inst_t cmd_showport_rss_hash_key = {
 struct cmd_config_dcb {
        cmdline_fixed_string_t port;
        cmdline_fixed_string_t config;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t dcb;
        cmdline_fixed_string_t vt;
        cmdline_fixed_string_t vt_en;
@@ -2200,7 +2552,7 @@ cmdline_parse_token_string_t cmd_config_dcb_port =
 cmdline_parse_token_string_t cmd_config_dcb_config =
         TOKEN_STRING_INITIALIZER(struct cmd_config_dcb, config, "config");
 cmdline_parse_token_num_t cmd_config_dcb_port_id =
-        TOKEN_NUM_INITIALIZER(struct cmd_config_dcb, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_config_dcb, port_id, UINT16);
 cmdline_parse_token_string_t cmd_config_dcb_dcb =
         TOKEN_STRING_INITIALIZER(struct cmd_config_dcb, dcb, "dcb");
 cmdline_parse_token_string_t cmd_config_dcb_vt =
@@ -2215,10 +2567,10 @@ cmdline_parse_token_string_t cmd_config_dcb_pfc_en =
         TOKEN_STRING_INITIALIZER(struct cmd_config_dcb, pfc_en, "on#off");
 
 cmdline_parse_inst_t cmd_config_dcb = {
-        .f = cmd_config_dcb_parsed,
-        .data = NULL,
-        .help_str = "port config port-id dcb vt on|off nb-tcs pfc on|off",
-        .tokens = {
+       .f = cmd_config_dcb_parsed,
+       .data = NULL,
+       .help_str = "port config <port-id> dcb vt on|off <num_tcs> pfc on|off",
+       .tokens = {
                (void *)&cmd_config_dcb_port,
                (void *)&cmd_config_dcb_config,
                (void *)&cmd_config_dcb_port_id,
@@ -2283,7 +2635,7 @@ cmdline_parse_token_num_t cmd_config_burst_value =
 cmdline_parse_inst_t cmd_config_burst = {
        .f = cmd_config_burst_parsed,
        .data = NULL,
-       .help_str = "port config all burst value",
+       .help_str = "port config all burst <value>",
        .tokens = {
                (void *)&cmd_config_burst_port,
                (void *)&cmd_config_burst_keyword,
@@ -2352,7 +2704,7 @@ cmdline_parse_token_num_t cmd_config_thresh_value =
 cmdline_parse_inst_t cmd_config_thresh = {
        .f = cmd_config_thresh_parsed,
        .data = NULL,
-       .help_str = "port config all txpt|txht|txwt|rxpt|rxht|rxwt value",
+       .help_str = "port config all txpt|txht|txwt|rxpt|rxht|rxwt <value>",
        .tokens = {
                (void *)&cmd_config_thresh_port,
                (void *)&cmd_config_thresh_keyword,
@@ -2416,7 +2768,7 @@ cmdline_parse_token_num_t cmd_config_threshold_value =
 cmdline_parse_inst_t cmd_config_threshold = {
        .f = cmd_config_threshold_parsed,
        .data = NULL,
-       .help_str = "port config all txfreet|txrst|rxfreet value",
+       .help_str = "port config all txfreet|txrst|rxfreet <value>",
        .tokens = {
                (void *)&cmd_config_threshold_port,
                (void *)&cmd_config_threshold_keyword,
@@ -2445,7 +2797,7 @@ cmdline_parse_token_string_t cmd_stop_stop =
 cmdline_parse_inst_t cmd_stop = {
        .f = cmd_stop_parsed,
        .data = NULL,
-       .help_str = "stop - stop packet forwarding",
+       .help_str = "stop: Stop packet forwarding",
        .tokens = {
                (void *)&cmd_stop_stop,
                NULL,
@@ -2575,7 +2927,7 @@ cmdline_parse_token_string_t cmd_set_list_of_items =
 cmdline_parse_inst_t cmd_set_fwd_list = {
        .f = cmd_set_list_parsed,
        .data = NULL,
-       .help_str = "set corelist|portlist x[,y]*",
+       .help_str = "set corelist|portlist <list0[,list1]*>",
        .tokens = {
                (void *)&cmd_set_list_keyword,
                (void *)&cmd_set_list_name,
@@ -2622,7 +2974,7 @@ cmdline_parse_token_num_t cmd_setmask_value =
 cmdline_parse_inst_t cmd_set_fwd_mask = {
        .f = cmd_set_mask_parsed,
        .data = NULL,
-       .help_str = "set coremask|portmask hexadecimal value",
+       .help_str = "set coremask|portmask <hexadecimal value>",
        .tokens = {
                (void *)&cmd_setmask_set,
                (void *)&cmd_setmask_mask,
@@ -2668,7 +3020,7 @@ cmdline_parse_token_num_t cmd_set_value =
 cmdline_parse_inst_t cmd_set_numbers = {
        .f = cmd_set_parsed,
        .data = NULL,
-       .help_str = "set nbport|nbcore|burst|verbose value",
+       .help_str = "set nbport|nbcore|burst|verbose <value>",
        .tokens = {
                (void *)&cmd_set_set,
                (void *)&cmd_set_what,
@@ -2677,6 +3029,55 @@ cmdline_parse_inst_t cmd_set_numbers = {
        },
 };
 
+/* *** SET LOG LEVEL CONFIGURATION *** */
+
+struct cmd_set_log_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t log;
+       cmdline_fixed_string_t type;
+       uint32_t level;
+};
+
+static void
+cmd_set_log_parsed(void *parsed_result,
+                  __attribute__((unused)) struct cmdline *cl,
+                  __attribute__((unused)) void *data)
+{
+       struct cmd_set_log_result *res;
+       int ret;
+
+       res = parsed_result;
+       if (!strcmp(res->type, "global"))
+               rte_log_set_global_level(res->level);
+       else {
+               ret = rte_log_set_level_regexp(res->type, res->level);
+               if (ret < 0)
+                       printf("Unable to set log level\n");
+       }
+}
+
+cmdline_parse_token_string_t cmd_set_log_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_log_result, set, "set");
+cmdline_parse_token_string_t cmd_set_log_log =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_log_result, log, "log");
+cmdline_parse_token_string_t cmd_set_log_type =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_log_result, type, NULL);
+cmdline_parse_token_num_t cmd_set_log_level =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_log_result, level, UINT32);
+
+cmdline_parse_inst_t cmd_set_log = {
+       .f = cmd_set_log_parsed,
+       .data = NULL,
+       .help_str = "set log global|<type> <level>",
+       .tokens = {
+               (void *)&cmd_set_log_set,
+               (void *)&cmd_set_log_log,
+               (void *)&cmd_set_log_type,
+               (void *)&cmd_set_log_level,
+               NULL,
+       },
+};
+
 /* *** SET SEGMENT LENGTHS OF TXONLY PACKETS *** */
 
 struct cmd_set_txpkts_result {
@@ -2714,7 +3115,7 @@ cmdline_parse_token_string_t cmd_set_txpkts_lengths =
 cmdline_parse_inst_t cmd_set_txpkts = {
        .f = cmd_set_txpkts_parsed,
        .data = NULL,
-       .help_str = "set txpkts x[,y]*",
+       .help_str = "set txpkts <len0[,len1]*>",
        .tokens = {
                (void *)&cmd_set_txpkts_keyword,
                (void *)&cmd_set_txpkts_name,
@@ -2764,80 +3165,12 @@ cmdline_parse_inst_t cmd_set_txsplit = {
        },
 };
 
-/* *** CONFIG TX QUEUE FLAGS *** */
-
-struct cmd_config_txqflags_result {
-       cmdline_fixed_string_t port;
-       cmdline_fixed_string_t config;
-       cmdline_fixed_string_t all;
-       cmdline_fixed_string_t what;
-       int32_t hexvalue;
-};
-
-static void cmd_config_txqflags_parsed(void *parsed_result,
-                               __attribute__((unused)) struct cmdline *cl,
-                               __attribute__((unused)) void *data)
-{
-       struct cmd_config_txqflags_result *res = parsed_result;
-
-       if (!all_ports_stopped()) {
-               printf("Please stop all ports first\n");
-               return;
-       }
-
-       if (strcmp(res->what, "txqflags")) {
-               printf("Unknown parameter\n");
-               return;
-       }
-
-       if (res->hexvalue >= 0) {
-               txq_flags = res->hexvalue;
-       } else {
-               printf("txqflags must be >= 0\n");
-               return;
-       }
-
-       init_port_config();
-
-       cmd_reconfig_device_queue(RTE_PORT_ALL, 1, 1);
-}
-
-cmdline_parse_token_string_t cmd_config_txqflags_port =
-       TOKEN_STRING_INITIALIZER(struct cmd_config_txqflags_result, port,
-                                "port");
-cmdline_parse_token_string_t cmd_config_txqflags_config =
-       TOKEN_STRING_INITIALIZER(struct cmd_config_txqflags_result, config,
-                                "config");
-cmdline_parse_token_string_t cmd_config_txqflags_all =
-       TOKEN_STRING_INITIALIZER(struct cmd_config_txqflags_result, all,
-                                "all");
-cmdline_parse_token_string_t cmd_config_txqflags_what =
-       TOKEN_STRING_INITIALIZER(struct cmd_config_txqflags_result, what,
-                                "txqflags");
-cmdline_parse_token_num_t cmd_config_txqflags_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_config_txqflags_result,
-                               hexvalue, INT32);
-
-cmdline_parse_inst_t cmd_config_txqflags = {
-       .f = cmd_config_txqflags_parsed,
-       .data = NULL,
-       .help_str = "port config all txqflags value",
-       .tokens = {
-               (void *)&cmd_config_txqflags_port,
-               (void *)&cmd_config_txqflags_config,
-               (void *)&cmd_config_txqflags_all,
-               (void *)&cmd_config_txqflags_what,
-               (void *)&cmd_config_txqflags_value,
-               NULL,
-       },
-};
-
 /* *** ADD/REMOVE ALL VLAN IDENTIFIERS TO/FROM A PORT VLAN RX FILTER *** */
 struct cmd_rx_vlan_filter_all_result {
        cmdline_fixed_string_t rx_vlan;
        cmdline_fixed_string_t what;
        cmdline_fixed_string_t all;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void
@@ -2864,13 +3197,14 @@ cmdline_parse_token_string_t cmd_rx_vlan_filter_all_all =
                                 all, "all");
 cmdline_parse_token_num_t cmd_rx_vlan_filter_all_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_rx_vlan_filter_all_result,
-                             port_id, UINT8);
+                             port_id, UINT16);
 
 cmdline_parse_inst_t cmd_rx_vlan_filter_all = {
        .f = cmd_rx_vlan_filter_all_parsed,
        .data = NULL,
-       .help_str = "add/remove all identifiers to/from the set of VLAN "
-       "Identifiers filtered by a port",
+       .help_str = "rx_vlan add|rm all <port_id>: "
+               "Add/Remove all identifiers to/from the set of VLAN "
+               "identifiers filtered by a port",
        .tokens = {
                (void *)&cmd_rx_vlan_filter_all_rx_vlan,
                (void *)&cmd_rx_vlan_filter_all_what,
@@ -2969,8 +3303,9 @@ cmdline_parse_token_string_t cmd_vlan_offload_portid =
 cmdline_parse_inst_t cmd_vlan_offload = {
        .f = cmd_vlan_offload_parsed,
        .data = NULL,
-       .help_str = "set strip|filter|qinq|stripq on|off port_id[,queue_id], filter/strip for rx side"
-       " qinq(extended) for both rx/tx sides ",
+       .help_str = "vlan set strip|filter|qinq|stripq on|off "
+               "<port_id[,queue_id]>: "
+               "Filter/Strip for rx side qinq(extended) for both rx/tx sides",
        .tokens = {
                (void *)&cmd_vlan_offload_vlan,
                (void *)&cmd_vlan_offload_set,
@@ -2988,7 +3323,7 @@ struct cmd_vlan_tpid_result {
        cmdline_fixed_string_t vlan_type;
        cmdline_fixed_string_t what;
        uint16_t tp_id;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void
@@ -3027,13 +3362,13 @@ cmdline_parse_token_num_t cmd_vlan_tpid_tpid =
                              tp_id, UINT16);
 cmdline_parse_token_num_t cmd_vlan_tpid_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_vlan_tpid_result,
-                             port_id, UINT8);
+                             port_id, UINT16);
 
 cmdline_parse_inst_t cmd_vlan_tpid = {
        .f = cmd_vlan_tpid_parsed,
        .data = NULL,
-       .help_str = "set inner|outer tpid tp_id port_id, set the VLAN "
-                   "Ether type",
+       .help_str = "vlan set inner|outer tpid <tp_id> <port_id>: "
+               "Set the VLAN Ether type",
        .tokens = {
                (void *)&cmd_vlan_tpid_vlan,
                (void *)&cmd_vlan_tpid_set,
@@ -3050,7 +3385,7 @@ struct cmd_rx_vlan_filter_result {
        cmdline_fixed_string_t rx_vlan;
        cmdline_fixed_string_t what;
        uint16_t vlan_id;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void
@@ -3077,13 +3412,14 @@ cmdline_parse_token_num_t cmd_rx_vlan_filter_vlanid =
                              vlan_id, UINT16);
 cmdline_parse_token_num_t cmd_rx_vlan_filter_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_rx_vlan_filter_result,
-                             port_id, UINT8);
+                             port_id, UINT16);
 
 cmdline_parse_inst_t cmd_rx_vlan_filter = {
        .f = cmd_rx_vlan_filter_parsed,
        .data = NULL,
-       .help_str = "add/remove a VLAN identifier to/from the set of VLAN "
-       "Identifiers filtered by a port",
+       .help_str = "rx_vlan add|rm <vlan_id> <port_id>: "
+               "Add/Remove a VLAN identifier to/from the set of VLAN "
+               "identifiers filtered by a port",
        .tokens = {
                (void *)&cmd_rx_vlan_filter_rx_vlan,
                (void *)&cmd_rx_vlan_filter_what,
@@ -3097,7 +3433,7 @@ cmdline_parse_inst_t cmd_rx_vlan_filter = {
 struct cmd_tx_vlan_set_result {
        cmdline_fixed_string_t tx_vlan;
        cmdline_fixed_string_t set;
-       uint8_t port_id;
+       portid_t port_id;
        uint16_t vlan_id;
 };
 
@@ -3108,7 +3444,14 @@ cmd_tx_vlan_set_parsed(void *parsed_result,
 {
        struct cmd_tx_vlan_set_result *res = parsed_result;
 
+       if (!port_is_stopped(res->port_id)) {
+               printf("Please stop port %d first\n", res->port_id);
+               return;
+       }
+
        tx_vlan_set(res->port_id, res->vlan_id);
+
+       cmd_reconfig_device_queue(res->port_id, 1, 1);
 }
 
 cmdline_parse_token_string_t cmd_tx_vlan_set_tx_vlan =
@@ -3119,7 +3462,7 @@ cmdline_parse_token_string_t cmd_tx_vlan_set_set =
                                 set, "set");
 cmdline_parse_token_num_t cmd_tx_vlan_set_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_result,
-                             port_id, UINT8);
+                             port_id, UINT16);
 cmdline_parse_token_num_t cmd_tx_vlan_set_vlanid =
        TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_result,
                              vlan_id, UINT16);
@@ -3127,7 +3470,8 @@ cmdline_parse_token_num_t cmd_tx_vlan_set_vlanid =
 cmdline_parse_inst_t cmd_tx_vlan_set = {
        .f = cmd_tx_vlan_set_parsed,
        .data = NULL,
-       .help_str = "enable hardware insertion of a single VLAN header "
+       .help_str = "tx_vlan set <port_id> <vlan_id>: "
+               "Enable hardware insertion of a single VLAN header "
                "with a given TAG Identifier in packets sent on a port",
        .tokens = {
                (void *)&cmd_tx_vlan_set_tx_vlan,
@@ -3142,7 +3486,7 @@ cmdline_parse_inst_t cmd_tx_vlan_set = {
 struct cmd_tx_vlan_set_qinq_result {
        cmdline_fixed_string_t tx_vlan;
        cmdline_fixed_string_t set;
-       uint8_t port_id;
+       portid_t port_id;
        uint16_t vlan_id;
        uint16_t vlan_id_outer;
 };
@@ -3154,7 +3498,14 @@ cmd_tx_vlan_set_qinq_parsed(void *parsed_result,
 {
        struct cmd_tx_vlan_set_qinq_result *res = parsed_result;
 
+       if (!port_is_stopped(res->port_id)) {
+               printf("Please stop port %d first\n", res->port_id);
+               return;
+       }
+
        tx_qinq_set(res->port_id, res->vlan_id, res->vlan_id_outer);
+
+       cmd_reconfig_device_queue(res->port_id, 1, 1);
 }
 
 cmdline_parse_token_string_t cmd_tx_vlan_set_qinq_tx_vlan =
@@ -3165,7 +3516,7 @@ cmdline_parse_token_string_t cmd_tx_vlan_set_qinq_set =
                set, "set");
 cmdline_parse_token_num_t cmd_tx_vlan_set_qinq_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_qinq_result,
-               port_id, UINT8);
+               port_id, UINT16);
 cmdline_parse_token_num_t cmd_tx_vlan_set_qinq_vlanid =
        TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_qinq_result,
                vlan_id, UINT16);
@@ -3176,7 +3527,8 @@ cmdline_parse_token_num_t cmd_tx_vlan_set_qinq_vlanid_outer =
 cmdline_parse_inst_t cmd_tx_vlan_set_qinq = {
        .f = cmd_tx_vlan_set_qinq_parsed,
        .data = NULL,
-       .help_str = "enable hardware insertion of double VLAN header "
+       .help_str = "tx_vlan set <port_id> <vlan_id> <outer_vlan_id>: "
+               "Enable hardware insertion of double VLAN header "
                "with given TAG Identifiers in packets sent on a port",
        .tokens = {
                (void *)&cmd_tx_vlan_set_qinq_tx_vlan,
@@ -3193,7 +3545,7 @@ struct cmd_tx_vlan_set_pvid_result {
        cmdline_fixed_string_t tx_vlan;
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t pvid;
-       uint8_t port_id;
+       portid_t port_id;
        uint16_t vlan_id;
        cmdline_fixed_string_t mode;
 };
@@ -3222,7 +3574,7 @@ cmdline_parse_token_string_t cmd_tx_vlan_set_pvid_pvid =
                                 pvid, "pvid");
 cmdline_parse_token_num_t cmd_tx_vlan_set_pvid_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_pvid_result,
-                            port_id, UINT8);
+                            port_id, UINT16);
 cmdline_parse_token_num_t cmd_tx_vlan_set_pvid_vlan_id =
        TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_pvid_result,
                              vlan_id, UINT16);
@@ -3233,7 +3585,7 @@ cmdline_parse_token_string_t cmd_tx_vlan_set_pvid_mode =
 cmdline_parse_inst_t cmd_tx_vlan_set_pvid = {
        .f = cmd_tx_vlan_set_pvid_parsed,
        .data = NULL,
-       .help_str = "tx_vlan set pvid port_id vlan_id (on|off)",
+       .help_str = "tx_vlan set pvid <port_id> <vlan_id> on|off",
        .tokens = {
                (void *)&cmd_tx_vlan_set_pvid_tx_vlan,
                (void *)&cmd_tx_vlan_set_pvid_set,
@@ -3249,7 +3601,7 @@ cmdline_parse_inst_t cmd_tx_vlan_set_pvid = {
 struct cmd_tx_vlan_reset_result {
        cmdline_fixed_string_t tx_vlan;
        cmdline_fixed_string_t reset;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void
@@ -3259,7 +3611,14 @@ cmd_tx_vlan_reset_parsed(void *parsed_result,
 {
        struct cmd_tx_vlan_reset_result *res = parsed_result;
 
+       if (!port_is_stopped(res->port_id)) {
+               printf("Please stop port %d first\n", res->port_id);
+               return;
+       }
+
        tx_vlan_reset(res->port_id);
+
+       cmd_reconfig_device_queue(res->port_id, 1, 1);
 }
 
 cmdline_parse_token_string_t cmd_tx_vlan_reset_tx_vlan =
@@ -3270,13 +3629,13 @@ cmdline_parse_token_string_t cmd_tx_vlan_reset_reset =
                                 reset, "reset");
 cmdline_parse_token_num_t cmd_tx_vlan_reset_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_reset_result,
-                             port_id, UINT8);
+                             port_id, UINT16);
 
 cmdline_parse_inst_t cmd_tx_vlan_reset = {
        .f = cmd_tx_vlan_reset_parsed,
        .data = NULL,
-       .help_str = "disable hardware insertion of a VLAN header in packets "
-       "sent on a port",
+       .help_str = "tx_vlan reset <port_id>: Disable hardware insertion of a "
+               "VLAN header in packets sent on a port",
        .tokens = {
                (void *)&cmd_tx_vlan_reset_tx_vlan,
                (void *)&cmd_tx_vlan_reset_reset,
@@ -3292,52 +3651,52 @@ struct cmd_csum_result {
        cmdline_fixed_string_t mode;
        cmdline_fixed_string_t proto;
        cmdline_fixed_string_t hwsw;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void
 csum_show(int port_id)
 {
        struct rte_eth_dev_info dev_info;
-       uint16_t ol_flags;
+       uint64_t tx_offloads;
 
-       ol_flags = ports[port_id].tx_ol_flags;
+       tx_offloads = ports[port_id].dev_conf.txmode.offloads;
        printf("Parse tunnel is %s\n",
-               (ol_flags & TESTPMD_TX_OFFLOAD_PARSE_TUNNEL) ? "on" : "off");
+               (ports[port_id].parse_tunnel) ? "on" : "off");
        printf("IP checksum offload is %s\n",
-               (ol_flags & TESTPMD_TX_OFFLOAD_IP_CKSUM) ? "hw" : "sw");
+               (tx_offloads & DEV_TX_OFFLOAD_IPV4_CKSUM) ? "hw" : "sw");
        printf("UDP checksum offload is %s\n",
-               (ol_flags & TESTPMD_TX_OFFLOAD_UDP_CKSUM) ? "hw" : "sw");
+               (tx_offloads & DEV_TX_OFFLOAD_UDP_CKSUM) ? "hw" : "sw");
        printf("TCP checksum offload is %s\n",
-               (ol_flags & TESTPMD_TX_OFFLOAD_TCP_CKSUM) ? "hw" : "sw");
+               (tx_offloads & DEV_TX_OFFLOAD_TCP_CKSUM) ? "hw" : "sw");
        printf("SCTP checksum offload is %s\n",
-               (ol_flags & TESTPMD_TX_OFFLOAD_SCTP_CKSUM) ? "hw" : "sw");
+               (tx_offloads & DEV_TX_OFFLOAD_SCTP_CKSUM) ? "hw" : "sw");
        printf("Outer-Ip checksum offload is %s\n",
-               (ol_flags & TESTPMD_TX_OFFLOAD_OUTER_IP_CKSUM) ? "hw" : "sw");
+               (tx_offloads & DEV_TX_OFFLOAD_OUTER_IPV4_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) &&
+       if ((tx_offloads & DEV_TX_OFFLOAD_IPV4_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) &&
+       if ((tx_offloads & DEV_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) &&
+       if ((tx_offloads & DEV_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) &&
+       if ((tx_offloads & DEV_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);
        }
-       if ((ol_flags & TESTPMD_TX_OFFLOAD_OUTER_IP_CKSUM) &&
+       if ((tx_offloads & DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM) &&
                (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM) == 0) {
                printf("Warning: hardware outer IP checksum enabled but not "
                        "supported by port %d\n", port_id);
@@ -3351,36 +3710,78 @@ cmd_csum_parsed(void *parsed_result,
 {
        struct cmd_csum_result *res = parsed_result;
        int hw = 0;
-       uint16_t mask = 0;
+       uint64_t csum_offloads = 0;
+       struct rte_eth_dev_info dev_info;
 
        if (port_id_is_invalid(res->port_id, ENABLED_WARN)) {
                printf("invalid port %d\n", res->port_id);
                return;
        }
+       if (!port_is_stopped(res->port_id)) {
+               printf("Please stop port %d first\n", res->port_id);
+               return;
+       }
 
+       rte_eth_dev_info_get(res->port_id, &dev_info);
        if (!strcmp(res->mode, "set")) {
 
                if (!strcmp(res->hwsw, "hw"))
                        hw = 1;
 
                if (!strcmp(res->proto, "ip")) {
-                       mask = TESTPMD_TX_OFFLOAD_IP_CKSUM;
+                       if (hw == 0 || (dev_info.tx_offload_capa &
+                                               DEV_TX_OFFLOAD_IPV4_CKSUM)) {
+                               csum_offloads |= DEV_TX_OFFLOAD_IPV4_CKSUM;
+                       } else {
+                               printf("IP checksum offload is not supported "
+                                      "by port %u\n", res->port_id);
+                       }
                } else if (!strcmp(res->proto, "udp")) {
-                       mask = TESTPMD_TX_OFFLOAD_UDP_CKSUM;
+                       if (hw == 0 || (dev_info.tx_offload_capa &
+                                               DEV_TX_OFFLOAD_UDP_CKSUM)) {
+                               csum_offloads |= DEV_TX_OFFLOAD_UDP_CKSUM;
+                       } else {
+                               printf("UDP checksum offload is not supported "
+                                      "by port %u\n", res->port_id);
+                       }
                } else if (!strcmp(res->proto, "tcp")) {
-                       mask = TESTPMD_TX_OFFLOAD_TCP_CKSUM;
+                       if (hw == 0 || (dev_info.tx_offload_capa &
+                                               DEV_TX_OFFLOAD_TCP_CKSUM)) {
+                               csum_offloads |= DEV_TX_OFFLOAD_TCP_CKSUM;
+                       } else {
+                               printf("TCP checksum offload is not supported "
+                                      "by port %u\n", res->port_id);
+                       }
                } else if (!strcmp(res->proto, "sctp")) {
-                       mask = TESTPMD_TX_OFFLOAD_SCTP_CKSUM;
+                       if (hw == 0 || (dev_info.tx_offload_capa &
+                                               DEV_TX_OFFLOAD_SCTP_CKSUM)) {
+                               csum_offloads |= DEV_TX_OFFLOAD_SCTP_CKSUM;
+                       } else {
+                               printf("SCTP checksum offload is not supported "
+                                      "by port %u\n", res->port_id);
+                       }
                } else if (!strcmp(res->proto, "outer-ip")) {
-                       mask = TESTPMD_TX_OFFLOAD_OUTER_IP_CKSUM;
+                       if (hw == 0 || (dev_info.tx_offload_capa &
+                                       DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM)) {
+                               csum_offloads |=
+                                               DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM;
+                       } else {
+                               printf("Outer IP checksum offload is not "
+                                      "supported by port %u\n", res->port_id);
+                       }
                }
 
-               if (hw)
-                       ports[res->port_id].tx_ol_flags |= mask;
-               else
-                       ports[res->port_id].tx_ol_flags &= (~mask);
+               if (hw) {
+                       ports[res->port_id].dev_conf.txmode.offloads |=
+                                                       csum_offloads;
+               } else {
+                       ports[res->port_id].dev_conf.txmode.offloads &=
+                                                       (~csum_offloads);
+               }
        }
        csum_show(res->port_id);
+
+       cmd_reconfig_device_queue(res->port_id, 1, 1);
 }
 
 cmdline_parse_token_string_t cmd_csum_csum =
@@ -3397,13 +3798,14 @@ cmdline_parse_token_string_t cmd_csum_hwsw =
                                hwsw, "hw#sw");
 cmdline_parse_token_num_t cmd_csum_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_csum_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 
 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|outer-ip hw|sw <port>",
+       .help_str = "csum set ip|tcp|udp|sctp|outer-ip hw|sw <port_id>: "
+               "Enable/Disable hardware calculation of L3/L4 checksum when "
+               "using csum forward engine",
        .tokens = {
                (void *)&cmd_csum_csum,
                (void *)&cmd_csum_mode,
@@ -3421,7 +3823,7 @@ cmdline_parse_token_string_t cmd_csum_mode_show =
 cmdline_parse_inst_t cmd_csum_show = {
        .f = cmd_csum_parsed,
        .data = NULL,
-       .help_str = "show checksum offload configuration: csum show <port>",
+       .help_str = "csum show <port_id>: Show checksum offload configuration",
        .tokens = {
                (void *)&cmd_csum_csum,
                (void *)&cmd_csum_mode_show,
@@ -3435,7 +3837,7 @@ struct cmd_csum_tunnel_result {
        cmdline_fixed_string_t csum;
        cmdline_fixed_string_t parse;
        cmdline_fixed_string_t onoff;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void
@@ -3449,11 +3851,9 @@ cmd_csum_tunnel_parsed(void *parsed_result,
                return;
 
        if (!strcmp(res->onoff, "on"))
-               ports[res->port_id].tx_ol_flags |=
-                       TESTPMD_TX_OFFLOAD_PARSE_TUNNEL;
+               ports[res->port_id].parse_tunnel = 1;
        else
-               ports[res->port_id].tx_ol_flags &=
-                       (~TESTPMD_TX_OFFLOAD_PARSE_TUNNEL);
+               ports[res->port_id].parse_tunnel = 0;
 
        csum_show(res->port_id);
 }
@@ -3469,13 +3869,13 @@ cmdline_parse_token_string_t cmd_csum_tunnel_onoff =
                                onoff, "on#off");
 cmdline_parse_token_num_t cmd_csum_tunnel_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_csum_tunnel_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 
 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>",
+       .help_str = "csum parse_tunnel on|off <port_id>: "
+               "Enable/Disable parsing of tunnels for csum engine",
        .tokens = {
                (void *)&cmd_csum_tunnel_csum,
                (void *)&cmd_csum_tunnel_parse,
@@ -3485,12 +3885,12 @@ cmdline_parse_inst_t cmd_csum_tunnel = {
        },
 };
 
-/* *** ENABLE HARDWARE SEGMENTATION IN TX PACKETS *** */
+/* *** ENABLE HARDWARE SEGMENTATION IN TX NON-TUNNELED PACKETS *** */
 struct cmd_tso_set_result {
        cmdline_fixed_string_t tso;
        cmdline_fixed_string_t mode;
        uint16_t tso_segsz;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void
@@ -3503,15 +3903,32 @@ cmd_tso_set_parsed(void *parsed_result,
 
        if (port_id_is_invalid(res->port_id, ENABLED_WARN))
                return;
+       if (!port_is_stopped(res->port_id)) {
+               printf("Please stop port %d first\n", 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",
+       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("Error: TSO is not supported by port %d\n",
+                      res->port_id);
+               return;
+       }
+
+       if (ports[res->port_id].tso_segsz == 0) {
+               ports[res->port_id].dev_conf.txmode.offloads &=
+                                               ~DEV_TX_OFFLOAD_TCP_TSO;
+               printf("TSO for non-tunneled packets is disabled\n");
+       } else {
+               ports[res->port_id].dev_conf.txmode.offloads |=
+                                               DEV_TX_OFFLOAD_TCP_TSO;
+               printf("TSO segment size for non-tunneled packets 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);
@@ -3520,6 +3937,8 @@ cmd_tso_set_parsed(void *parsed_result,
                printf("Warning: TSO enabled but not "
                        "supported by port %d\n", res->port_id);
        }
+
+       cmd_reconfig_device_queue(res->port_id, 1, 1);
 }
 
 cmdline_parse_token_string_t cmd_tso_set_tso =
@@ -3533,13 +3952,14 @@ cmdline_parse_token_num_t cmd_tso_set_tso_segsz =
                                tso_segsz, UINT16);
 cmdline_parse_token_num_t cmd_tso_set_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_tso_set_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 
 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>",
+       .help_str = "tso set <tso_segsz> <port_id>: "
+               "Set TSO segment size of non-tunneled packets for csum engine "
+               "(0 to disable)",
        .tokens = {
                (void *)&cmd_tso_set_tso,
                (void *)&cmd_tso_set_mode,
@@ -3557,8 +3977,8 @@ cmdline_parse_token_string_t cmd_tso_show_mode =
 cmdline_parse_inst_t cmd_tso_show = {
        .f = cmd_tso_set_parsed,
        .data = NULL,
-       .help_str = "Show TSO segment size for csum engine: "
-       "tso show <port>",
+       .help_str = "tso show <port_id>: "
+               "Show TSO segment size of non-tunneled packets for csum engine",
        .tokens = {
                (void *)&cmd_tso_set_tso,
                (void *)&cmd_tso_show_mode,
@@ -3567,6 +3987,452 @@ cmdline_parse_inst_t cmd_tso_show = {
        },
 };
 
+/* *** ENABLE HARDWARE SEGMENTATION IN TX TUNNELED PACKETS *** */
+struct cmd_tunnel_tso_set_result {
+       cmdline_fixed_string_t tso;
+       cmdline_fixed_string_t mode;
+       uint16_t tso_segsz;
+       portid_t port_id;
+};
+
+static struct rte_eth_dev_info
+check_tunnel_tso_nic_support(portid_t port_id)
+{
+       struct rte_eth_dev_info dev_info;
+
+       rte_eth_dev_info_get(port_id, &dev_info);
+       if (!(dev_info.tx_offload_capa & DEV_TX_OFFLOAD_VXLAN_TNL_TSO))
+               printf("Warning: VXLAN TUNNEL TSO not supported therefore "
+                      "not enabled for port %d\n", port_id);
+       if (!(dev_info.tx_offload_capa & DEV_TX_OFFLOAD_GRE_TNL_TSO))
+               printf("Warning: GRE TUNNEL TSO not supported therefore "
+                      "not enabled for port %d\n", port_id);
+       if (!(dev_info.tx_offload_capa & DEV_TX_OFFLOAD_IPIP_TNL_TSO))
+               printf("Warning: IPIP TUNNEL TSO not supported therefore "
+                      "not enabled for port %d\n", port_id);
+       if (!(dev_info.tx_offload_capa & DEV_TX_OFFLOAD_GENEVE_TNL_TSO))
+               printf("Warning: GENEVE TUNNEL TSO not supported therefore "
+                      "not enabled for port %d\n", port_id);
+       return dev_info;
+}
+
+static void
+cmd_tunnel_tso_set_parsed(void *parsed_result,
+                         __attribute__((unused)) struct cmdline *cl,
+                         __attribute__((unused)) void *data)
+{
+       struct cmd_tunnel_tso_set_result *res = parsed_result;
+       struct rte_eth_dev_info dev_info;
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+       if (!port_is_stopped(res->port_id)) {
+               printf("Please stop port %d first\n", res->port_id);
+               return;
+       }
+
+       if (!strcmp(res->mode, "set"))
+               ports[res->port_id].tunnel_tso_segsz = res->tso_segsz;
+
+       dev_info = check_tunnel_tso_nic_support(res->port_id);
+       if (ports[res->port_id].tunnel_tso_segsz == 0) {
+               ports[res->port_id].dev_conf.txmode.offloads &=
+                       ~(DEV_TX_OFFLOAD_VXLAN_TNL_TSO |
+                         DEV_TX_OFFLOAD_GRE_TNL_TSO |
+                         DEV_TX_OFFLOAD_IPIP_TNL_TSO |
+                         DEV_TX_OFFLOAD_GENEVE_TNL_TSO);
+               printf("TSO for tunneled packets is disabled\n");
+       } else {
+               uint64_t tso_offloads = (DEV_TX_OFFLOAD_VXLAN_TNL_TSO |
+                                        DEV_TX_OFFLOAD_GRE_TNL_TSO |
+                                        DEV_TX_OFFLOAD_IPIP_TNL_TSO |
+                                        DEV_TX_OFFLOAD_GENEVE_TNL_TSO);
+
+               ports[res->port_id].dev_conf.txmode.offloads |=
+                       (tso_offloads & dev_info.tx_offload_capa);
+               printf("TSO segment size for tunneled packets is %d\n",
+                       ports[res->port_id].tunnel_tso_segsz);
+
+               /* Below conditions are needed to make it work:
+                * (1) tunnel TSO is supported by the NIC;
+                * (2) "csum parse_tunnel" must be set so that tunneled pkts
+                * are recognized;
+                * (3) for tunneled pkts with outer L3 of IPv4,
+                * "csum set outer-ip" must be set to hw, because after tso,
+                * total_len of outer IP header is changed, and the checksum
+                * of outer IP header calculated by sw should be wrong; that
+                * is not necessary for IPv6 tunneled pkts because there's no
+                * checksum in IP header anymore.
+                */
+
+               if (!ports[res->port_id].parse_tunnel)
+                       printf("Warning: csum parse_tunnel must be set "
+                               "so that tunneled packets are recognized\n");
+               if (!(ports[res->port_id].dev_conf.txmode.offloads &
+                     DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM))
+                       printf("Warning: csum set outer-ip must be set to hw "
+                               "if outer L3 is IPv4; not necessary for IPv6\n");
+       }
+
+       cmd_reconfig_device_queue(res->port_id, 1, 1);
+}
+
+cmdline_parse_token_string_t cmd_tunnel_tso_set_tso =
+       TOKEN_STRING_INITIALIZER(struct cmd_tunnel_tso_set_result,
+                               tso, "tunnel_tso");
+cmdline_parse_token_string_t cmd_tunnel_tso_set_mode =
+       TOKEN_STRING_INITIALIZER(struct cmd_tunnel_tso_set_result,
+                               mode, "set");
+cmdline_parse_token_num_t cmd_tunnel_tso_set_tso_segsz =
+       TOKEN_NUM_INITIALIZER(struct cmd_tunnel_tso_set_result,
+                               tso_segsz, UINT16);
+cmdline_parse_token_num_t cmd_tunnel_tso_set_portid =
+       TOKEN_NUM_INITIALIZER(struct cmd_tunnel_tso_set_result,
+                               port_id, UINT16);
+
+cmdline_parse_inst_t cmd_tunnel_tso_set = {
+       .f = cmd_tunnel_tso_set_parsed,
+       .data = NULL,
+       .help_str = "tunnel_tso set <tso_segsz> <port_id>: "
+               "Set TSO segment size of tunneled packets for csum engine "
+               "(0 to disable)",
+       .tokens = {
+               (void *)&cmd_tunnel_tso_set_tso,
+               (void *)&cmd_tunnel_tso_set_mode,
+               (void *)&cmd_tunnel_tso_set_tso_segsz,
+               (void *)&cmd_tunnel_tso_set_portid,
+               NULL,
+       },
+};
+
+cmdline_parse_token_string_t cmd_tunnel_tso_show_mode =
+       TOKEN_STRING_INITIALIZER(struct cmd_tunnel_tso_set_result,
+                               mode, "show");
+
+
+cmdline_parse_inst_t cmd_tunnel_tso_show = {
+       .f = cmd_tunnel_tso_set_parsed,
+       .data = NULL,
+       .help_str = "tunnel_tso show <port_id> "
+               "Show TSO segment size of tunneled packets for csum engine",
+       .tokens = {
+               (void *)&cmd_tunnel_tso_set_tso,
+               (void *)&cmd_tunnel_tso_show_mode,
+               (void *)&cmd_tunnel_tso_set_portid,
+               NULL,
+       },
+};
+
+/* *** SET GRO FOR A PORT *** */
+struct cmd_gro_enable_result {
+       cmdline_fixed_string_t cmd_set;
+       cmdline_fixed_string_t cmd_port;
+       cmdline_fixed_string_t cmd_keyword;
+       cmdline_fixed_string_t cmd_onoff;
+       portid_t cmd_pid;
+};
+
+static void
+cmd_gro_enable_parsed(void *parsed_result,
+               __attribute__((unused)) struct cmdline *cl,
+               __attribute__((unused)) void *data)
+{
+       struct cmd_gro_enable_result *res;
+
+       res = parsed_result;
+       if (!strcmp(res->cmd_keyword, "gro"))
+               setup_gro(res->cmd_onoff, res->cmd_pid);
+}
+
+cmdline_parse_token_string_t cmd_gro_enable_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_gro_enable_result,
+                       cmd_set, "set");
+cmdline_parse_token_string_t cmd_gro_enable_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_gro_enable_result,
+                       cmd_keyword, "port");
+cmdline_parse_token_num_t cmd_gro_enable_pid =
+       TOKEN_NUM_INITIALIZER(struct cmd_gro_enable_result,
+                       cmd_pid, UINT16);
+cmdline_parse_token_string_t cmd_gro_enable_keyword =
+       TOKEN_STRING_INITIALIZER(struct cmd_gro_enable_result,
+                       cmd_keyword, "gro");
+cmdline_parse_token_string_t cmd_gro_enable_onoff =
+       TOKEN_STRING_INITIALIZER(struct cmd_gro_enable_result,
+                       cmd_onoff, "on#off");
+
+cmdline_parse_inst_t cmd_gro_enable = {
+       .f = cmd_gro_enable_parsed,
+       .data = NULL,
+       .help_str = "set port <port_id> gro on|off",
+       .tokens = {
+               (void *)&cmd_gro_enable_set,
+               (void *)&cmd_gro_enable_port,
+               (void *)&cmd_gro_enable_pid,
+               (void *)&cmd_gro_enable_keyword,
+               (void *)&cmd_gro_enable_onoff,
+               NULL,
+       },
+};
+
+/* *** DISPLAY GRO CONFIGURATION *** */
+struct cmd_gro_show_result {
+       cmdline_fixed_string_t cmd_show;
+       cmdline_fixed_string_t cmd_port;
+       cmdline_fixed_string_t cmd_keyword;
+       portid_t cmd_pid;
+};
+
+static void
+cmd_gro_show_parsed(void *parsed_result,
+               __attribute__((unused)) struct cmdline *cl,
+               __attribute__((unused)) void *data)
+{
+       struct cmd_gro_show_result *res;
+
+       res = parsed_result;
+       if (!strcmp(res->cmd_keyword, "gro"))
+               show_gro(res->cmd_pid);
+}
+
+cmdline_parse_token_string_t cmd_gro_show_show =
+       TOKEN_STRING_INITIALIZER(struct cmd_gro_show_result,
+                       cmd_show, "show");
+cmdline_parse_token_string_t cmd_gro_show_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_gro_show_result,
+                       cmd_port, "port");
+cmdline_parse_token_num_t cmd_gro_show_pid =
+       TOKEN_NUM_INITIALIZER(struct cmd_gro_show_result,
+                       cmd_pid, UINT16);
+cmdline_parse_token_string_t cmd_gro_show_keyword =
+       TOKEN_STRING_INITIALIZER(struct cmd_gro_show_result,
+                       cmd_keyword, "gro");
+
+cmdline_parse_inst_t cmd_gro_show = {
+       .f = cmd_gro_show_parsed,
+       .data = NULL,
+       .help_str = "show port <port_id> gro",
+       .tokens = {
+               (void *)&cmd_gro_show_show,
+               (void *)&cmd_gro_show_port,
+               (void *)&cmd_gro_show_pid,
+               (void *)&cmd_gro_show_keyword,
+               NULL,
+       },
+};
+
+/* *** SET FLUSH CYCLES FOR GRO *** */
+struct cmd_gro_flush_result {
+       cmdline_fixed_string_t cmd_set;
+       cmdline_fixed_string_t cmd_keyword;
+       cmdline_fixed_string_t cmd_flush;
+       uint8_t cmd_cycles;
+};
+
+static void
+cmd_gro_flush_parsed(void *parsed_result,
+               __attribute__((unused)) struct cmdline *cl,
+               __attribute__((unused)) void *data)
+{
+       struct cmd_gro_flush_result *res;
+
+       res = parsed_result;
+       if ((!strcmp(res->cmd_keyword, "gro")) &&
+                       (!strcmp(res->cmd_flush, "flush")))
+               setup_gro_flush_cycles(res->cmd_cycles);
+}
+
+cmdline_parse_token_string_t cmd_gro_flush_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_gro_flush_result,
+                       cmd_set, "set");
+cmdline_parse_token_string_t cmd_gro_flush_keyword =
+       TOKEN_STRING_INITIALIZER(struct cmd_gro_flush_result,
+                       cmd_keyword, "gro");
+cmdline_parse_token_string_t cmd_gro_flush_flush =
+       TOKEN_STRING_INITIALIZER(struct cmd_gro_flush_result,
+                       cmd_flush, "flush");
+cmdline_parse_token_num_t cmd_gro_flush_cycles =
+       TOKEN_NUM_INITIALIZER(struct cmd_gro_flush_result,
+                       cmd_cycles, UINT8);
+
+cmdline_parse_inst_t cmd_gro_flush = {
+       .f = cmd_gro_flush_parsed,
+       .data = NULL,
+       .help_str = "set gro flush <cycles>",
+       .tokens = {
+               (void *)&cmd_gro_flush_set,
+               (void *)&cmd_gro_flush_keyword,
+               (void *)&cmd_gro_flush_flush,
+               (void *)&cmd_gro_flush_cycles,
+               NULL,
+       },
+};
+
+/* *** ENABLE/DISABLE GSO *** */
+struct cmd_gso_enable_result {
+       cmdline_fixed_string_t cmd_set;
+       cmdline_fixed_string_t cmd_port;
+       cmdline_fixed_string_t cmd_keyword;
+       cmdline_fixed_string_t cmd_mode;
+       portid_t cmd_pid;
+};
+
+static void
+cmd_gso_enable_parsed(void *parsed_result,
+               __attribute__((unused)) struct cmdline *cl,
+               __attribute__((unused)) void *data)
+{
+       struct cmd_gso_enable_result *res;
+
+       res = parsed_result;
+       if (!strcmp(res->cmd_keyword, "gso"))
+               setup_gso(res->cmd_mode, res->cmd_pid);
+}
+
+cmdline_parse_token_string_t cmd_gso_enable_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_gso_enable_result,
+                       cmd_set, "set");
+cmdline_parse_token_string_t cmd_gso_enable_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_gso_enable_result,
+                       cmd_port, "port");
+cmdline_parse_token_string_t cmd_gso_enable_keyword =
+       TOKEN_STRING_INITIALIZER(struct cmd_gso_enable_result,
+                       cmd_keyword, "gso");
+cmdline_parse_token_string_t cmd_gso_enable_mode =
+       TOKEN_STRING_INITIALIZER(struct cmd_gso_enable_result,
+                       cmd_mode, "on#off");
+cmdline_parse_token_num_t cmd_gso_enable_pid =
+       TOKEN_NUM_INITIALIZER(struct cmd_gso_enable_result,
+                       cmd_pid, UINT16);
+
+cmdline_parse_inst_t cmd_gso_enable = {
+       .f = cmd_gso_enable_parsed,
+       .data = NULL,
+       .help_str = "set port <port_id> gso on|off",
+       .tokens = {
+               (void *)&cmd_gso_enable_set,
+               (void *)&cmd_gso_enable_port,
+               (void *)&cmd_gso_enable_pid,
+               (void *)&cmd_gso_enable_keyword,
+               (void *)&cmd_gso_enable_mode,
+               NULL,
+       },
+};
+
+/* *** SET MAX PACKET LENGTH FOR GSO SEGMENTS *** */
+struct cmd_gso_size_result {
+       cmdline_fixed_string_t cmd_set;
+       cmdline_fixed_string_t cmd_keyword;
+       cmdline_fixed_string_t cmd_segsz;
+       uint16_t cmd_size;
+};
+
+static void
+cmd_gso_size_parsed(void *parsed_result,
+                      __attribute__((unused)) struct cmdline *cl,
+                      __attribute__((unused)) void *data)
+{
+       struct cmd_gso_size_result *res = parsed_result;
+
+       if (test_done == 0) {
+               printf("Before setting GSO segsz, please first"
+                               " stop fowarding\n");
+               return;
+       }
+
+       if (!strcmp(res->cmd_keyword, "gso") &&
+                       !strcmp(res->cmd_segsz, "segsz")) {
+               if (res->cmd_size < RTE_GSO_SEG_SIZE_MIN)
+                       printf("gso_size should be larger than %zu."
+                                       " Please input a legal value\n",
+                                       RTE_GSO_SEG_SIZE_MIN);
+               else
+                       gso_max_segment_size = res->cmd_size;
+       }
+}
+
+cmdline_parse_token_string_t cmd_gso_size_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_gso_size_result,
+                               cmd_set, "set");
+cmdline_parse_token_string_t cmd_gso_size_keyword =
+       TOKEN_STRING_INITIALIZER(struct cmd_gso_size_result,
+                               cmd_keyword, "gso");
+cmdline_parse_token_string_t cmd_gso_size_segsz =
+       TOKEN_STRING_INITIALIZER(struct cmd_gso_size_result,
+                               cmd_segsz, "segsz");
+cmdline_parse_token_num_t cmd_gso_size_size =
+       TOKEN_NUM_INITIALIZER(struct cmd_gso_size_result,
+                               cmd_size, UINT16);
+
+cmdline_parse_inst_t cmd_gso_size = {
+       .f = cmd_gso_size_parsed,
+       .data = NULL,
+       .help_str = "set gso segsz <length>",
+       .tokens = {
+               (void *)&cmd_gso_size_set,
+               (void *)&cmd_gso_size_keyword,
+               (void *)&cmd_gso_size_segsz,
+               (void *)&cmd_gso_size_size,
+               NULL,
+       },
+};
+
+/* *** SHOW GSO CONFIGURATION *** */
+struct cmd_gso_show_result {
+       cmdline_fixed_string_t cmd_show;
+       cmdline_fixed_string_t cmd_port;
+       cmdline_fixed_string_t cmd_keyword;
+       portid_t cmd_pid;
+};
+
+static void
+cmd_gso_show_parsed(void *parsed_result,
+                      __attribute__((unused)) struct cmdline *cl,
+                      __attribute__((unused)) void *data)
+{
+       struct cmd_gso_show_result *res = parsed_result;
+
+       if (!rte_eth_dev_is_valid_port(res->cmd_pid)) {
+               printf("invalid port id %u\n", res->cmd_pid);
+               return;
+       }
+       if (!strcmp(res->cmd_keyword, "gso")) {
+               if (gso_ports[res->cmd_pid].enable) {
+                       printf("Max GSO'd packet size: %uB\n"
+                                       "Supported GSO types: TCP/IPv4, "
+                                       "VxLAN with inner TCP/IPv4 packet, "
+                                       "GRE with inner TCP/IPv4  packet\n",
+                                       gso_max_segment_size);
+               } else
+                       printf("GSO is not enabled on Port %u\n", res->cmd_pid);
+       }
+}
+
+cmdline_parse_token_string_t cmd_gso_show_show =
+TOKEN_STRING_INITIALIZER(struct cmd_gso_show_result,
+               cmd_show, "show");
+cmdline_parse_token_string_t cmd_gso_show_port =
+TOKEN_STRING_INITIALIZER(struct cmd_gso_show_result,
+               cmd_port, "port");
+cmdline_parse_token_string_t cmd_gso_show_keyword =
+       TOKEN_STRING_INITIALIZER(struct cmd_gso_show_result,
+                               cmd_keyword, "gso");
+cmdline_parse_token_num_t cmd_gso_show_pid =
+       TOKEN_NUM_INITIALIZER(struct cmd_gso_show_result,
+                               cmd_pid, UINT16);
+
+cmdline_parse_inst_t cmd_gso_show = {
+       .f = cmd_gso_show_parsed,
+       .data = NULL,
+       .help_str = "show port <port_id> gso",
+       .tokens = {
+               (void *)&cmd_gso_show_show,
+               (void *)&cmd_gso_show_port,
+               (void *)&cmd_gso_show_pid,
+               (void *)&cmd_gso_show_keyword,
+               NULL,
+       },
+};
+
 /* *** ENABLE/DISABLE FLUSH ON RX STREAMS *** */
 struct cmd_set_flush_rx {
        cmdline_fixed_string_t set;
@@ -3596,7 +4462,7 @@ cmdline_parse_token_string_t cmd_setflushrx_mode =
 
 cmdline_parse_inst_t cmd_set_flush_rx = {
        .f = cmd_set_flush_rx_parsed,
-       .help_str = "set flush_rx on|off: enable/disable flush on rx streams",
+       .help_str = "set flush_rx on|off: Enable/Disable flush on rx streams",
        .data = NULL,
        .tokens = {
                (void *)&cmd_setflushrx_set,
@@ -3635,7 +4501,7 @@ cmdline_parse_token_string_t cmd_setlinkcheck_mode =
 
 cmdline_parse_inst_t cmd_set_link_check = {
        .f = cmd_set_link_check_parsed,
-       .help_str = "set link_check on|off: enable/disable link status check "
+       .help_str = "set link_check on|off: Enable/Disable link status check "
                    "when starting/stopping a port",
        .data = NULL,
        .tokens = {
@@ -3646,14 +4512,13 @@ cmdline_parse_inst_t cmd_set_link_check = {
        },
 };
 
-#ifdef RTE_NIC_BYPASS
 /* *** SET NIC BYPASS MODE *** */
 struct cmd_set_bypass_mode_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t bypass;
        cmdline_fixed_string_t mode;
        cmdline_fixed_string_t value;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void
@@ -3663,19 +4528,23 @@ cmd_set_bypass_mode_parsed(void *parsed_result,
 {
        struct cmd_set_bypass_mode_result *res = parsed_result;
        portid_t port_id = res->port_id;
-       uint32_t bypass_mode = RTE_BYPASS_MODE_NORMAL;
+       int32_t rc = -EINVAL;
+
+#if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS
+       uint32_t bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_NORMAL;
 
        if (!strcmp(res->value, "bypass"))
-               bypass_mode = RTE_BYPASS_MODE_BYPASS;
+               bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_BYPASS;
        else if (!strcmp(res->value, "isolate"))
-               bypass_mode = RTE_BYPASS_MODE_ISOLATE;
+               bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_ISOLATE;
        else
-               bypass_mode = RTE_BYPASS_MODE_NORMAL;
+               bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_NORMAL;
 
        /* Set the bypass mode for the relevant port. */
-       if (0 != rte_eth_dev_bypass_state_set(port_id, &bypass_mode)) {
+       rc = rte_pmd_ixgbe_bypass_state_set(port_id, &bypass_mode);
+#endif
+       if (rc != 0)
                printf("\t Failed to set bypass mode for port = %d.\n", port_id);
-       }
 }
 
 cmdline_parse_token_string_t cmd_setbypass_mode_set =
@@ -3692,11 +4561,11 @@ cmdline_parse_token_string_t cmd_setbypass_mode_value =
                        value, "normal#bypass#isolate");
 cmdline_parse_token_num_t cmd_setbypass_mode_port =
        TOKEN_NUM_INITIALIZER(struct cmd_set_bypass_mode_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 
 cmdline_parse_inst_t cmd_set_bypass_mode = {
        .f = cmd_set_bypass_mode_parsed,
-       .help_str = "set bypass mode (normal|bypass|isolate) (port_id): "
+       .help_str = "set bypass mode normal|bypass|isolate <port_id>: "
                    "Set the NIC bypass mode for port_id",
        .data = NULL,
        .tokens = {
@@ -3717,7 +4586,7 @@ struct cmd_set_bypass_event_result {
        cmdline_fixed_string_t event_value;
        cmdline_fixed_string_t mode;
        cmdline_fixed_string_t mode_value;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void
@@ -3725,51 +4594,57 @@ cmd_set_bypass_event_parsed(void *parsed_result,
                __attribute__((unused)) struct cmdline *cl,
                __attribute__((unused)) void *data)
 {
-       int32_t rc;
+       int32_t rc = -EINVAL;
        struct cmd_set_bypass_event_result *res = parsed_result;
        portid_t port_id = res->port_id;
-       uint32_t bypass_event = RTE_BYPASS_EVENT_NONE;
-       uint32_t bypass_mode = RTE_BYPASS_MODE_NORMAL;
+
+#if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS
+       uint32_t bypass_event = RTE_PMD_IXGBE_BYPASS_EVENT_NONE;
+       uint32_t bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_NORMAL;
 
        if (!strcmp(res->event_value, "timeout"))
-               bypass_event = RTE_BYPASS_EVENT_TIMEOUT;
+               bypass_event = RTE_PMD_IXGBE_BYPASS_EVENT_TIMEOUT;
        else if (!strcmp(res->event_value, "os_on"))
-               bypass_event = RTE_BYPASS_EVENT_OS_ON;
+               bypass_event = RTE_PMD_IXGBE_BYPASS_EVENT_OS_ON;
        else if (!strcmp(res->event_value, "os_off"))
-               bypass_event = RTE_BYPASS_EVENT_OS_OFF;
+               bypass_event = RTE_PMD_IXGBE_BYPASS_EVENT_OS_OFF;
        else if (!strcmp(res->event_value, "power_on"))
-               bypass_event = RTE_BYPASS_EVENT_POWER_ON;
+               bypass_event = RTE_PMD_IXGBE_BYPASS_EVENT_POWER_ON;
        else if (!strcmp(res->event_value, "power_off"))
-               bypass_event = RTE_BYPASS_EVENT_POWER_OFF;
+               bypass_event = RTE_PMD_IXGBE_BYPASS_EVENT_POWER_OFF;
        else
-               bypass_event = RTE_BYPASS_EVENT_NONE;
+               bypass_event = RTE_PMD_IXGBE_BYPASS_EVENT_NONE;
 
        if (!strcmp(res->mode_value, "bypass"))
-               bypass_mode = RTE_BYPASS_MODE_BYPASS;
+               bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_BYPASS;
        else if (!strcmp(res->mode_value, "isolate"))
-               bypass_mode = RTE_BYPASS_MODE_ISOLATE;
+               bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_ISOLATE;
        else
-               bypass_mode = RTE_BYPASS_MODE_NORMAL;
+               bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_NORMAL;
 
        /* Set the watchdog timeout. */
-       if (bypass_event == RTE_BYPASS_EVENT_TIMEOUT) {
+       if (bypass_event == RTE_PMD_IXGBE_BYPASS_EVENT_TIMEOUT) {
 
                rc = -EINVAL;
-               if (!RTE_BYPASS_TMT_VALID(bypass_timeout) ||
-                               (rc = rte_eth_dev_wd_timeout_store(port_id,
-                               bypass_timeout)) != 0) {
+               if (RTE_PMD_IXGBE_BYPASS_TMT_VALID(bypass_timeout)) {
+                       rc = rte_pmd_ixgbe_bypass_wd_timeout_store(port_id,
+                                                          bypass_timeout);
+               }
+               if (rc != 0) {
                        printf("Failed to set timeout value %u "
-                               "for port %d, errto code: %d.\n",
-                               bypass_timeout, port_id, rc);
+                       "for port %d, errto code: %d.\n",
+                       bypass_timeout, port_id, rc);
                }
        }
 
        /* Set the bypass event to transition to bypass mode. */
-       if (0 != rte_eth_dev_bypass_event_store(port_id,
-                       bypass_event, bypass_mode)) {
-               printf("\t Failed to set bypass event for port = %d.\n", port_id);
-       }
+       rc = rte_pmd_ixgbe_bypass_event_store(port_id, bypass_event,
+                                             bypass_mode);
+#endif
 
+       if (rc != 0)
+               printf("\t Failed to set bypass event for port = %d.\n",
+                      port_id);
 }
 
 cmdline_parse_token_string_t cmd_setbypass_event_set =
@@ -3792,13 +4667,13 @@ cmdline_parse_token_string_t cmd_setbypass_event_mode_value =
                        mode_value, "normal#bypass#isolate");
 cmdline_parse_token_num_t cmd_setbypass_event_port =
        TOKEN_NUM_INITIALIZER(struct cmd_set_bypass_event_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 
 cmdline_parse_inst_t cmd_set_bypass_event = {
        .f = cmd_set_bypass_event_parsed,
-       .help_str = "set bypass event (timeout|os_on|os_off|power_on|power_off) "
-                   "mode (normal|bypass|isolate) (port_id): "
-                   "Set the NIC bypass event mode for port_id",
+       .help_str = "set bypass event none|timeout|os_on|os_off|power_on|"
+               "power_off mode normal|bypass|isolate <port_id>: "
+               "Set the NIC bypass event mode for port_id",
        .data = NULL,
        .tokens = {
                (void *)&cmd_setbypass_event_set,
@@ -3826,24 +4701,26 @@ cmd_set_bypass_timeout_parsed(void *parsed_result,
                __attribute__((unused)) struct cmdline *cl,
                __attribute__((unused)) void *data)
 {
-       struct cmd_set_bypass_timeout_result *res = parsed_result;
+       __rte_unused struct cmd_set_bypass_timeout_result *res = parsed_result;
 
+#if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS
        if (!strcmp(res->value, "1.5"))
-               bypass_timeout = RTE_BYPASS_TMT_1_5_SEC;
+               bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_1_5_SEC;
        else if (!strcmp(res->value, "2"))
-               bypass_timeout = RTE_BYPASS_TMT_2_SEC;
+               bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_2_SEC;
        else if (!strcmp(res->value, "3"))
-               bypass_timeout = RTE_BYPASS_TMT_3_SEC;
+               bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_3_SEC;
        else if (!strcmp(res->value, "4"))
-               bypass_timeout = RTE_BYPASS_TMT_4_SEC;
+               bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_4_SEC;
        else if (!strcmp(res->value, "8"))
-               bypass_timeout = RTE_BYPASS_TMT_8_SEC;
+               bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_8_SEC;
        else if (!strcmp(res->value, "16"))
-               bypass_timeout = RTE_BYPASS_TMT_16_SEC;
+               bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_16_SEC;
        else if (!strcmp(res->value, "32"))
-               bypass_timeout = RTE_BYPASS_TMT_32_SEC;
+               bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_32_SEC;
        else
-               bypass_timeout = RTE_BYPASS_TMT_OFF;
+               bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_OFF;
+#endif
 }
 
 cmdline_parse_token_string_t cmd_setbypass_timeout_set =
@@ -3861,8 +4738,8 @@ cmdline_parse_token_string_t cmd_setbypass_timeout_value =
 
 cmdline_parse_inst_t cmd_set_bypass_timeout = {
        .f = cmd_set_bypass_timeout_parsed,
-       .help_str = "set bypass timeout (0|1.5|2|3|4|8|16|32) seconds: "
-                   "Set the NIC bypass watchdog timeout",
+       .help_str = "set bypass timeout 0|1.5|2|3|4|8|16|32: "
+               "Set the NIC bypass watchdog timeout in seconds",
        .data = NULL,
        .tokens = {
                (void *)&cmd_setbypass_timeout_set,
@@ -3878,7 +4755,7 @@ struct cmd_show_bypass_config_result {
        cmdline_fixed_string_t show;
        cmdline_fixed_string_t bypass;
        cmdline_fixed_string_t config;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void
@@ -3887,17 +4764,19 @@ cmd_show_bypass_config_parsed(void *parsed_result,
                __attribute__((unused)) void *data)
 {
        struct cmd_show_bypass_config_result *res = parsed_result;
+       portid_t port_id = res->port_id;
+       int rc = -EINVAL;
+#if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS
        uint32_t event_mode;
        uint32_t bypass_mode;
-       portid_t port_id = res->port_id;
        uint32_t timeout = bypass_timeout;
        int i;
 
-       static const char * const timeouts[RTE_BYPASS_TMT_NUM] =
+       static const char * const timeouts[RTE_PMD_IXGBE_BYPASS_TMT_NUM] =
                {"off", "1.5", "2", "3", "4", "8", "16", "32"};
-       static const char * const modes[RTE_BYPASS_MODE_NUM] =
+       static const char * const modes[RTE_PMD_IXGBE_BYPASS_MODE_NUM] =
                {"UNKNOWN", "normal", "bypass", "isolate"};
-       static const char * const events[RTE_BYPASS_EVENT_NUM] = {
+       static const char * const events[RTE_PMD_IXGBE_BYPASS_EVENT_NUM] = {
                "NONE",
                "OS/board on",
                "power supply on",
@@ -3907,37 +4786,41 @@ cmd_show_bypass_config_parsed(void *parsed_result,
        int num_events = (sizeof events) / (sizeof events[0]);
 
        /* Display the bypass mode.*/
-       if (0 != rte_eth_dev_bypass_state_show(port_id, &bypass_mode)) {
+       if (rte_pmd_ixgbe_bypass_state_show(port_id, &bypass_mode) != 0) {
                printf("\tFailed to get bypass mode for port = %d\n", port_id);
                return;
        }
        else {
-               if (!RTE_BYPASS_MODE_VALID(bypass_mode))
-                       bypass_mode = RTE_BYPASS_MODE_NONE;
+               if (!RTE_PMD_IXGBE_BYPASS_MODE_VALID(bypass_mode))
+                       bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_NONE;
 
                printf("\tbypass mode    = %s\n",  modes[bypass_mode]);
        }
 
        /* Display the bypass timeout.*/
-       if (!RTE_BYPASS_TMT_VALID(timeout))
-               timeout = RTE_BYPASS_TMT_OFF;
+       if (!RTE_PMD_IXGBE_BYPASS_TMT_VALID(timeout))
+               timeout = RTE_PMD_IXGBE_BYPASS_TMT_OFF;
 
        printf("\tbypass timeout = %s\n", timeouts[timeout]);
 
        /* Display the bypass events and associated modes. */
-       for (i = RTE_BYPASS_EVENT_START; i < num_events; i++) {
+       for (i = RTE_PMD_IXGBE_BYPASS_EVENT_START; i < num_events; i++) {
 
-               if (0 != rte_eth_dev_bypass_event_show(port_id, i, &event_mode)) {
+               if (rte_pmd_ixgbe_bypass_event_show(port_id, i, &event_mode)) {
                        printf("\tFailed to get bypass mode for event = %s\n",
                                events[i]);
                } else {
-                       if (!RTE_BYPASS_MODE_VALID(event_mode))
-                               event_mode = RTE_BYPASS_MODE_NONE;
+                       if (!RTE_PMD_IXGBE_BYPASS_MODE_VALID(event_mode))
+                               event_mode = RTE_PMD_IXGBE_BYPASS_MODE_NONE;
 
                        printf("\tbypass event: %-16s = %s\n", events[i],
                                modes[event_mode]);
                }
        }
+#endif
+       if (rc != 0)
+               printf("\tFailed to get bypass configuration for port = %d\n",
+                      port_id);
 }
 
 cmdline_parse_token_string_t cmd_showbypass_config_show =
@@ -3951,11 +4834,11 @@ cmdline_parse_token_string_t cmd_showbypass_config_config =
                        config, "config");
 cmdline_parse_token_num_t cmd_showbypass_config_port =
        TOKEN_NUM_INITIALIZER(struct cmd_show_bypass_config_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 
 cmdline_parse_inst_t cmd_show_bypass_config = {
        .f = cmd_show_bypass_config_parsed,
-       .help_str = "show bypass config (port_id): "
+       .help_str = "show bypass config <port_id>: "
                    "Show the NIC bypass config for port_id",
        .data = NULL,
        .tokens = {
@@ -3966,7 +4849,6 @@ cmdline_parse_inst_t cmd_show_bypass_config = {
                NULL,
        },
 };
-#endif
 
 #ifdef RTE_LIBRTE_PMD_BOND
 /* *** SET BONDING MODE *** */
@@ -3975,7 +4857,7 @@ struct cmd_set_bonding_mode_result {
        cmdline_fixed_string_t bonding;
        cmdline_fixed_string_t mode;
        uint8_t value;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void cmd_set_bonding_mode_parsed(void *parsed_result,
@@ -4004,11 +4886,12 @@ TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_mode_result,
                value, UINT8);
 cmdline_parse_token_num_t cmd_setbonding_mode_port =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_mode_result,
-               port_id, UINT8);
+               port_id, UINT16);
 
 cmdline_parse_inst_t cmd_set_bonding_mode = {
                .f = cmd_set_bonding_mode_parsed,
-               .help_str = "set bonding mode (mode_value) (port_id): Set the bonding mode for port_id",
+               .help_str = "set bonding mode <mode_value> <port_id>: "
+                       "Set the bonding mode for port_id",
                .data = NULL,
                .tokens = {
                                (void *) &cmd_setbonding_mode_set,
@@ -4020,12 +4903,91 @@ cmdline_parse_inst_t cmd_set_bonding_mode = {
                }
 };
 
+/* *** SET BONDING SLOW_QUEUE SW/HW *** */
+struct cmd_set_bonding_lacp_dedicated_queues_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t bonding;
+       cmdline_fixed_string_t lacp;
+       cmdline_fixed_string_t dedicated_queues;
+       portid_t port_id;
+       cmdline_fixed_string_t mode;
+};
+
+static void cmd_set_bonding_lacp_dedicated_queues_parsed(void *parsed_result,
+               __attribute__((unused))  struct cmdline *cl,
+               __attribute__((unused)) void *data)
+{
+       struct cmd_set_bonding_lacp_dedicated_queues_result *res = parsed_result;
+       portid_t port_id = res->port_id;
+       struct rte_port *port;
+
+       port = &ports[port_id];
+
+       /** Check if the port is not started **/
+       if (port->port_status != RTE_PORT_STOPPED) {
+               printf("Please stop port %d first\n", port_id);
+               return;
+       }
+
+       if (!strcmp(res->mode, "enable")) {
+               if (rte_eth_bond_8023ad_dedicated_queues_enable(port_id) == 0)
+                       printf("Dedicate queues for LACP control packets"
+                                       " enabled\n");
+               else
+                       printf("Enabling dedicate queues for LACP control "
+                                       "packets on port %d failed\n", port_id);
+       } else if (!strcmp(res->mode, "disable")) {
+               if (rte_eth_bond_8023ad_dedicated_queues_disable(port_id) == 0)
+                       printf("Dedicated queues for LACP control packets "
+                                       "disabled\n");
+               else
+                       printf("Disabling dedicated queues for LACP control "
+                                       "traffic on port %d failed\n", port_id);
+       }
+}
+
+cmdline_parse_token_string_t cmd_setbonding_lacp_dedicated_queues_set =
+TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_lacp_dedicated_queues_result,
+               set, "set");
+cmdline_parse_token_string_t cmd_setbonding_lacp_dedicated_queues_bonding =
+TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_lacp_dedicated_queues_result,
+               bonding, "bonding");
+cmdline_parse_token_string_t cmd_setbonding_lacp_dedicated_queues_lacp =
+TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_lacp_dedicated_queues_result,
+               lacp, "lacp");
+cmdline_parse_token_string_t cmd_setbonding_lacp_dedicated_queues_dedicated_queues =
+TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_lacp_dedicated_queues_result,
+               dedicated_queues, "dedicated_queues");
+cmdline_parse_token_num_t cmd_setbonding_lacp_dedicated_queues_port_id =
+TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_lacp_dedicated_queues_result,
+               port_id, UINT16);
+cmdline_parse_token_string_t cmd_setbonding_lacp_dedicated_queues_mode =
+TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_lacp_dedicated_queues_result,
+               mode, "enable#disable");
+
+cmdline_parse_inst_t cmd_set_lacp_dedicated_queues = {
+               .f = cmd_set_bonding_lacp_dedicated_queues_parsed,
+               .help_str = "set bonding lacp dedicated_queues <port_id> "
+                       "enable|disable: "
+                       "Enable/disable dedicated queues for LACP control traffic for port_id",
+               .data = NULL,
+               .tokens = {
+                       (void *)&cmd_setbonding_lacp_dedicated_queues_set,
+                       (void *)&cmd_setbonding_lacp_dedicated_queues_bonding,
+                       (void *)&cmd_setbonding_lacp_dedicated_queues_lacp,
+                       (void *)&cmd_setbonding_lacp_dedicated_queues_dedicated_queues,
+                       (void *)&cmd_setbonding_lacp_dedicated_queues_port_id,
+                       (void *)&cmd_setbonding_lacp_dedicated_queues_mode,
+                       NULL
+               }
+};
+
 /* *** SET BALANCE XMIT POLICY *** */
 struct cmd_set_bonding_balance_xmit_policy_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t bonding;
        cmdline_fixed_string_t balance_xmit_policy;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t policy;
 };
 
@@ -4066,14 +5028,16 @@ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result,
                balance_xmit_policy, "balance_xmit_policy");
 cmdline_parse_token_num_t cmd_setbonding_balance_xmit_policy_port =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result,
-               port_id, UINT8);
+               port_id, UINT16);
 cmdline_parse_token_string_t cmd_setbonding_balance_xmit_policy_policy =
 TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result,
                policy, "l2#l23#l34");
 
 cmdline_parse_inst_t cmd_set_balance_xmit_policy = {
                .f = cmd_set_bonding_balance_xmit_policy_parsed,
-               .help_str = "set bonding balance_xmit_policy (port_id) (policy_value): Set the bonding balance_xmit_policy for port_id",
+               .help_str = "set bonding balance_xmit_policy <port_id> "
+                       "l2|l23|l34: "
+                       "Set the bonding balance_xmit_policy for port_id",
                .data = NULL,
                .tokens = {
                                (void *)&cmd_setbonding_balance_xmit_policy_set,
@@ -4090,7 +5054,7 @@ struct cmd_show_bonding_config_result {
        cmdline_fixed_string_t show;
        cmdline_fixed_string_t bonding;
        cmdline_fixed_string_t config;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void cmd_show_bonding_config_parsed(void *parsed_result,
@@ -4098,8 +5062,8 @@ static void cmd_show_bonding_config_parsed(void *parsed_result,
                __attribute__((unused)) void *data)
 {
        struct cmd_show_bonding_config_result *res = parsed_result;
-       int bonding_mode;
-       uint8_t slaves[RTE_MAX_ETHPORTS];
+       int bonding_mode, agg_mode;
+       portid_t slaves[RTE_MAX_ETHPORTS];
        int num_slaves, num_active_slaves;
        int primary_id;
        int i;
@@ -4139,6 +5103,23 @@ static void cmd_show_bonding_config_parsed(void *parsed_result,
                }
        }
 
+       if (bonding_mode == BONDING_MODE_8023AD) {
+               agg_mode = rte_eth_bond_8023ad_agg_selection_get(port_id);
+               printf("\tIEEE802.3AD Aggregator Mode: ");
+               switch (agg_mode) {
+               case AGG_BANDWIDTH:
+                       printf("bandwidth");
+                       break;
+               case AGG_STABLE:
+                       printf("stable");
+                       break;
+               case AGG_COUNT:
+                       printf("count");
+                       break;
+               }
+               printf("\n");
+       }
+
        num_slaves = rte_eth_bond_slaves_get(port_id, slaves, RTE_MAX_ETHPORTS);
 
        if (num_slaves < 0) {
@@ -4195,11 +5176,12 @@ TOKEN_STRING_INITIALIZER(struct cmd_show_bonding_config_result,
                config, "config");
 cmdline_parse_token_num_t cmd_showbonding_config_port =
 TOKEN_NUM_INITIALIZER(struct cmd_show_bonding_config_result,
-               port_id, UINT8);
+               port_id, UINT16);
 
 cmdline_parse_inst_t cmd_show_bonding_config = {
                .f = cmd_show_bonding_config_parsed,
-               .help_str =     "show bonding config (port_id): Show the bonding config for port_id",
+               .help_str = "show bonding config <port_id>: "
+                       "Show the bonding config for port_id",
                .data = NULL,
                .tokens = {
                                (void *)&cmd_showbonding_config_show,
@@ -4215,8 +5197,8 @@ struct cmd_set_bonding_primary_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t bonding;
        cmdline_fixed_string_t primary;
-       uint8_t slave_id;
-       uint8_t port_id;
+       portid_t slave_id;
+       portid_t port_id;
 };
 
 static void cmd_set_bonding_primary_parsed(void *parsed_result,
@@ -4247,14 +5229,15 @@ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_primary_result,
                primary, "primary");
 cmdline_parse_token_num_t cmd_setbonding_primary_slave =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_primary_result,
-               slave_id, UINT8);
+               slave_id, UINT16);
 cmdline_parse_token_num_t cmd_setbonding_primary_port =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_primary_result,
-               port_id, UINT8);
+               port_id, UINT16);
 
 cmdline_parse_inst_t cmd_set_bonding_primary = {
                .f = cmd_set_bonding_primary_parsed,
-               .help_str = "set bonding primary (slave_id) (port_id): Set the primary slave for port_id",
+               .help_str = "set bonding primary <slave_id> <port_id>: "
+                       "Set the primary slave for port_id",
                .data = NULL,
                .tokens = {
                                (void *)&cmd_setbonding_primary_set,
@@ -4271,8 +5254,8 @@ struct cmd_add_bonding_slave_result {
        cmdline_fixed_string_t add;
        cmdline_fixed_string_t bonding;
        cmdline_fixed_string_t slave;
-       uint8_t slave_id;
-       uint8_t port_id;
+       portid_t slave_id;
+       portid_t port_id;
 };
 
 static void cmd_add_bonding_slave_parsed(void *parsed_result,
@@ -4283,7 +5266,7 @@ static void cmd_add_bonding_slave_parsed(void *parsed_result,
        portid_t master_port_id = res->port_id;
        portid_t slave_port_id = res->slave_id;
 
-       /* Set the primary slave for a bonded device. */
+       /* add the slave for a bonded device. */
        if (0 != rte_eth_bond_slave_add(master_port_id, slave_port_id)) {
                printf("\t Failed to add slave %d to master port = %d.\n",
                                slave_port_id, master_port_id);
@@ -4304,14 +5287,15 @@ TOKEN_STRING_INITIALIZER(struct cmd_add_bonding_slave_result,
                slave, "slave");
 cmdline_parse_token_num_t cmd_addbonding_slave_slaveid =
 TOKEN_NUM_INITIALIZER(struct cmd_add_bonding_slave_result,
-               slave_id, UINT8);
+               slave_id, UINT16);
 cmdline_parse_token_num_t cmd_addbonding_slave_port =
 TOKEN_NUM_INITIALIZER(struct cmd_add_bonding_slave_result,
-               port_id, UINT8);
+               port_id, UINT16);
 
 cmdline_parse_inst_t cmd_add_bonding_slave = {
                .f = cmd_add_bonding_slave_parsed,
-               .help_str = "add bonding slave (slave_id) (port_id): Add a slave device to a bonded device",
+               .help_str = "add bonding slave <slave_id> <port_id>: "
+                       "Add a slave device to a bonded device",
                .data = NULL,
                .tokens = {
                                (void *)&cmd_addbonding_slave_add,
@@ -4328,8 +5312,8 @@ struct cmd_remove_bonding_slave_result {
        cmdline_fixed_string_t remove;
        cmdline_fixed_string_t bonding;
        cmdline_fixed_string_t slave;
-       uint8_t slave_id;
-       uint8_t port_id;
+       portid_t slave_id;
+       portid_t port_id;
 };
 
 static void cmd_remove_bonding_slave_parsed(void *parsed_result,
@@ -4340,7 +5324,7 @@ static void cmd_remove_bonding_slave_parsed(void *parsed_result,
        portid_t master_port_id = res->port_id;
        portid_t slave_port_id = res->slave_id;
 
-       /* Set the primary slave for a bonded device. */
+       /* remove the slave from a bonded device. */
        if (0 != rte_eth_bond_slave_remove(master_port_id, slave_port_id)) {
                printf("\t Failed to remove slave %d from master port = %d.\n",
                                slave_port_id, master_port_id);
@@ -4361,14 +5345,15 @@ cmdline_parse_token_string_t cmd_removebonding_slave_slave =
                                slave, "slave");
 cmdline_parse_token_num_t cmd_removebonding_slave_slaveid =
                TOKEN_NUM_INITIALIZER(struct cmd_remove_bonding_slave_result,
-                               slave_id, UINT8);
+                               slave_id, UINT16);
 cmdline_parse_token_num_t cmd_removebonding_slave_port =
                TOKEN_NUM_INITIALIZER(struct cmd_remove_bonding_slave_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 
 cmdline_parse_inst_t cmd_remove_bonding_slave = {
                .f = cmd_remove_bonding_slave_parsed,
-               .help_str = "remove bonding slave (slave_id) (port_id): Remove a slave device from a bonded device",
+               .help_str = "remove bonding slave <slave_id> <port_id>: "
+                       "Remove a slave device from a bonded device",
                .data = NULL,
                .tokens = {
                                (void *)&cmd_removebonding_slave_remove,
@@ -4404,7 +5389,7 @@ static void cmd_create_bonded_device_parsed(void *parsed_result,
                return;
        }
 
-       snprintf(ethdev_name, RTE_ETH_NAME_MAX_LEN, "eth_bond_testpmd_%d",
+       snprintf(ethdev_name, RTE_ETH_NAME_MAX_LEN, "net_bonding_testpmd_%d",
                        bond_dev_num++);
 
        /* Create a new bonded device. */
@@ -4420,7 +5405,6 @@ static void cmd_create_bonded_device_parsed(void *parsed_result,
                nb_ports = rte_eth_dev_count();
                reconfig(port_id, res->socket);
                rte_eth_promiscuous_enable(port_id);
-               ports[port_id].enabled = 1;
        }
 
 }
@@ -4443,7 +5427,8 @@ cmdline_parse_token_num_t cmd_createbonded_device_socket =
 
 cmdline_parse_inst_t cmd_create_bonded_device = {
                .f = cmd_create_bonded_device_parsed,
-               .help_str = "create bonded device (mode) (socket): Create a new bonded device with specific bonding mode and socket",
+               .help_str = "create bonded device <mode> <socket>: "
+                       "Create a new bonded device with specific bonding mode and socket",
                .data = NULL,
                .tokens = {
                                (void *)&cmd_createbonded_device_create,
@@ -4460,7 +5445,7 @@ struct cmd_set_bond_mac_addr_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t bonding;
        cmdline_fixed_string_t mac_addr;
-       uint8_t port_num;
+       uint16_t port_num;
        struct ether_addr address;
 };
 
@@ -4490,14 +5475,15 @@ cmdline_parse_token_string_t cmd_set_bond_mac_addr_mac =
                TOKEN_STRING_INITIALIZER(struct cmd_set_bond_mac_addr_result, mac_addr,
                                "mac_addr");
 cmdline_parse_token_num_t cmd_set_bond_mac_addr_portnum =
-               TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mac_addr_result, port_num, UINT8);
+               TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mac_addr_result,
+                               port_num, UINT16);
 cmdline_parse_token_etheraddr_t cmd_set_bond_mac_addr_addr =
                TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_bond_mac_addr_result, address);
 
 cmdline_parse_inst_t cmd_set_bond_mac_addr = {
                .f = cmd_set_bond_mac_addr_parsed,
                .data = (void *) 0,
-               .help_str = "set bonding mac_addr (port_id) (address): ",
+               .help_str = "set bonding mac_addr <port_id> <mac_addr>",
                .tokens = {
                                (void *)&cmd_set_bond_mac_addr_set,
                                (void *)&cmd_set_bond_mac_addr_bonding,
@@ -4514,7 +5500,7 @@ 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;
+       uint16_t port_num;
        uint32_t period_ms;
 };
 
@@ -4548,7 +5534,7 @@ cmdline_parse_token_string_t cmd_set_bond_mon_period_mon_period =
                                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);
+                               port_num, UINT16);
 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);
@@ -4556,7 +5542,7 @@ cmdline_parse_token_num_t cmd_set_bond_mon_period_period_ms =
 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): ",
+               .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,
@@ -4567,6 +5553,77 @@ cmdline_parse_inst_t cmd_set_bond_mon_period = {
                }
 };
 
+
+
+struct cmd_set_bonding_agg_mode_policy_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t bonding;
+       cmdline_fixed_string_t agg_mode;
+       uint16_t port_num;
+       cmdline_fixed_string_t policy;
+};
+
+
+static void
+cmd_set_bonding_agg_mode(void *parsed_result,
+               __attribute__((unused)) struct cmdline *cl,
+               __attribute__((unused)) void *data)
+{
+       struct cmd_set_bonding_agg_mode_policy_result *res = parsed_result;
+       uint8_t policy = AGG_BANDWIDTH;
+
+       if (res->port_num >= nb_ports) {
+               printf("Port id %d must be less than %d\n",
+                               res->port_num, nb_ports);
+               return;
+       }
+
+       if (!strcmp(res->policy, "bandwidth"))
+               policy = AGG_BANDWIDTH;
+       else if (!strcmp(res->policy, "stable"))
+               policy = AGG_STABLE;
+       else if (!strcmp(res->policy, "count"))
+               policy = AGG_COUNT;
+
+       rte_eth_bond_8023ad_agg_selection_set(res->port_num, policy);
+}
+
+
+cmdline_parse_token_string_t cmd_set_bonding_agg_mode_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_agg_mode_policy_result,
+                               set, "set");
+cmdline_parse_token_string_t cmd_set_bonding_agg_mode_bonding =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_agg_mode_policy_result,
+                               bonding, "bonding");
+
+cmdline_parse_token_string_t cmd_set_bonding_agg_mode_agg_mode =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_agg_mode_policy_result,
+                               agg_mode, "agg_mode");
+
+cmdline_parse_token_num_t cmd_set_bonding_agg_mode_portnum =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_agg_mode_policy_result,
+                               port_num, UINT16);
+
+cmdline_parse_token_string_t cmd_set_bonding_agg_mode_policy_string =
+       TOKEN_STRING_INITIALIZER(
+                       struct cmd_set_bonding_balance_xmit_policy_result,
+               policy, "stable#bandwidth#count");
+
+cmdline_parse_inst_t cmd_set_bonding_agg_mode_policy = {
+       .f = cmd_set_bonding_agg_mode,
+       .data = (void *) 0,
+       .help_str = "set bonding mode IEEE802.3AD aggregator policy <port_id> <agg_name>",
+       .tokens = {
+                       (void *)&cmd_set_bonding_agg_mode_set,
+                       (void *)&cmd_set_bonding_agg_mode_bonding,
+                       (void *)&cmd_set_bonding_agg_mode_agg_mode,
+                       (void *)&cmd_set_bonding_agg_mode_portnum,
+                       (void *)&cmd_set_bonding_agg_mode_policy_string,
+                       NULL
+               }
+};
+
+
 #endif /* RTE_LIBRTE_PMD_BOND */
 
 /* *** SET FORWARDING MODE *** */
@@ -4614,8 +5671,8 @@ static void cmd_set_fwd_mode_init(void)
        cmdline_parse_token_string_t *token_struct;
 
        modes = list_pkt_forwarding_modes();
-       snprintf(help, sizeof help, "set fwd %s - "
-               "set packet forwarding mode", modes);
+       snprintf(help, sizeof(help), "set fwd %s: "
+               "Set packet forwarding mode", modes);
        cmd_set_fwd_mode.help_str = help;
 
        /* string token separator is # */
@@ -4681,8 +5738,8 @@ static void cmd_set_fwd_retry_mode_init(void)
        cmdline_parse_token_string_t *token_struct;
 
        modes = list_pkt_forwarding_retry_modes();
-       snprintf(help, sizeof(help), "set fwd %s retry - "
-               "set packet forwarding mode with retry", modes);
+       snprintf(help, sizeof(help), "set fwd %s retry: "
+               "Set packet forwarding mode with retry", modes);
        cmd_set_fwd_retry_mode.help_str = help;
 
        /* string token separator is # */
@@ -4741,7 +5798,7 @@ cmdline_parse_token_num_t cmd_set_burst_tx_retry_retry_num =
 
 cmdline_parse_inst_t cmd_set_burst_tx_retry = {
        .f = cmd_set_burst_tx_retry_parsed,
-       .help_str = "set burst tx delay (time_by_useconds) retry (retry_num)",
+       .help_str = "set burst tx delay <delay_usec> retry <num_retry>",
        .tokens = {
                (void *)&cmd_set_burst_tx_retry_set,
                (void *)&cmd_set_burst_tx_retry_burst,
@@ -4759,7 +5816,7 @@ struct cmd_set_promisc_mode_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t promisc;
        cmdline_fixed_string_t port_all; /* valid if "allports" argument == 1 */
-       uint8_t port_num;                /* valid if "allports" argument == 0 */
+       uint16_t port_num;               /* valid if "allports" argument == 0 */
        cmdline_fixed_string_t mode;
 };
 
@@ -4778,7 +5835,7 @@ static void cmd_set_promisc_mode_parsed(void *parsed_result,
 
        /* all ports */
        if (allports) {
-               FOREACH_PORT(i, ports) {
+               RTE_ETH_FOREACH_DEV(i) {
                        if (enable)
                                rte_eth_promiscuous_enable(i);
                        else
@@ -4803,7 +5860,7 @@ cmdline_parse_token_string_t cmd_setpromisc_portall =
                                 "all");
 cmdline_parse_token_num_t cmd_setpromisc_portnum =
        TOKEN_NUM_INITIALIZER(struct cmd_set_promisc_mode_result, port_num,
-                             UINT8);
+                             UINT16);
 cmdline_parse_token_string_t cmd_setpromisc_mode =
        TOKEN_STRING_INITIALIZER(struct cmd_set_promisc_mode_result, mode,
                                 "on#off");
@@ -4811,7 +5868,7 @@ cmdline_parse_token_string_t cmd_setpromisc_mode =
 cmdline_parse_inst_t cmd_set_promisc_mode_all = {
        .f = cmd_set_promisc_mode_parsed,
        .data = (void *)1,
-       .help_str = "set promisc all on|off: set promisc mode for all ports",
+       .help_str = "set promisc all on|off: Set promisc mode for all ports",
        .tokens = {
                (void *)&cmd_setpromisc_set,
                (void *)&cmd_setpromisc_promisc,
@@ -4824,7 +5881,7 @@ cmdline_parse_inst_t cmd_set_promisc_mode_all = {
 cmdline_parse_inst_t cmd_set_promisc_mode_one = {
        .f = cmd_set_promisc_mode_parsed,
        .data = (void *)0,
-       .help_str = "set promisc X on|off: set promisc mode on port X",
+       .help_str = "set promisc <port_id> on|off: Set promisc mode on port_id",
        .tokens = {
                (void *)&cmd_setpromisc_set,
                (void *)&cmd_setpromisc_promisc,
@@ -4839,7 +5896,7 @@ struct cmd_set_allmulti_mode_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t allmulti;
        cmdline_fixed_string_t port_all; /* valid if "allports" argument == 1 */
-       uint8_t port_num;                /* valid if "allports" argument == 0 */
+       uint16_t port_num;               /* valid if "allports" argument == 0 */
        cmdline_fixed_string_t mode;
 };
 
@@ -4858,7 +5915,7 @@ static void cmd_set_allmulti_mode_parsed(void *parsed_result,
 
        /* all ports */
        if (allports) {
-               FOREACH_PORT(i, ports) {
+               RTE_ETH_FOREACH_DEV(i) {
                        if (enable)
                                rte_eth_allmulticast_enable(i);
                        else
@@ -4883,7 +5940,7 @@ cmdline_parse_token_string_t cmd_setallmulti_portall =
                                 "all");
 cmdline_parse_token_num_t cmd_setallmulti_portnum =
        TOKEN_NUM_INITIALIZER(struct cmd_set_allmulti_mode_result, port_num,
-                             UINT8);
+                             UINT16);
 cmdline_parse_token_string_t cmd_setallmulti_mode =
        TOKEN_STRING_INITIALIZER(struct cmd_set_allmulti_mode_result, mode,
                                 "on#off");
@@ -4891,7 +5948,7 @@ cmdline_parse_token_string_t cmd_setallmulti_mode =
 cmdline_parse_inst_t cmd_set_allmulti_mode_all = {
        .f = cmd_set_allmulti_mode_parsed,
        .data = (void *)1,
-       .help_str = "set allmulti all on|off: set allmulti mode for all ports",
+       .help_str = "set allmulti all on|off: Set allmulti mode for all ports",
        .tokens = {
                (void *)&cmd_setallmulti_set,
                (void *)&cmd_setallmulti_allmulti,
@@ -4904,7 +5961,8 @@ cmdline_parse_inst_t cmd_set_allmulti_mode_all = {
 cmdline_parse_inst_t cmd_set_allmulti_mode_one = {
        .f = cmd_set_allmulti_mode_parsed,
        .data = (void *)0,
-       .help_str = "set allmulti X on|off: set allmulti mode on port X",
+       .help_str = "set allmulti <port_id> on|off: "
+               "Set allmulti mode on port_id",
        .tokens = {
                (void *)&cmd_setallmulti_set,
                (void *)&cmd_setallmulti_allmulti,
@@ -4934,7 +5992,7 @@ struct cmd_link_flow_ctrl_set_result {
        uint16_t pause_time;
        cmdline_fixed_string_t xon_str;
        uint16_t send_xon;
-       uint8_t  port_id;
+       portid_t port_id;
 };
 
 cmdline_parse_token_string_t cmd_lfc_set_set =
@@ -4993,7 +6051,7 @@ cmdline_parse_token_string_t cmd_lfc_set_autoneg =
                                autoneg, "on#off");
 cmdline_parse_token_num_t cmd_lfc_set_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 
 /* forward declaration */
 static void
@@ -5003,9 +6061,9 @@ cmd_link_flow_ctrl_set_parsed(void *parsed_result, struct cmdline *cl,
 cmdline_parse_inst_t cmd_link_flow_control_set = {
        .f = cmd_link_flow_ctrl_set_parsed,
        .data = NULL,
-       .help_str = "Configure the Ethernet flow control: set flow_ctrl rx on|off \
-tx on|off high_water low_water pause_time send_xon mac_ctrl_frame_fwd on|off \
-autoneg on|off port_id",
+       .help_str = "set flow_ctrl rx on|off tx on|off <high_water> "
+               "<low_water> <pause_time> <send_xon> mac_ctrl_frame_fwd on|off "
+               "autoneg on|off <port_id>: Configure the Ethernet flow control",
        .tokens = {
                (void *)&cmd_lfc_set_set,
                (void *)&cmd_lfc_set_flow_ctrl,
@@ -5029,8 +6087,8 @@ autoneg on|off port_id",
 cmdline_parse_inst_t cmd_link_flow_control_set_rx = {
        .f = cmd_link_flow_ctrl_set_parsed,
        .data = (void *)&cmd_link_flow_control_set_rx,
-       .help_str = "Change rx flow control parameter: set flow_ctrl "
-                   "rx on|off port_id",
+       .help_str = "set flow_ctrl rx on|off <port_id>: "
+               "Change rx flow control parameter",
        .tokens = {
                (void *)&cmd_lfc_set_set,
                (void *)&cmd_lfc_set_flow_ctrl,
@@ -5044,8 +6102,8 @@ cmdline_parse_inst_t cmd_link_flow_control_set_rx = {
 cmdline_parse_inst_t cmd_link_flow_control_set_tx = {
        .f = cmd_link_flow_ctrl_set_parsed,
        .data = (void *)&cmd_link_flow_control_set_tx,
-       .help_str = "Change tx flow control parameter: set flow_ctrl "
-                   "tx on|off port_id",
+       .help_str = "set flow_ctrl tx on|off <port_id>: "
+               "Change tx flow control parameter",
        .tokens = {
                (void *)&cmd_lfc_set_set,
                (void *)&cmd_lfc_set_flow_ctrl,
@@ -5059,8 +6117,8 @@ cmdline_parse_inst_t cmd_link_flow_control_set_tx = {
 cmdline_parse_inst_t cmd_link_flow_control_set_hw = {
        .f = cmd_link_flow_ctrl_set_parsed,
        .data = (void *)&cmd_link_flow_control_set_hw,
-       .help_str = "Change high water flow control parameter: set flow_ctrl "
-                   "high_water value port_id",
+       .help_str = "set flow_ctrl high_water <value> <port_id>: "
+               "Change high water flow control parameter",
        .tokens = {
                (void *)&cmd_lfc_set_set,
                (void *)&cmd_lfc_set_flow_ctrl,
@@ -5074,8 +6132,8 @@ cmdline_parse_inst_t cmd_link_flow_control_set_hw = {
 cmdline_parse_inst_t cmd_link_flow_control_set_lw = {
        .f = cmd_link_flow_ctrl_set_parsed,
        .data = (void *)&cmd_link_flow_control_set_lw,
-       .help_str = "Change low water flow control parameter: set flow_ctrl "
-                   "low_water value port_id",
+       .help_str = "set flow_ctrl low_water <value> <port_id>: "
+               "Change low water flow control parameter",
        .tokens = {
                (void *)&cmd_lfc_set_set,
                (void *)&cmd_lfc_set_flow_ctrl,
@@ -5089,8 +6147,8 @@ cmdline_parse_inst_t cmd_link_flow_control_set_lw = {
 cmdline_parse_inst_t cmd_link_flow_control_set_pt = {
        .f = cmd_link_flow_ctrl_set_parsed,
        .data = (void *)&cmd_link_flow_control_set_pt,
-       .help_str = "Change pause time flow control parameter: set flow_ctrl "
-                   "pause_time value port_id",
+       .help_str = "set flow_ctrl pause_time <value> <port_id>: "
+               "Change pause time flow control parameter",
        .tokens = {
                (void *)&cmd_lfc_set_set,
                (void *)&cmd_lfc_set_flow_ctrl,
@@ -5104,8 +6162,8 @@ cmdline_parse_inst_t cmd_link_flow_control_set_pt = {
 cmdline_parse_inst_t cmd_link_flow_control_set_xon = {
        .f = cmd_link_flow_ctrl_set_parsed,
        .data = (void *)&cmd_link_flow_control_set_xon,
-       .help_str = "Change send_xon flow control parameter: set flow_ctrl "
-                   "send_xon value port_id",
+       .help_str = "set flow_ctrl send_xon <value> <port_id>: "
+               "Change send_xon flow control parameter",
        .tokens = {
                (void *)&cmd_lfc_set_set,
                (void *)&cmd_lfc_set_flow_ctrl,
@@ -5119,8 +6177,8 @@ cmdline_parse_inst_t cmd_link_flow_control_set_xon = {
 cmdline_parse_inst_t cmd_link_flow_control_set_macfwd = {
        .f = cmd_link_flow_ctrl_set_parsed,
        .data = (void *)&cmd_link_flow_control_set_macfwd,
-       .help_str = "Change mac ctrl fwd flow control parameter: set flow_ctrl "
-                   "mac_ctrl_frame_fwd on|off port_id",
+       .help_str = "set flow_ctrl mac_ctrl_frame_fwd on|off <port_id>: "
+               "Change mac ctrl fwd flow control parameter",
        .tokens = {
                (void *)&cmd_lfc_set_set,
                (void *)&cmd_lfc_set_flow_ctrl,
@@ -5134,8 +6192,8 @@ cmdline_parse_inst_t cmd_link_flow_control_set_macfwd = {
 cmdline_parse_inst_t cmd_link_flow_control_set_autoneg = {
        .f = cmd_link_flow_ctrl_set_parsed,
        .data = (void *)&cmd_link_flow_control_set_autoneg,
-       .help_str = "Change autoneg flow control parameter: set flow_ctrl "
-                   "autoneg on|off port_id",
+       .help_str = "set flow_ctrl autoneg on|off <port_id>: "
+               "Change autoneg flow control parameter",
        .tokens = {
                (void *)&cmd_lfc_set_set,
                (void *)&cmd_lfc_set_flow_ctrl,
@@ -5220,7 +6278,7 @@ cmd_link_flow_ctrl_set_parsed(void *parsed_result,
                printf("bad flow contrl parameter, return code = %d \n", ret);
 }
 
-/* *** SETUP ETHERNET PIRORITY FLOW CONTROL *** */
+/* *** SETUP ETHERNET PRIORITY FLOW CONTROL *** */
 struct cmd_priority_flow_ctrl_set_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t pfc_ctrl;
@@ -5232,7 +6290,7 @@ struct cmd_priority_flow_ctrl_set_result {
        uint32_t low_water;
        uint16_t pause_time;
        uint8_t  priority;
-       uint8_t  port_id;
+       portid_t port_id;
 };
 
 static void
@@ -5300,13 +6358,14 @@ cmdline_parse_token_num_t cmd_pfc_set_priority =
                                priority, UINT8);
 cmdline_parse_token_num_t cmd_pfc_set_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 
 cmdline_parse_inst_t cmd_priority_flow_control_set = {
        .f = cmd_priority_flow_ctrl_set_parsed,
        .data = NULL,
-       .help_str = "Configure the Ethernet priority flow control: set pfc_ctrl rx on|off\n\
-                       tx on|off high_water low_water pause_time priority port_id",
+       .help_str = "set pfc_ctrl rx on|off tx on|off <high_water> <low_water> "
+               "<pause_time> <priority> <port_id>: "
+               "Configure the Ethernet priority flow control",
        .tokens = {
                (void *)&cmd_pfc_set_set,
                (void *)&cmd_pfc_set_flow_ctrl,
@@ -5346,7 +6405,7 @@ cmdline_parse_token_string_t cmd_reset_def =
 cmdline_parse_inst_t cmd_reset = {
        .f = cmd_reset_parsed,
        .data = NULL,
-       .help_str = "set default: reset default forwarding configuration",
+       .help_str = "set default: Reset default forwarding configuration",
        .tokens = {
                (void *)&cmd_reset_set,
                (void *)&cmd_reset_def,
@@ -5372,7 +6431,7 @@ static void cmd_start_parsed(__attribute__((unused)) void *parsed_result,
 cmdline_parse_inst_t cmd_start = {
        .f = cmd_start_parsed,
        .data = NULL,
-       .help_str = "start packet forwarding",
+       .help_str = "start: Start packet forwarding",
        .tokens = {
                (void *)&cmd_start_start,
                NULL,
@@ -5403,7 +6462,8 @@ cmdline_parse_token_string_t cmd_start_tx_first_tx_first =
 cmdline_parse_inst_t cmd_start_tx_first = {
        .f = cmd_start_tx_first_parsed,
        .data = NULL,
-       .help_str = "start packet forwarding, after sending 1 burst of packets",
+       .help_str = "start tx_first: Start packet forwarding, "
+               "after sending 1 burst of packets",
        .tokens = {
                (void *)&cmd_start_tx_first_start,
                (void *)&cmd_start_tx_first_tx_first,
@@ -5441,8 +6501,8 @@ cmdline_parse_token_num_t cmd_start_tx_first_n_tx_num =
 cmdline_parse_inst_t cmd_start_tx_first_n = {
        .f = cmd_start_tx_first_n_parsed,
        .data = NULL,
-       .help_str = "start packet forwarding, after sending <num> "
-               "bursts of packets",
+       .help_str = "start tx_first <num>: "
+               "packet forwarding, after sending <num> bursts of packets",
        .tokens = {
                (void *)&cmd_start_tx_first_n_start,
                (void *)&cmd_start_tx_first_n_tx_first,
@@ -5456,7 +6516,7 @@ struct cmd_set_link_up_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t link_up;
        cmdline_fixed_string_t port;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 cmdline_parse_token_string_t cmd_set_link_up_set =
@@ -5467,7 +6527,7 @@ cmdline_parse_token_string_t cmd_set_link_up_link_up =
 cmdline_parse_token_string_t cmd_set_link_up_port =
        TOKEN_STRING_INITIALIZER(struct cmd_set_link_up_result, port, "port");
 cmdline_parse_token_num_t cmd_set_link_up_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_set_link_up_result, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_set_link_up_result, port_id, UINT16);
 
 static void cmd_set_link_up_parsed(__attribute__((unused)) void *parsed_result,
                             __attribute__((unused)) struct cmdline *cl,
@@ -5480,7 +6540,7 @@ static void cmd_set_link_up_parsed(__attribute__((unused)) void *parsed_result,
 cmdline_parse_inst_t cmd_set_link_up = {
        .f = cmd_set_link_up_parsed,
        .data = NULL,
-       .help_str = "set link-up port (port id)",
+       .help_str = "set link-up port <port id>",
        .tokens = {
                (void *)&cmd_set_link_up_set,
                (void *)&cmd_set_link_up_link_up,
@@ -5495,7 +6555,7 @@ struct cmd_set_link_down_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t link_down;
        cmdline_fixed_string_t port;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 cmdline_parse_token_string_t cmd_set_link_down_set =
@@ -5506,7 +6566,7 @@ cmdline_parse_token_string_t cmd_set_link_down_link_down =
 cmdline_parse_token_string_t cmd_set_link_down_port =
        TOKEN_STRING_INITIALIZER(struct cmd_set_link_down_result, port, "port");
 cmdline_parse_token_num_t cmd_set_link_down_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_set_link_down_result, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_set_link_down_result, port_id, UINT16);
 
 static void cmd_set_link_down_parsed(
                                __attribute__((unused)) void *parsed_result,
@@ -5520,7 +6580,7 @@ static void cmd_set_link_down_parsed(
 cmdline_parse_inst_t cmd_set_link_down = {
        .f = cmd_set_link_down_parsed,
        .data = NULL,
-       .help_str = "set link-down port (port id)",
+       .help_str = "set link-down port <port id>",
        .tokens = {
                (void *)&cmd_set_link_down_set,
                (void *)&cmd_set_link_down_link_down,
@@ -5589,29 +6649,32 @@ static void cmd_showportall_parsed(void *parsed_result,
        struct cmd_showportall_result *res = parsed_result;
        if (!strcmp(res->show, "clear")) {
                if (!strcmp(res->what, "stats"))
-                       FOREACH_PORT(i, ports)
+                       RTE_ETH_FOREACH_DEV(i)
                                nic_stats_clear(i);
                else if (!strcmp(res->what, "xstats"))
-                       FOREACH_PORT(i, ports)
+                       RTE_ETH_FOREACH_DEV(i)
                                nic_xstats_clear(i);
        } else if (!strcmp(res->what, "info"))
-               FOREACH_PORT(i, ports)
+               RTE_ETH_FOREACH_DEV(i)
                        port_infos_display(i);
        else if (!strcmp(res->what, "stats"))
-               FOREACH_PORT(i, ports)
+               RTE_ETH_FOREACH_DEV(i)
                        nic_stats_display(i);
        else if (!strcmp(res->what, "xstats"))
-               FOREACH_PORT(i, ports)
+               RTE_ETH_FOREACH_DEV(i)
                        nic_xstats_display(i);
        else if (!strcmp(res->what, "fdir"))
-               FOREACH_PORT(i, ports)
+               RTE_ETH_FOREACH_DEV(i)
                        fdir_get_infos(i);
        else if (!strcmp(res->what, "stat_qmap"))
-               FOREACH_PORT(i, ports)
+               RTE_ETH_FOREACH_DEV(i)
                        nic_stats_mapping_display(i);
        else if (!strcmp(res->what, "dcb_tc"))
-               FOREACH_PORT(i, ports)
+               RTE_ETH_FOREACH_DEV(i)
                        port_dcb_info_display(i);
+       else if (!strcmp(res->what, "cap"))
+               RTE_ETH_FOREACH_DEV(i)
+                       port_offload_cap_display(i);
 }
 
 cmdline_parse_token_string_t cmd_showportall_show =
@@ -5621,13 +6684,14 @@ 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#xstats#fdir#stat_qmap#dcb_tc");
+                                "info#stats#xstats#fdir#stat_qmap#dcb_tc#cap");
 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|xstats|fdir|stat_qmap|dcb_tc all",
+       .help_str = "show|clear port "
+               "info|stats|xstats|fdir|stat_qmap|dcb_tc|cap all",
        .tokens = {
                (void *)&cmd_showportall_show,
                (void *)&cmd_showportall_port,
@@ -5642,7 +6706,7 @@ struct cmd_showport_result {
        cmdline_fixed_string_t show;
        cmdline_fixed_string_t port;
        cmdline_fixed_string_t what;
-       uint8_t portnum;
+       uint16_t portnum;
 };
 
 static void cmd_showport_parsed(void *parsed_result,
@@ -5667,6 +6731,8 @@ static void cmd_showport_parsed(void *parsed_result,
                nic_stats_mapping_display(res->portnum);
        else if (!strcmp(res->what, "dcb_tc"))
                port_dcb_info_display(res->portnum);
+       else if (!strcmp(res->what, "cap"))
+               port_offload_cap_display(res->portnum);
 }
 
 cmdline_parse_token_string_t cmd_showport_show =
@@ -5676,14 +6742,16 @@ 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#xstats#fdir#stat_qmap#dcb_tc");
+                                "info#stats#xstats#fdir#stat_qmap#dcb_tc#cap");
 cmdline_parse_token_num_t cmd_showport_portnum =
-       TOKEN_NUM_INITIALIZER(struct cmd_showport_result, portnum, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_showport_result, portnum, UINT16);
 
 cmdline_parse_inst_t cmd_showport = {
        .f = cmd_showport_parsed,
        .data = NULL,
-       .help_str = "show|clear port info|stats|xstats|fdir|stat_qmap|dcb_tc X (X = port number)",
+       .help_str = "show|clear port "
+               "info|stats|xstats|fdir|stat_qmap|dcb_tc|cap "
+               "<port_id>",
        .tokens = {
                (void *)&cmd_showport_show,
                (void *)&cmd_showport_port,
@@ -5698,7 +6766,7 @@ struct cmd_showqueue_result {
        cmdline_fixed_string_t show;
        cmdline_fixed_string_t type;
        cmdline_fixed_string_t what;
-       uint8_t portnum;
+       uint16_t portnum;
        uint16_t queuenum;
 };
 
@@ -5722,14 +6790,14 @@ cmdline_parse_token_string_t cmd_showqueue_type =
 cmdline_parse_token_string_t cmd_showqueue_what =
        TOKEN_STRING_INITIALIZER(struct cmd_showqueue_result, what, "info");
 cmdline_parse_token_num_t cmd_showqueue_portnum =
-       TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, portnum, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, portnum, UINT16);
 cmdline_parse_token_num_t cmd_showqueue_queuenum =
        TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, queuenum, UINT16);
 
 cmdline_parse_inst_t cmd_showqueue = {
        .f = cmd_showqueue_parsed,
        .data = NULL,
-       .help_str = "show rxq|txq info <port number> <queue_number>",
+       .help_str = "show rxq|txq info <port_id> <queue_id>",
        .tokens = {
                (void *)&cmd_showqueue_show,
                (void *)&cmd_showqueue_type,
@@ -5744,7 +6812,7 @@ cmdline_parse_inst_t cmd_showqueue = {
 struct cmd_read_reg_result {
        cmdline_fixed_string_t read;
        cmdline_fixed_string_t reg;
-       uint8_t port_id;
+       portid_t port_id;
        uint32_t reg_off;
 };
 
@@ -5762,14 +6830,14 @@ cmdline_parse_token_string_t cmd_read_reg_read =
 cmdline_parse_token_string_t cmd_read_reg_reg =
        TOKEN_STRING_INITIALIZER(struct cmd_read_reg_result, reg, "reg");
 cmdline_parse_token_num_t cmd_read_reg_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_read_reg_result, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_read_reg_result, port_id, UINT16);
 cmdline_parse_token_num_t cmd_read_reg_reg_off =
        TOKEN_NUM_INITIALIZER(struct cmd_read_reg_result, reg_off, UINT32);
 
 cmdline_parse_inst_t cmd_read_reg = {
        .f = cmd_read_reg_parsed,
        .data = NULL,
-       .help_str = "read reg port_id reg_off",
+       .help_str = "read reg <port_id> <reg_off>",
        .tokens = {
                (void *)&cmd_read_reg_read,
                (void *)&cmd_read_reg_reg,
@@ -5783,7 +6851,7 @@ cmdline_parse_inst_t cmd_read_reg = {
 struct cmd_read_reg_bit_field_result {
        cmdline_fixed_string_t read;
        cmdline_fixed_string_t regfield;
-       uint8_t port_id;
+       portid_t port_id;
        uint32_t reg_off;
        uint8_t bit1_pos;
        uint8_t bit2_pos;
@@ -5807,7 +6875,7 @@ cmdline_parse_token_string_t cmd_read_reg_bit_field_regfield =
                                 regfield, "regfield");
 cmdline_parse_token_num_t cmd_read_reg_bit_field_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_field_result, port_id,
-                             UINT8);
+                             UINT16);
 cmdline_parse_token_num_t cmd_read_reg_bit_field_reg_off =
        TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_field_result, reg_off,
                              UINT32);
@@ -5821,8 +6889,8 @@ cmdline_parse_token_num_t cmd_read_reg_bit_field_bit2_pos =
 cmdline_parse_inst_t cmd_read_reg_bit_field = {
        .f = cmd_read_reg_bit_field_parsed,
        .data = NULL,
-       .help_str = "read regfield port_id reg_off bit_x bit_y "
-       "(read register bit field between bit_x and bit_y included)",
+       .help_str = "read regfield <port_id> <reg_off> <bit_x> <bit_y>: "
+       "Read register bit field between bit_x and bit_y included",
        .tokens = {
                (void *)&cmd_read_reg_bit_field_read,
                (void *)&cmd_read_reg_bit_field_regfield,
@@ -5838,7 +6906,7 @@ cmdline_parse_inst_t cmd_read_reg_bit_field = {
 struct cmd_read_reg_bit_result {
        cmdline_fixed_string_t read;
        cmdline_fixed_string_t regbit;
-       uint8_t port_id;
+       portid_t port_id;
        uint32_t reg_off;
        uint8_t bit_pos;
 };
@@ -5858,7 +6926,7 @@ cmdline_parse_token_string_t cmd_read_reg_bit_regbit =
        TOKEN_STRING_INITIALIZER(struct cmd_read_reg_bit_result,
                                 regbit, "regbit");
 cmdline_parse_token_num_t cmd_read_reg_bit_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, port_id, UINT16);
 cmdline_parse_token_num_t cmd_read_reg_bit_reg_off =
        TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, reg_off, UINT32);
 cmdline_parse_token_num_t cmd_read_reg_bit_bit_pos =
@@ -5867,7 +6935,7 @@ cmdline_parse_token_num_t cmd_read_reg_bit_bit_pos =
 cmdline_parse_inst_t cmd_read_reg_bit = {
        .f = cmd_read_reg_bit_parsed,
        .data = NULL,
-       .help_str = "read regbit port_id reg_off bit_x (0 <= bit_x <= 31)",
+       .help_str = "read regbit <port_id> <reg_off> <bit_x>: 0 <= bit_x <= 31",
        .tokens = {
                (void *)&cmd_read_reg_bit_read,
                (void *)&cmd_read_reg_bit_regbit,
@@ -5882,7 +6950,7 @@ cmdline_parse_inst_t cmd_read_reg_bit = {
 struct cmd_write_reg_result {
        cmdline_fixed_string_t write;
        cmdline_fixed_string_t reg;
-       uint8_t port_id;
+       portid_t port_id;
        uint32_t reg_off;
        uint32_t value;
 };
@@ -5901,7 +6969,7 @@ cmdline_parse_token_string_t cmd_write_reg_write =
 cmdline_parse_token_string_t cmd_write_reg_reg =
        TOKEN_STRING_INITIALIZER(struct cmd_write_reg_result, reg, "reg");
 cmdline_parse_token_num_t cmd_write_reg_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, port_id, UINT16);
 cmdline_parse_token_num_t cmd_write_reg_reg_off =
        TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, reg_off, UINT32);
 cmdline_parse_token_num_t cmd_write_reg_value =
@@ -5910,7 +6978,7 @@ cmdline_parse_token_num_t cmd_write_reg_value =
 cmdline_parse_inst_t cmd_write_reg = {
        .f = cmd_write_reg_parsed,
        .data = NULL,
-       .help_str = "write reg port_id reg_off reg_value",
+       .help_str = "write reg <port_id> <reg_off> <reg_value>",
        .tokens = {
                (void *)&cmd_write_reg_write,
                (void *)&cmd_write_reg_reg,
@@ -5925,7 +6993,7 @@ cmdline_parse_inst_t cmd_write_reg = {
 struct cmd_write_reg_bit_field_result {
        cmdline_fixed_string_t write;
        cmdline_fixed_string_t regfield;
-       uint8_t port_id;
+       portid_t port_id;
        uint32_t reg_off;
        uint8_t bit1_pos;
        uint8_t bit2_pos;
@@ -5950,7 +7018,7 @@ cmdline_parse_token_string_t cmd_write_reg_bit_field_regfield =
                                 regfield, "regfield");
 cmdline_parse_token_num_t cmd_write_reg_bit_field_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, port_id,
-                             UINT8);
+                             UINT16);
 cmdline_parse_token_num_t cmd_write_reg_bit_field_reg_off =
        TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, reg_off,
                              UINT32);
@@ -5967,8 +7035,9 @@ cmdline_parse_token_num_t cmd_write_reg_bit_field_value =
 cmdline_parse_inst_t cmd_write_reg_bit_field = {
        .f = cmd_write_reg_bit_field_parsed,
        .data = NULL,
-       .help_str = "write regfield port_id reg_off bit_x bit_y reg_value"
-       "(set register bit field between bit_x and bit_y included)",
+       .help_str = "write regfield <port_id> <reg_off> <bit_x> <bit_y> "
+               "<reg_value>: "
+               "Set register bit field between bit_x and bit_y included",
        .tokens = {
                (void *)&cmd_write_reg_bit_field_write,
                (void *)&cmd_write_reg_bit_field_regfield,
@@ -5985,7 +7054,7 @@ cmdline_parse_inst_t cmd_write_reg_bit_field = {
 struct cmd_write_reg_bit_result {
        cmdline_fixed_string_t write;
        cmdline_fixed_string_t regbit;
-       uint8_t port_id;
+       portid_t port_id;
        uint32_t reg_off;
        uint8_t bit_pos;
        uint8_t value;
@@ -6007,7 +7076,7 @@ cmdline_parse_token_string_t cmd_write_reg_bit_regbit =
        TOKEN_STRING_INITIALIZER(struct cmd_write_reg_bit_result,
                                 regbit, "regbit");
 cmdline_parse_token_num_t cmd_write_reg_bit_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, port_id, UINT16);
 cmdline_parse_token_num_t cmd_write_reg_bit_reg_off =
        TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, reg_off, UINT32);
 cmdline_parse_token_num_t cmd_write_reg_bit_bit_pos =
@@ -6018,7 +7087,8 @@ cmdline_parse_token_num_t cmd_write_reg_bit_value =
 cmdline_parse_inst_t cmd_write_reg_bit = {
        .f = cmd_write_reg_bit_parsed,
        .data = NULL,
-       .help_str = "write regbit port_id reg_off bit_x 0/1 (0 <= bit_x <= 31)",
+       .help_str = "write regbit <port_id> <reg_off> <bit_x> 0|1: "
+               "0 <= bit_x <= 31",
        .tokens = {
                (void *)&cmd_write_reg_bit_write,
                (void *)&cmd_write_reg_bit_regbit,
@@ -6034,7 +7104,7 @@ cmdline_parse_inst_t cmd_write_reg_bit = {
 struct cmd_read_rxd_txd_result {
        cmdline_fixed_string_t read;
        cmdline_fixed_string_t rxd_txd;
-       uint8_t port_id;
+       portid_t port_id;
        uint16_t queue_id;
        uint16_t desc_id;
 };
@@ -6058,7 +7128,7 @@ cmdline_parse_token_string_t cmd_read_rxd_txd_rxd_txd =
        TOKEN_STRING_INITIALIZER(struct cmd_read_rxd_txd_result, rxd_txd,
                                 "rxd#txd");
 cmdline_parse_token_num_t cmd_read_rxd_txd_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, port_id, UINT16);
 cmdline_parse_token_num_t cmd_read_rxd_txd_queue_id =
        TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, queue_id, UINT16);
 cmdline_parse_token_num_t cmd_read_rxd_txd_desc_id =
@@ -6067,7 +7137,7 @@ cmdline_parse_token_num_t cmd_read_rxd_txd_desc_id =
 cmdline_parse_inst_t cmd_read_rxd_txd = {
        .f = cmd_read_rxd_txd_parsed,
        .data = NULL,
-       .help_str = "read rxd|txd port_id queue_id rxd_id",
+       .help_str = "read rxd|txd <port_id> <queue_id> <desc_id>",
        .tokens = {
                (void *)&cmd_read_rxd_txd_read,
                (void *)&cmd_read_rxd_txd_rxd_txd,
@@ -6097,7 +7167,7 @@ cmdline_parse_token_string_t cmd_quit_quit =
 cmdline_parse_inst_t cmd_quit = {
        .f = cmd_quit_parsed,
        .data = NULL,
-       .help_str = "exit application",
+       .help_str = "quit: Exit application",
        .tokens = {
                (void *)&cmd_quit_quit,
                NULL,
@@ -6108,7 +7178,7 @@ cmdline_parse_inst_t cmd_quit = {
 struct cmd_mac_addr_result {
        cmdline_fixed_string_t mac_addr_cmd;
        cmdline_fixed_string_t what;
-       uint8_t port_num;
+       uint16_t port_num;
        struct ether_addr address;
 };
 
@@ -6121,6 +7191,9 @@ static void cmd_mac_addr_parsed(void *parsed_result,
 
        if (strcmp(res->what, "add") == 0)
                ret = rte_eth_dev_mac_addr_add(res->port_num, &res->address, 0);
+       else if (strcmp(res->what, "set") == 0)
+               ret = rte_eth_dev_default_mac_addr_set(res->port_num,
+                                                      &res->address);
        else
                ret = rte_eth_dev_mac_addr_remove(res->port_num, &res->address);
 
@@ -6135,17 +7208,18 @@ cmdline_parse_token_string_t cmd_mac_addr_cmd =
                                "mac_addr");
 cmdline_parse_token_string_t cmd_mac_addr_what =
        TOKEN_STRING_INITIALIZER(struct cmd_mac_addr_result, what,
-                               "add#remove");
+                               "add#remove#set");
 cmdline_parse_token_num_t cmd_mac_addr_portnum =
-               TOKEN_NUM_INITIALIZER(struct cmd_mac_addr_result, port_num, UINT8);
+               TOKEN_NUM_INITIALIZER(struct cmd_mac_addr_result, port_num,
+                                       UINT16);
 cmdline_parse_token_etheraddr_t cmd_mac_addr_addr =
                TOKEN_ETHERADDR_INITIALIZER(struct cmd_mac_addr_result, address);
 
 cmdline_parse_inst_t cmd_mac_addr = {
        .f = cmd_mac_addr_parsed,
        .data = (void *)0,
-       .help_str = "mac_addr add|remove X <address>: "
-                       "add/remove MAC address on port X",
+       .help_str = "mac_addr add|remove|set <port_id> <mac_addr>: "
+                       "Add/Remove/Set MAC address on port_id",
        .tokens = {
                (void *)&cmd_mac_addr_cmd,
                (void *)&cmd_mac_addr_what,
@@ -6155,13 +7229,57 @@ cmdline_parse_inst_t cmd_mac_addr = {
        },
 };
 
+/* *** SET THE PEER ADDRESS FOR CERTAIN PORT *** */
+struct cmd_eth_peer_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t eth_peer;
+       portid_t port_id;
+       cmdline_fixed_string_t peer_addr;
+};
+
+static void cmd_set_eth_peer_parsed(void *parsed_result,
+                       __attribute__((unused)) struct cmdline *cl,
+                       __attribute__((unused)) void *data)
+{
+               struct cmd_eth_peer_result *res = parsed_result;
+
+               if (test_done == 0) {
+                       printf("Please stop forwarding first\n");
+                       return;
+               }
+               if (!strcmp(res->eth_peer, "eth-peer")) {
+                       set_fwd_eth_peer(res->port_id, res->peer_addr);
+                       fwd_config_setup();
+               }
+}
+cmdline_parse_token_string_t cmd_eth_peer_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_eth_peer_result, set, "set");
+cmdline_parse_token_string_t cmd_eth_peer =
+       TOKEN_STRING_INITIALIZER(struct cmd_eth_peer_result, eth_peer, "eth-peer");
+cmdline_parse_token_num_t cmd_eth_peer_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_eth_peer_result, port_id, UINT16);
+cmdline_parse_token_string_t cmd_eth_peer_addr =
+       TOKEN_STRING_INITIALIZER(struct cmd_eth_peer_result, peer_addr, NULL);
+
+cmdline_parse_inst_t cmd_set_fwd_eth_peer = {
+       .f = cmd_set_eth_peer_parsed,
+       .data = NULL,
+       .help_str = "set eth-peer <port_id> <peer_mac>",
+       .tokens = {
+               (void *)&cmd_eth_peer_set,
+               (void *)&cmd_eth_peer,
+               (void *)&cmd_eth_peer_port_id,
+               (void *)&cmd_eth_peer_addr,
+               NULL,
+       },
+};
 
 /* *** CONFIGURE QUEUE STATS COUNTER MAPPINGS *** */
 struct cmd_set_qmap_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t qmap;
        cmdline_fixed_string_t what;
-       uint8_t port_id;
+       portid_t port_id;
        uint16_t queue_id;
        uint8_t map_value;
 };
@@ -6188,7 +7306,7 @@ cmdline_parse_token_string_t cmd_setqmap_what =
                                 what, "tx#rx");
 cmdline_parse_token_num_t cmd_setqmap_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_qmap_result,
-                             port_id, UINT8);
+                             port_id, UINT16);
 cmdline_parse_token_num_t cmd_setqmap_queueid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_qmap_result,
                              queue_id, UINT16);
@@ -6199,7 +7317,8 @@ cmdline_parse_token_num_t cmd_setqmap_mapvalue =
 cmdline_parse_inst_t cmd_set_qmap = {
        .f = cmd_set_qmap_parsed,
        .data = NULL,
-       .help_str = "Set statistics mapping value on tx|rx queue_id of port_id",
+       .help_str = "set stat_qmap rx|tx <port_id> <queue_id> <map_value>: "
+               "Set statistics mapping value on tx|rx queue_id of port_id",
        .tokens = {
                (void *)&cmd_setqmap_set,
                (void *)&cmd_setqmap_qmap,
@@ -6211,11 +7330,53 @@ cmdline_parse_inst_t cmd_set_qmap = {
        },
 };
 
+/* *** SET OPTION TO HIDE ZERO VALUES FOR XSTATS  DISPLAY *** */
+struct cmd_set_xstats_hide_zero_result {
+       cmdline_fixed_string_t keyword;
+       cmdline_fixed_string_t name;
+       cmdline_fixed_string_t on_off;
+};
+
+static void
+cmd_set_xstats_hide_zero_parsed(void *parsed_result,
+                       __attribute__((unused)) struct cmdline *cl,
+                       __attribute__((unused)) void *data)
+{
+       struct cmd_set_xstats_hide_zero_result *res;
+       uint16_t on_off = 0;
+
+       res = parsed_result;
+       on_off = !strcmp(res->on_off, "on") ? 1 : 0;
+       set_xstats_hide_zero(on_off);
+}
+
+cmdline_parse_token_string_t cmd_set_xstats_hide_zero_keyword =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_xstats_hide_zero_result,
+                                keyword, "set");
+cmdline_parse_token_string_t cmd_set_xstats_hide_zero_name =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_xstats_hide_zero_result,
+                                name, "xstats-hide-zero");
+cmdline_parse_token_string_t cmd_set_xstats_hide_zero_on_off =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_xstats_hide_zero_result,
+                                on_off, "on#off");
+
+cmdline_parse_inst_t cmd_set_xstats_hide_zero = {
+       .f = cmd_set_xstats_hide_zero_parsed,
+       .data = NULL,
+       .help_str = "set xstats-hide-zero on|off",
+       .tokens = {
+               (void *)&cmd_set_xstats_hide_zero_keyword,
+               (void *)&cmd_set_xstats_hide_zero_name,
+               (void *)&cmd_set_xstats_hide_zero_on_off,
+               NULL,
+       },
+};
+
 /* *** CONFIGURE UNICAST HASH TABLE *** */
 struct cmd_set_uc_hash_table {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t port;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t what;
        struct ether_addr address;
        cmdline_fixed_string_t mode;
@@ -6247,7 +7408,7 @@ cmdline_parse_token_string_t cmd_set_uc_hash_port =
                                 port, "port");
 cmdline_parse_token_num_t cmd_set_uc_hash_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_uc_hash_table,
-                             port_id, UINT8);
+                             port_id, UINT16);
 cmdline_parse_token_string_t cmd_set_uc_hash_what =
        TOKEN_STRING_INITIALIZER(struct cmd_set_uc_hash_table,
                                 what, "uta");
@@ -6261,7 +7422,7 @@ cmdline_parse_token_string_t cmd_set_uc_hash_mode =
 cmdline_parse_inst_t cmd_set_uc_hash_filter = {
        .f = cmd_set_uc_hash_parsed,
        .data = NULL,
-       .help_str = "set port X uta Y on|off(X = port number,Y = MAC address)",
+       .help_str = "set port <port_id> uta <mac_addr> on|off)",
        .tokens = {
                (void *)&cmd_set_uc_hash_set,
                (void *)&cmd_set_uc_hash_port,
@@ -6276,7 +7437,7 @@ cmdline_parse_inst_t cmd_set_uc_hash_filter = {
 struct cmd_set_uc_all_hash_table {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t port;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t what;
        cmdline_fixed_string_t value;
        cmdline_fixed_string_t mode;
@@ -6308,7 +7469,7 @@ cmdline_parse_token_string_t cmd_set_uc_all_hash_port =
                                 port, "port");
 cmdline_parse_token_num_t cmd_set_uc_all_hash_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_uc_all_hash_table,
-                             port_id, UINT8);
+                             port_id, UINT16);
 cmdline_parse_token_string_t cmd_set_uc_all_hash_what =
        TOKEN_STRING_INITIALIZER(struct cmd_set_uc_all_hash_table,
                                 what, "uta");
@@ -6322,7 +7483,7 @@ cmdline_parse_token_string_t cmd_set_uc_all_hash_mode =
 cmdline_parse_inst_t cmd_set_uc_all_hash_filter = {
        .f = cmd_set_uc_all_hash_parsed,
        .data = NULL,
-       .help_str = "set port X uta all on|off (X = port number)",
+       .help_str = "set port <port_id> uta all on|off",
        .tokens = {
                (void *)&cmd_set_uc_all_hash_set,
                (void *)&cmd_set_uc_all_hash_port,
@@ -6338,7 +7499,7 @@ cmdline_parse_inst_t cmd_set_uc_all_hash_filter = {
 struct cmd_set_vf_macvlan_filter {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t port;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t vf;
        uint8_t vf_id;
        struct ether_addr address;
@@ -6357,7 +7518,7 @@ cmd_set_vf_macvlan_parsed(void *parsed_result,
 
        memset(&filter, 0, sizeof(struct rte_eth_mac_filter));
 
-       (void)rte_memcpy(&filter.mac_addr, &res->address, ETHER_ADDR_LEN);
+       rte_memcpy(&filter.mac_addr, &res->address, ETHER_ADDR_LEN);
 
        /* set VF MAC filter */
        filter.is_vf = 1;
@@ -6400,7 +7561,7 @@ cmdline_parse_token_string_t cmd_set_vf_macvlan_port =
                                 port, "port");
 cmdline_parse_token_num_t cmd_set_vf_macvlan_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_vf_macvlan_filter,
-                             port_id, UINT8);
+                             port_id, UINT16);
 cmdline_parse_token_string_t cmd_set_vf_macvlan_vf =
        TOKEN_STRING_INITIALIZER(struct cmd_set_vf_macvlan_filter,
                                 vf, "vf");
@@ -6421,12 +7582,10 @@ cmdline_parse_token_string_t cmd_set_vf_macvlan_mode =
 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",
+       .help_str = "set port <port_id> vf <vf_id> <mac_addr> "
+               "exact-mac|exact-mac-vlan|hashmac|hashmac-vlan on|off: "
+               "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,
@@ -6444,7 +7603,7 @@ cmdline_parse_inst_t cmd_set_vf_macvlan_filter = {
 struct cmd_set_vf_traffic {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t port;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t vf;
        uint8_t vf_id;
        cmdline_fixed_string_t what;
@@ -6471,7 +7630,7 @@ cmdline_parse_token_string_t cmd_setvf_traffic_port =
                                 port, "port");
 cmdline_parse_token_num_t cmd_setvf_traffic_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_vf_traffic,
-                             port_id, UINT8);
+                             port_id, UINT16);
 cmdline_parse_token_string_t cmd_setvf_traffic_vf =
        TOKEN_STRING_INITIALIZER(struct cmd_set_vf_traffic,
                                 vf, "vf");
@@ -6488,8 +7647,7 @@ cmdline_parse_token_string_t cmd_setvf_traffic_mode =
 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 <port_id> vf <vf_id> rx|tx on|off",
        .tokens = {
                (void *)&cmd_setvf_traffic_set,
                (void *)&cmd_setvf_traffic_port,
@@ -6506,7 +7664,7 @@ cmdline_parse_inst_t cmd_set_vf_traffic = {
 struct cmd_set_vf_rxmode {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t port;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t vf;
        uint8_t vf_id;
        cmdline_fixed_string_t what;
@@ -6519,7 +7677,7 @@ cmd_set_vf_rxmode_parsed(void *parsed_result,
                       __attribute__((unused)) struct cmdline *cl,
                       __attribute__((unused)) void *data)
 {
-       int ret;
+       int ret = -ENOTSUP;
        uint16_t rx_mode = 0;
        struct cmd_set_vf_rxmode *res = parsed_result;
 
@@ -6535,7 +7693,18 @@ cmd_set_vf_rxmode_parsed(void *parsed_result,
                        rx_mode |= ETH_VMDQ_ACCEPT_MULTICAST;
        }
 
-       ret = rte_eth_dev_set_vf_rxmode(res->port_id,res->vf_id,rx_mode,(uint8_t)is_on);
+       RTE_SET_USED(is_on);
+
+#ifdef RTE_LIBRTE_IXGBE_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_ixgbe_set_vf_rxmode(res->port_id, res->vf_id,
+                                                 rx_mode, (uint8_t)is_on);
+#endif
+#ifdef RTE_LIBRTE_BNXT_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_bnxt_set_vf_rxmode(res->port_id, res->vf_id,
+                                                rx_mode, (uint8_t)is_on);
+#endif
        if (ret < 0)
                printf("bad VF receive mode parameter, return code = %d \n",
                ret);
@@ -6549,7 +7718,7 @@ cmdline_parse_token_string_t cmd_set_vf_rxmode_port =
                                 port, "port");
 cmdline_parse_token_num_t cmd_set_vf_rxmode_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_vf_rxmode,
-                             port_id, UINT8);
+                             port_id, UINT16);
 cmdline_parse_token_string_t cmd_set_vf_rxmode_vf =
        TOKEN_STRING_INITIALIZER(struct cmd_set_vf_rxmode,
                                 vf, "vf");
@@ -6569,7 +7738,8 @@ cmdline_parse_token_string_t cmd_set_vf_rxmode_on =
 cmdline_parse_inst_t cmd_set_vf_rxmode = {
        .f = cmd_set_vf_rxmode_parsed,
        .data = NULL,
-       .help_str = "set port X vf Y rxmode AUPE|ROPE|BAM|MPE on|off",
+       .help_str = "set port <port_id> vf <vf_id> rxmode "
+               "AUPE|ROPE|BAM|MPE on|off",
        .tokens = {
                (void *)&cmd_set_vf_rxmode_set,
                (void *)&cmd_set_vf_rxmode_port,
@@ -6588,7 +7758,7 @@ struct cmd_vf_mac_addr_result {
        cmdline_fixed_string_t mac_addr_cmd;
        cmdline_fixed_string_t what;
        cmdline_fixed_string_t port;
-       uint8_t port_num;
+       uint16_t port_num;
        cmdline_fixed_string_t vf;
        uint8_t vf_num;
        struct ether_addr address;
@@ -6599,11 +7769,22 @@ static void cmd_vf_mac_addr_parsed(void *parsed_result,
                __attribute__((unused)) void *data)
 {
        struct cmd_vf_mac_addr_result *res = parsed_result;
-       int ret = 0;
+       int ret = -ENOTSUP;
+
+       if (strcmp(res->what, "add") != 0)
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_i40e_add_vf_mac_addr(res->port_num, res->vf_num,
+                                                  &res->address);
+#endif
+#ifdef RTE_LIBRTE_BNXT_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_bnxt_mac_addr_add(res->port_num, &res->address,
+                                               res->vf_num);
+#endif
 
-       if (strcmp(res->what, "add") == 0)
-               ret = rte_eth_dev_mac_addr_add(res->port_num,
-                                       &res->address, res->vf_num);
        if(ret < 0)
                printf("vf_mac_addr_cmd error: (%s)\n", strerror(-ret));
 
@@ -6620,7 +7801,7 @@ cmdline_parse_token_string_t cmd_vf_mac_addr_port =
                                port,"port");
 cmdline_parse_token_num_t cmd_vf_mac_addr_portnum =
        TOKEN_NUM_INITIALIZER(struct cmd_vf_mac_addr_result,
-                               port_num, UINT8);
+                               port_num, UINT16);
 cmdline_parse_token_string_t cmd_vf_mac_addr_vf =
        TOKEN_STRING_INITIALIZER(struct cmd_vf_mac_addr_result,
                                vf,"vf");
@@ -6634,8 +7815,8 @@ cmdline_parse_token_etheraddr_t cmd_vf_mac_addr_addr =
 cmdline_parse_inst_t cmd_vf_mac_addr_filter = {
        .f = cmd_vf_mac_addr_parsed,
        .data = (void *)0,
-       .help_str = "mac_addr add port X vf Y ethaddr:(X = port number,"
-       "Y = VF number)add MAC address filtering for a VF on port X",
+       .help_str = "mac_addr add port <port_id> vf <vf_id> <mac_addr>: "
+               "Add MAC address filtering for a VF on port_id",
        .tokens = {
                (void *)&cmd_vf_mac_addr_cmd,
                (void *)&cmd_vf_mac_addr_what,
@@ -6654,7 +7835,7 @@ struct cmd_vf_rx_vlan_filter {
        cmdline_fixed_string_t what;
        uint16_t vlan_id;
        cmdline_fixed_string_t port;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t vf;
        uint64_t vf_mask;
 };
@@ -6665,11 +7846,42 @@ cmd_vf_rx_vlan_filter_parsed(void *parsed_result,
                          __attribute__((unused)) void *data)
 {
        struct cmd_vf_rx_vlan_filter *res = parsed_result;
+       int ret = -ENOTSUP;
 
-       if (!strcmp(res->what, "add"))
-               set_vf_rx_vlan(res->port_id, res->vlan_id,res->vf_mask, 1);
-       else
-               set_vf_rx_vlan(res->port_id, res->vlan_id,res->vf_mask, 0);
+       __rte_unused int is_add = (strcmp(res->what, "add") == 0) ? 1 : 0;
+
+#ifdef RTE_LIBRTE_IXGBE_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_ixgbe_set_vf_vlan_filter(res->port_id,
+                               res->vlan_id, res->vf_mask, is_add);
+#endif
+#ifdef RTE_LIBRTE_I40E_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_i40e_set_vf_vlan_filter(res->port_id,
+                               res->vlan_id, res->vf_mask, is_add);
+#endif
+#ifdef RTE_LIBRTE_BNXT_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_bnxt_set_vf_vlan_filter(res->port_id,
+                               res->vlan_id, res->vf_mask, is_add);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -EINVAL:
+               printf("invalid vlan_id %d or vf_mask %"PRIu64"\n",
+                               res->vlan_id, res->vf_mask);
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               break;
+       case -ENOTSUP:
+               printf("function not implemented or supported\n");
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
 }
 
 cmdline_parse_token_string_t cmd_vf_rx_vlan_filter_rx_vlan =
@@ -6686,7 +7898,7 @@ cmdline_parse_token_string_t cmd_vf_rx_vlan_filter_port =
                                 port, "port");
 cmdline_parse_token_num_t cmd_vf_rx_vlan_filter_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_vf_rx_vlan_filter,
-                             port_id, UINT8);
+                             port_id, UINT16);
 cmdline_parse_token_string_t cmd_vf_rx_vlan_filter_vf =
        TOKEN_STRING_INITIALIZER(struct cmd_vf_rx_vlan_filter,
                                 vf, "vf");
@@ -6697,8 +7909,8 @@ cmdline_parse_token_num_t cmd_vf_rx_vlan_filter_vf_mask =
 cmdline_parse_inst_t cmd_vf_rxvlan_filter = {
        .f = cmd_vf_rx_vlan_filter_parsed,
        .data = NULL,
-       .help_str = "rx_vlan add|rm X port Y vf Z (X = VLAN ID,"
-               "Y = port number,Z = hexadecimal VF mask)",
+       .help_str = "rx_vlan add|rm <vlan_id> port <port_id> vf <vf_mask>: "
+               "(vf_mask = hexadecimal VF mask)",
        .tokens = {
                (void *)&cmd_vf_rx_vlan_filter_rx_vlan,
                (void *)&cmd_vf_rx_vlan_filter_what,
@@ -6715,7 +7927,7 @@ cmdline_parse_inst_t cmd_vf_rxvlan_filter = {
 struct cmd_queue_rate_limit_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t port;
-       uint8_t port_num;
+       uint16_t port_num;
        cmdline_fixed_string_t queue;
        uint8_t queue_num;
        cmdline_fixed_string_t rate;
@@ -6747,7 +7959,7 @@ cmdline_parse_token_string_t cmd_queue_rate_limit_port =
                                port, "port");
 cmdline_parse_token_num_t cmd_queue_rate_limit_portnum =
        TOKEN_NUM_INITIALIZER(struct cmd_queue_rate_limit_result,
-                               port_num, UINT8);
+                               port_num, UINT16);
 cmdline_parse_token_string_t cmd_queue_rate_limit_queue =
        TOKEN_STRING_INITIALIZER(struct cmd_queue_rate_limit_result,
                                queue, "queue");
@@ -6764,8 +7976,8 @@ cmdline_parse_token_num_t cmd_queue_rate_limit_ratenum =
 cmdline_parse_inst_t cmd_queue_rate_limit = {
        .f = cmd_queue_rate_limit_parsed,
        .data = (void *)0,
-       .help_str = "set port X queue Y rate Z:(X = port number,"
-       "Y = queue number,Z = rate number)set rate limit for a queue on port X",
+       .help_str = "set port <port_id> queue <queue_id> rate <rate_value>: "
+               "Set rate limit for a queue on port_id",
        .tokens = {
                (void *)&cmd_queue_rate_limit_set,
                (void *)&cmd_queue_rate_limit_port,
@@ -6782,7 +7994,7 @@ cmdline_parse_inst_t cmd_queue_rate_limit = {
 struct cmd_vf_rate_limit_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t port;
-       uint8_t port_num;
+       uint16_t port_num;
        cmdline_fixed_string_t vf;
        uint8_t vf_num;
        cmdline_fixed_string_t rate;
@@ -6817,7 +8029,7 @@ cmdline_parse_token_string_t cmd_vf_rate_limit_port =
                                port, "port");
 cmdline_parse_token_num_t cmd_vf_rate_limit_portnum =
        TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result,
-                               port_num, UINT8);
+                               port_num, UINT16);
 cmdline_parse_token_string_t cmd_vf_rate_limit_vf =
        TOKEN_STRING_INITIALIZER(struct cmd_vf_rate_limit_result,
                                vf, "vf");
@@ -6840,9 +8052,9 @@ cmdline_parse_token_num_t cmd_vf_rate_limit_q_msk_val =
 cmdline_parse_inst_t cmd_vf_rate_limit = {
        .f = cmd_vf_rate_limit_parsed,
        .data = (void *)0,
-       .help_str = "set port X vf Y rate Z queue_mask V:(X = port number,"
-       "Y = VF number,Z = rate number, V = queue mask value)set rate limit "
-       "for queues of VF on port X",
+       .help_str = "set port <port_id> vf <vf_id> rate <rate_value> "
+               "queue_mask <queue_mask_value>: "
+               "Set rate limit for queues of VF on port_id",
        .tokens = {
                (void *)&cmd_vf_rate_limit_set,
                (void *)&cmd_vf_rate_limit_port,
@@ -6861,7 +8073,7 @@ cmdline_parse_inst_t cmd_vf_rate_limit = {
 struct cmd_tunnel_filter_result {
        cmdline_fixed_string_t cmd;
        cmdline_fixed_string_t what;
-       uint8_t port_id;
+       portid_t port_id;
        struct ether_addr outer_mac;
        struct ether_addr inner_mac;
        cmdline_ipaddr_t ip_value;
@@ -6955,7 +8167,7 @@ cmdline_parse_token_string_t cmd_tunnel_filter_what =
        what, "add#rm");
 cmdline_parse_token_num_t cmd_tunnel_filter_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_tunnel_filter_result,
-       port_id, UINT8);
+       port_id, UINT16);
 cmdline_parse_token_etheraddr_t cmd_tunnel_filter_outer_mac =
        TOKEN_ETHERADDR_INITIALIZER(struct cmd_tunnel_filter_result,
        outer_mac);
@@ -6986,12 +8198,10 @@ cmdline_parse_token_num_t cmd_tunnel_filter_queue_num =
 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|nvgre|ipingre) filter_type "
-                       "(oip|iip|imac-ivlan|imac-ivlan-tenid|imac-tenid|"
-                       "imac|omac-imac-tenid) "
-                       "tenant_id queue_num",
+       .help_str = "tunnel_filter add|rm <port_id> <outer_mac> <inner_mac> "
+               "<ip> <inner_vlan> vxlan|nvgre|ipingre oip|iip|imac-ivlan|"
+               "imac-ivlan-tenid|imac-tenid|imac|omac-imac-tenid <tenant_id> "
+               "<queue_id>: Add/Rm tunnel filter of a port",
        .tokens = {
                (void *)&cmd_tunnel_filter_cmd,
                (void *)&cmd_tunnel_filter_what,
@@ -7013,7 +8223,7 @@ struct cmd_tunnel_udp_config {
        cmdline_fixed_string_t cmd;
        cmdline_fixed_string_t what;
        uint16_t udp_port;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void
@@ -7052,13 +8262,13 @@ cmdline_parse_token_num_t cmd_tunnel_udp_config_udp_port =
                                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);
+                               port_id, UINT16);
 
 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",
+       .help_str = "rx_vxlan_port add|rm <udp_port> <port_id>: "
+               "Add/Remove a tunneling UDP port filter",
        .tokens = {
                (void *)&cmd_tunnel_udp_config_cmd,
                (void *)&cmd_tunnel_udp_config_what,
@@ -7071,7 +8281,7 @@ cmdline_parse_inst_t cmd_tunnel_udp_config = {
 /* *** GLOBAL CONFIG *** */
 struct cmd_global_config_result {
        cmdline_fixed_string_t cmd;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t cfg_type;
        uint8_t len;
 };
@@ -7098,7 +8308,8 @@ cmdline_parse_token_string_t cmd_global_config_cmd =
        TOKEN_STRING_INITIALIZER(struct cmd_global_config_result, cmd,
                "global_config");
 cmdline_parse_token_num_t cmd_global_config_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_global_config_result, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_global_config_result, port_id,
+                              UINT16);
 cmdline_parse_token_string_t cmd_global_config_type =
        TOKEN_STRING_INITIALIZER(struct cmd_global_config_result,
                cfg_type, "gre-key-len");
@@ -7109,7 +8320,7 @@ cmdline_parse_token_num_t cmd_global_config_gre_key_len =
 cmdline_parse_inst_t cmd_global_config = {
        .f = cmd_global_config_parsed,
        .data = (void *)NULL,
-       .help_str = "global_config <port_id> gre-key-len <number>",
+       .help_str = "global_config <port_id> gre-key-len <key_len>",
        .tokens = {
                (void *)&cmd_global_config_cmd,
                (void *)&cmd_global_config_port_id,
@@ -7123,7 +8334,7 @@ cmdline_parse_inst_t cmd_global_config = {
 struct cmd_set_mirror_mask_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t port;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t mirror;
        uint8_t rule_id;
        cmdline_fixed_string_t what;
@@ -7141,7 +8352,7 @@ cmdline_parse_token_string_t cmd_mirror_mask_port =
                                port, "port");
 cmdline_parse_token_num_t cmd_mirror_mask_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_mask_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 cmdline_parse_token_string_t cmd_mirror_mask_mirror =
        TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_mask_result,
                                mirror, "mirror-rule");
@@ -7217,8 +8428,9 @@ cmd_set_mirror_mask_parsed(void *parsed_result,
 cmdline_parse_inst_t cmd_set_mirror_mask = {
                .f = cmd_set_mirror_mask_parsed,
                .data = NULL,
-               .help_str = "set port X mirror-rule Y pool-mirror-up|pool-mirror-down|vlan-mirror"
-                           " pool_mask|vlan_id[,vlan_id]* dst-pool Z on|off",
+               .help_str = "set port <port_id> mirror-rule <rule_id> "
+                       "pool-mirror-up|pool-mirror-down|vlan-mirror "
+                       "<pool_mask|vlan_id[,vlan_id]*> dst-pool <pool_id> on|off",
                .tokens = {
                        (void *)&cmd_mirror_mask_set,
                        (void *)&cmd_mirror_mask_port,
@@ -7234,11 +8446,11 @@ cmdline_parse_inst_t cmd_set_mirror_mask = {
                },
 };
 
-/* *** CONFIGURE VM MIRROR UDLINK/DOWNLINK RULE *** */
+/* *** CONFIGURE VM MIRROR UPLINK/DOWNLINK RULE *** */
 struct cmd_set_mirror_link_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t port;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t mirror;
        uint8_t rule_id;
        cmdline_fixed_string_t what;
@@ -7255,7 +8467,7 @@ cmdline_parse_token_string_t cmd_mirror_link_port =
                                port, "port");
 cmdline_parse_token_num_t cmd_mirror_link_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_link_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 cmdline_parse_token_string_t cmd_mirror_link_mirror =
        TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_link_result,
                                mirror, "mirror-rule");
@@ -7308,8 +8520,8 @@ cmd_set_mirror_link_parsed(void *parsed_result,
 cmdline_parse_inst_t cmd_set_mirror_link = {
                .f = cmd_set_mirror_link_parsed,
                .data = NULL,
-               .help_str = "set port X mirror-rule Y uplink-mirror|"
-                       "downlink-mirror dst-pool Z on|off",
+               .help_str = "set port <port_id> mirror-rule <rule_id> "
+                       "uplink-mirror|downlink-mirror dst-pool <pool_id> on|off",
                .tokens = {
                        (void *)&cmd_mirror_link_set,
                        (void *)&cmd_mirror_link_port,
@@ -7328,7 +8540,7 @@ cmdline_parse_inst_t cmd_set_mirror_link = {
 struct cmd_rm_mirror_rule_result {
        cmdline_fixed_string_t reset;
        cmdline_fixed_string_t port;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t mirror;
        uint8_t rule_id;
 };
@@ -7341,7 +8553,7 @@ cmdline_parse_token_string_t cmd_rm_mirror_rule_port =
                                port, "port");
 cmdline_parse_token_num_t cmd_rm_mirror_rule_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_rm_mirror_rule_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 cmdline_parse_token_string_t cmd_rm_mirror_rule_mirror =
        TOKEN_STRING_INITIALIZER(struct cmd_rm_mirror_rule_result,
                                mirror, "mirror-rule");
@@ -7365,7 +8577,7 @@ cmd_reset_mirror_rule_parsed(void *parsed_result,
 cmdline_parse_inst_t cmd_reset_mirror_rule = {
                .f = cmd_reset_mirror_rule_parsed,
                .data = NULL,
-               .help_str = "reset port X mirror-rule Y",
+               .help_str = "reset port <port_id> mirror-rule <rule_id>",
                .tokens = {
                        (void *)&cmd_rm_mirror_rule_reset,
                        (void *)&cmd_rm_mirror_rule_port,
@@ -7410,6 +8622,8 @@ static void cmd_dump_parsed(void *parsed_result,
                rte_mempool_list_dump(stdout);
        else if (!strcmp(res->dump, "dump_devargs"))
                rte_eal_devargs_dump(stdout);
+       else if (!strcmp(res->dump, "dump_log_types"))
+               rte_log_dump(stdout);
 }
 
 cmdline_parse_token_string_t cmd_dump_dump =
@@ -7419,12 +8633,13 @@ cmdline_parse_token_string_t cmd_dump_dump =
                "dump_struct_sizes#"
                "dump_ring#"
                "dump_mempool#"
-               "dump_devargs");
+               "dump_devargs#"
+               "dump_log_types");
 
 cmdline_parse_inst_t cmd_dump = {
        .f = cmd_dump_parsed,  /* function to call */
        .data = NULL,      /* 2nd arg of func */
-       .help_str = "dump status",
+       .help_str = "Dump status",
        .tokens = {        /* token list, NULL terminated */
                (void *)&cmd_dump_dump,
                NULL,
@@ -7472,7 +8687,7 @@ cmdline_parse_token_string_t cmd_dump_one_name =
 cmdline_parse_inst_t cmd_dump_one = {
        .f = cmd_dump_one_parsed,  /* function to call */
        .data = NULL,      /* 2nd arg of func */
-       .help_str = "dump one ring/mempool: dump_ring|dump_mempool <name>",
+       .help_str = "dump_ring|dump_mempool <name>: Dump one ring/mempool",
        .tokens = {        /* token list, NULL terminated */
                (void *)&cmd_dump_one_dump,
                (void *)&cmd_dump_one_name,
@@ -7483,7 +8698,7 @@ cmdline_parse_inst_t cmd_dump_one = {
 /* *** Add/Del syn filter *** */
 struct cmd_syn_filter_result {
        cmdline_fixed_string_t filter;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t ops;
        cmdline_fixed_string_t priority;
        cmdline_fixed_string_t high;
@@ -7537,7 +8752,7 @@ cmdline_parse_token_string_t cmd_syn_filter_filter =
        filter, "syn_filter");
 cmdline_parse_token_num_t cmd_syn_filter_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_syn_filter_result,
-       port_id, UINT8);
+       port_id, UINT16);
 cmdline_parse_token_string_t cmd_syn_filter_ops =
        TOKEN_STRING_INITIALIZER(struct cmd_syn_filter_result,
        ops, "add#del");
@@ -7557,7 +8772,8 @@ cmdline_parse_token_num_t cmd_syn_filter_queue_id =
 cmdline_parse_inst_t cmd_syn_filter = {
        .f = cmd_syn_filter_parsed,
        .data = NULL,
-       .help_str = "add/delete syn filter",
+       .help_str = "syn_filter <port_id> add|del priority high|low queue "
+               "<queue_id>: Add/Delete syn filter",
        .tokens = {
                (void *)&cmd_syn_filter_filter,
                (void *)&cmd_syn_filter_port_id,
@@ -7570,10 +8786,452 @@ cmdline_parse_inst_t cmd_syn_filter = {
        },
 };
 
+/* *** queue region set *** */
+struct cmd_queue_region_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t port;
+       portid_t port_id;
+       cmdline_fixed_string_t cmd;
+       cmdline_fixed_string_t region;
+       uint8_t  region_id;
+       cmdline_fixed_string_t queue_start_index;
+       uint8_t  queue_id;
+       cmdline_fixed_string_t queue_num;
+       uint8_t  queue_num_value;
+};
+
+static void
+cmd_queue_region_parsed(void *parsed_result,
+                       __attribute__((unused)) struct cmdline *cl,
+                       __attribute__((unused)) void *data)
+{
+       struct cmd_queue_region_result *res = parsed_result;
+       int ret = -ENOTSUP;
+#ifdef RTE_LIBRTE_I40E_PMD
+       struct rte_pmd_i40e_queue_region_conf region_conf;
+       enum rte_pmd_i40e_queue_region_op op_type;
+#endif
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       memset(&region_conf, 0, sizeof(region_conf));
+       op_type = RTE_PMD_I40E_RSS_QUEUE_REGION_SET;
+       region_conf.region_id = res->region_id;
+       region_conf.queue_num = res->queue_num_value;
+       region_conf.queue_start_index = res->queue_id;
+
+       ret = rte_pmd_i40e_rss_queue_region_conf(res->port_id,
+                               op_type, &region_conf);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -ENOTSUP:
+               printf("function not implemented or supported\n");
+               break;
+       default:
+               printf("queue region config error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_token_string_t cmd_queue_region_set =
+TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result,
+               set, "set");
+cmdline_parse_token_string_t cmd_queue_region_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result, port, "port");
+cmdline_parse_token_num_t cmd_queue_region_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result,
+                               port_id, UINT16);
+cmdline_parse_token_string_t cmd_queue_region_cmd =
+       TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result,
+                                cmd, "queue-region");
+cmdline_parse_token_string_t cmd_queue_region_id =
+       TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result,
+                               region, "region_id");
+cmdline_parse_token_num_t cmd_queue_region_index =
+       TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result,
+                               region_id, UINT8);
+cmdline_parse_token_string_t cmd_queue_region_queue_start_index =
+       TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result,
+                               queue_start_index, "queue_start_index");
+cmdline_parse_token_num_t cmd_queue_region_queue_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result,
+                               queue_id, UINT8);
+cmdline_parse_token_string_t cmd_queue_region_queue_num =
+       TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result,
+                               queue_num, "queue_num");
+cmdline_parse_token_num_t cmd_queue_region_queue_num_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result,
+                               queue_num_value, UINT8);
+
+cmdline_parse_inst_t cmd_queue_region = {
+       .f = cmd_queue_region_parsed,
+       .data = NULL,
+       .help_str = "set port <port_id> queue-region region_id <value> "
+               "queue_start_index <value> queue_num <value>: Set a queue region",
+       .tokens = {
+               (void *)&cmd_queue_region_set,
+               (void *)&cmd_queue_region_port,
+               (void *)&cmd_queue_region_port_id,
+               (void *)&cmd_queue_region_cmd,
+               (void *)&cmd_queue_region_id,
+               (void *)&cmd_queue_region_index,
+               (void *)&cmd_queue_region_queue_start_index,
+               (void *)&cmd_queue_region_queue_id,
+               (void *)&cmd_queue_region_queue_num,
+               (void *)&cmd_queue_region_queue_num_value,
+               NULL,
+       },
+};
+
+/* *** queue region and flowtype set *** */
+struct cmd_region_flowtype_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t port;
+       portid_t port_id;
+       cmdline_fixed_string_t cmd;
+       cmdline_fixed_string_t region;
+       uint8_t  region_id;
+       cmdline_fixed_string_t flowtype;
+       uint8_t  flowtype_id;
+};
+
+static void
+cmd_region_flowtype_parsed(void *parsed_result,
+                       __attribute__((unused)) struct cmdline *cl,
+                       __attribute__((unused)) void *data)
+{
+       struct cmd_region_flowtype_result *res = parsed_result;
+       int ret = -ENOTSUP;
+#ifdef RTE_LIBRTE_I40E_PMD
+       struct rte_pmd_i40e_queue_region_conf region_conf;
+       enum rte_pmd_i40e_queue_region_op op_type;
+#endif
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       memset(&region_conf, 0, sizeof(region_conf));
+
+       op_type = RTE_PMD_I40E_RSS_QUEUE_REGION_FLOWTYPE_SET;
+       region_conf.region_id = res->region_id;
+       region_conf.hw_flowtype = res->flowtype_id;
+
+       ret = rte_pmd_i40e_rss_queue_region_conf(res->port_id,
+                       op_type, &region_conf);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -ENOTSUP:
+               printf("function not implemented or supported\n");
+               break;
+       default:
+               printf("region flowtype config error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_token_string_t cmd_region_flowtype_set =
+TOKEN_STRING_INITIALIZER(struct cmd_region_flowtype_result,
+                               set, "set");
+cmdline_parse_token_string_t cmd_region_flowtype_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_region_flowtype_result,
+                               port, "port");
+cmdline_parse_token_num_t cmd_region_flowtype_port_index =
+       TOKEN_NUM_INITIALIZER(struct cmd_region_flowtype_result,
+                               port_id, UINT16);
+cmdline_parse_token_string_t cmd_region_flowtype_cmd =
+       TOKEN_STRING_INITIALIZER(struct cmd_region_flowtype_result,
+                               cmd, "queue-region");
+cmdline_parse_token_string_t cmd_region_flowtype_index =
+       TOKEN_STRING_INITIALIZER(struct cmd_region_flowtype_result,
+                               region, "region_id");
+cmdline_parse_token_num_t cmd_region_flowtype_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_region_flowtype_result,
+                               region_id, UINT8);
+cmdline_parse_token_string_t cmd_region_flowtype_flow_index =
+       TOKEN_STRING_INITIALIZER(struct cmd_region_flowtype_result,
+                               flowtype, "flowtype");
+cmdline_parse_token_num_t cmd_region_flowtype_flow_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_region_flowtype_result,
+                               flowtype_id, UINT8);
+cmdline_parse_inst_t cmd_region_flowtype = {
+       .f = cmd_region_flowtype_parsed,
+       .data = NULL,
+       .help_str = "set port <port_id> queue-region region_id <value> "
+               "flowtype <value>: Set a flowtype region index",
+       .tokens = {
+               (void *)&cmd_region_flowtype_set,
+               (void *)&cmd_region_flowtype_port,
+               (void *)&cmd_region_flowtype_port_index,
+               (void *)&cmd_region_flowtype_cmd,
+               (void *)&cmd_region_flowtype_index,
+               (void *)&cmd_region_flowtype_id,
+               (void *)&cmd_region_flowtype_flow_index,
+               (void *)&cmd_region_flowtype_flow_id,
+               NULL,
+       },
+};
+
+/* *** User Priority (UP) to queue region (region_id) set *** */
+struct cmd_user_priority_region_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t port;
+       portid_t port_id;
+       cmdline_fixed_string_t cmd;
+       cmdline_fixed_string_t user_priority;
+       uint8_t  user_priority_id;
+       cmdline_fixed_string_t region;
+       uint8_t  region_id;
+};
+
+static void
+cmd_user_priority_region_parsed(void *parsed_result,
+                       __attribute__((unused)) struct cmdline *cl,
+                       __attribute__((unused)) void *data)
+{
+       struct cmd_user_priority_region_result *res = parsed_result;
+       int ret = -ENOTSUP;
+#ifdef RTE_LIBRTE_I40E_PMD
+       struct rte_pmd_i40e_queue_region_conf region_conf;
+       enum rte_pmd_i40e_queue_region_op op_type;
+#endif
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       memset(&region_conf, 0, sizeof(region_conf));
+       op_type = RTE_PMD_I40E_RSS_QUEUE_REGION_USER_PRIORITY_SET;
+       region_conf.user_priority = res->user_priority_id;
+       region_conf.region_id = res->region_id;
+
+       ret = rte_pmd_i40e_rss_queue_region_conf(res->port_id,
+                               op_type, &region_conf);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -ENOTSUP:
+               printf("function not implemented or supported\n");
+               break;
+       default:
+               printf("user_priority region config error: (%s)\n",
+                               strerror(-ret));
+       }
+}
+
+cmdline_parse_token_string_t cmd_user_priority_region_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_user_priority_region_result,
+                               set, "set");
+cmdline_parse_token_string_t cmd_user_priority_region_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_user_priority_region_result,
+                               port, "port");
+cmdline_parse_token_num_t cmd_user_priority_region_port_index =
+       TOKEN_NUM_INITIALIZER(struct cmd_user_priority_region_result,
+                               port_id, UINT16);
+cmdline_parse_token_string_t cmd_user_priority_region_cmd =
+       TOKEN_STRING_INITIALIZER(struct cmd_user_priority_region_result,
+                               cmd, "queue-region");
+cmdline_parse_token_string_t cmd_user_priority_region_UP =
+       TOKEN_STRING_INITIALIZER(struct cmd_user_priority_region_result,
+                               user_priority, "UP");
+cmdline_parse_token_num_t cmd_user_priority_region_UP_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_user_priority_region_result,
+                               user_priority_id, UINT8);
+cmdline_parse_token_string_t cmd_user_priority_region_region =
+       TOKEN_STRING_INITIALIZER(struct cmd_user_priority_region_result,
+                               region, "region_id");
+cmdline_parse_token_num_t cmd_user_priority_region_region_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_user_priority_region_result,
+                               region_id, UINT8);
+
+cmdline_parse_inst_t cmd_user_priority_region = {
+       .f = cmd_user_priority_region_parsed,
+       .data = NULL,
+       .help_str = "set port <port_id> queue-region UP <value> "
+               "region_id <value>: Set the mapping of User Priority (UP) "
+               "to queue region (region_id) ",
+       .tokens = {
+               (void *)&cmd_user_priority_region_set,
+               (void *)&cmd_user_priority_region_port,
+               (void *)&cmd_user_priority_region_port_index,
+               (void *)&cmd_user_priority_region_cmd,
+               (void *)&cmd_user_priority_region_UP,
+               (void *)&cmd_user_priority_region_UP_id,
+               (void *)&cmd_user_priority_region_region,
+               (void *)&cmd_user_priority_region_region_id,
+               NULL,
+       },
+};
+
+/* *** flush all queue region related configuration *** */
+struct cmd_flush_queue_region_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t port;
+       portid_t port_id;
+       cmdline_fixed_string_t cmd;
+       cmdline_fixed_string_t flush;
+       cmdline_fixed_string_t what;
+};
+
+static void
+cmd_flush_queue_region_parsed(void *parsed_result,
+                       __attribute__((unused)) struct cmdline *cl,
+                       __attribute__((unused)) void *data)
+{
+       struct cmd_flush_queue_region_result *res = parsed_result;
+       int ret = -ENOTSUP;
+#ifdef RTE_LIBRTE_I40E_PMD
+       struct rte_pmd_i40e_queue_region_conf region_conf;
+       enum rte_pmd_i40e_queue_region_op op_type;
+#endif
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       memset(&region_conf, 0, sizeof(region_conf));
+
+       if (strcmp(res->what, "on") == 0)
+               op_type = RTE_PMD_I40E_RSS_QUEUE_REGION_ALL_FLUSH_ON;
+       else
+               op_type = RTE_PMD_I40E_RSS_QUEUE_REGION_ALL_FLUSH_OFF;
+
+       ret = rte_pmd_i40e_rss_queue_region_conf(res->port_id,
+                               op_type, &region_conf);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -ENOTSUP:
+               printf("function not implemented or supported\n");
+               break;
+       default:
+               printf("queue region config flush error: (%s)\n",
+                               strerror(-ret));
+       }
+}
+
+cmdline_parse_token_string_t cmd_flush_queue_region_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_flush_queue_region_result,
+                               set, "set");
+cmdline_parse_token_string_t cmd_flush_queue_region_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_flush_queue_region_result,
+                               port, "port");
+cmdline_parse_token_num_t cmd_flush_queue_region_port_index =
+       TOKEN_NUM_INITIALIZER(struct cmd_flush_queue_region_result,
+                               port_id, UINT16);
+cmdline_parse_token_string_t cmd_flush_queue_region_cmd =
+       TOKEN_STRING_INITIALIZER(struct cmd_flush_queue_region_result,
+                               cmd, "queue-region");
+cmdline_parse_token_string_t cmd_flush_queue_region_flush =
+       TOKEN_STRING_INITIALIZER(struct cmd_flush_queue_region_result,
+                               flush, "flush");
+cmdline_parse_token_string_t cmd_flush_queue_region_what =
+       TOKEN_STRING_INITIALIZER(struct cmd_flush_queue_region_result,
+                               what, "on#off");
+
+cmdline_parse_inst_t cmd_flush_queue_region = {
+       .f = cmd_flush_queue_region_parsed,
+       .data = NULL,
+       .help_str = "set port <port_id> queue-region flush on|off"
+               ": flush all queue region related configuration",
+       .tokens = {
+               (void *)&cmd_flush_queue_region_set,
+               (void *)&cmd_flush_queue_region_port,
+               (void *)&cmd_flush_queue_region_port_index,
+               (void *)&cmd_flush_queue_region_cmd,
+               (void *)&cmd_flush_queue_region_flush,
+               (void *)&cmd_flush_queue_region_what,
+               NULL,
+       },
+};
+
+/* *** get all queue region related configuration info *** */
+struct cmd_show_queue_region_info {
+       cmdline_fixed_string_t show;
+       cmdline_fixed_string_t port;
+       portid_t port_id;
+       cmdline_fixed_string_t cmd;
+};
+
+static void
+cmd_show_queue_region_info_parsed(void *parsed_result,
+                       __attribute__((unused)) struct cmdline *cl,
+                       __attribute__((unused)) void *data)
+{
+       struct cmd_show_queue_region_info *res = parsed_result;
+       int ret = -ENOTSUP;
+#ifdef RTE_LIBRTE_I40E_PMD
+       struct rte_pmd_i40e_queue_regions rte_pmd_regions;
+       enum rte_pmd_i40e_queue_region_op op_type;
+#endif
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       memset(&rte_pmd_regions, 0, sizeof(rte_pmd_regions));
+
+       op_type = RTE_PMD_I40E_RSS_QUEUE_REGION_INFO_GET;
+
+       ret = rte_pmd_i40e_rss_queue_region_conf(res->port_id,
+                                       op_type, &rte_pmd_regions);
+
+       port_queue_region_info_display(res->port_id, &rte_pmd_regions);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -ENOTSUP:
+               printf("function not implemented or supported\n");
+               break;
+       default:
+               printf("queue region config info show error: (%s)\n",
+                               strerror(-ret));
+       }
+}
+
+cmdline_parse_token_string_t cmd_show_queue_region_info_get =
+TOKEN_STRING_INITIALIZER(struct cmd_show_queue_region_info,
+                               show, "show");
+cmdline_parse_token_string_t cmd_show_queue_region_info_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_show_queue_region_info,
+                               port, "port");
+cmdline_parse_token_num_t cmd_show_queue_region_info_port_index =
+       TOKEN_NUM_INITIALIZER(struct cmd_show_queue_region_info,
+                               port_id, UINT16);
+cmdline_parse_token_string_t cmd_show_queue_region_info_cmd =
+       TOKEN_STRING_INITIALIZER(struct cmd_show_queue_region_info,
+                               cmd, "queue-region");
+
+cmdline_parse_inst_t cmd_show_queue_region_info_all = {
+       .f = cmd_show_queue_region_info_parsed,
+       .data = NULL,
+       .help_str = "show port <port_id> queue-region"
+               ": show all queue region related configuration info",
+       .tokens = {
+               (void *)&cmd_show_queue_region_info_get,
+               (void *)&cmd_show_queue_region_info_port,
+               (void *)&cmd_show_queue_region_info_port_index,
+               (void *)&cmd_show_queue_region_info_cmd,
+               NULL,
+       },
+};
+
 /* *** ADD/REMOVE A 2tuple FILTER *** */
 struct cmd_2tuple_filter_result {
        cmdline_fixed_string_t filter;
-       uint8_t  port_id;
+       portid_t port_id;
        cmdline_fixed_string_t ops;
        cmdline_fixed_string_t dst_port;
        uint16_t dst_port_value;
@@ -7652,7 +9310,7 @@ cmdline_parse_token_string_t cmd_2tuple_filter_filter =
                                 filter, "2tuple_filter");
 cmdline_parse_token_num_t cmd_2tuple_filter_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 cmdline_parse_token_string_t cmd_2tuple_filter_ops =
        TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
                                 ops, "add#del");
@@ -7696,7 +9354,9 @@ cmdline_parse_token_num_t cmd_2tuple_filter_queue_id =
 cmdline_parse_inst_t cmd_2tuple_filter = {
        .f = cmd_2tuple_filter_parsed,
        .data = NULL,
-       .help_str = "add a 2tuple filter",
+       .help_str = "2tuple_filter <port_id> add|del dst_port <value> protocol "
+               "<value> mask <value> tcp_flags <value> priority <value> queue "
+               "<queue_id>: Add a 2tuple filter",
        .tokens = {
                (void *)&cmd_2tuple_filter_filter,
                (void *)&cmd_2tuple_filter_port_id,
@@ -7720,7 +9380,7 @@ cmdline_parse_inst_t cmd_2tuple_filter = {
 /* *** ADD/REMOVE A 5tuple FILTER *** */
 struct cmd_5tuple_filter_result {
        cmdline_fixed_string_t filter;
-       uint8_t  port_id;
+       portid_t port_id;
        cmdline_fixed_string_t ops;
        cmdline_fixed_string_t dst_ip;
        cmdline_ipaddr_t dst_ip_value;
@@ -7829,7 +9489,7 @@ cmdline_parse_token_string_t cmd_5tuple_filter_filter =
                                 filter, "5tuple_filter");
 cmdline_parse_token_num_t cmd_5tuple_filter_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 cmdline_parse_token_string_t cmd_5tuple_filter_ops =
        TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
                                 ops, "add#del");
@@ -7891,7 +9551,10 @@ cmdline_parse_token_num_t cmd_5tuple_filter_queue_id =
 cmdline_parse_inst_t cmd_5tuple_filter = {
        .f = cmd_5tuple_filter_parsed,
        .data = NULL,
-       .help_str = "add/del a 5tuple filter",
+       .help_str = "5tuple_filter <port_id> add|del dst_ip <value> "
+               "src_ip <value> dst_port <value> src_port <value> "
+               "protocol <value>  mask <value> tcp_flags <value> "
+               "priority <value> queue <queue_id>: Add/Del a 5tuple filter",
        .tokens = {
                (void *)&cmd_5tuple_filter_filter,
                (void *)&cmd_5tuple_filter_port_id,
@@ -7922,7 +9585,7 @@ cmdline_parse_inst_t cmd_5tuple_filter = {
 struct cmd_flex_filter_result {
        cmdline_fixed_string_t filter;
        cmdline_fixed_string_t ops;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t len;
        uint8_t len_value;
        cmdline_fixed_string_t bytes;
@@ -8049,7 +9712,7 @@ cmdline_parse_token_string_t cmd_flex_filter_filter =
                                filter, "flex_filter");
 cmdline_parse_token_num_t cmd_flex_filter_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_flex_filter_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 cmdline_parse_token_string_t cmd_flex_filter_ops =
        TOKEN_STRING_INITIALIZER(struct cmd_flex_filter_result,
                                ops, "add#del");
@@ -8086,7 +9749,9 @@ cmdline_parse_token_num_t cmd_flex_filter_queue_id =
 cmdline_parse_inst_t cmd_flex_filter = {
        .f = cmd_flex_filter_parsed,
        .data = NULL,
-       .help_str = "add/del a flex filter",
+       .help_str = "flex_filter <port_id> add|del len <value> bytes "
+               "<value> mask <value> priority <value> queue <queue_id>: "
+               "Add/Del a flex filter",
        .tokens = {
                (void *)&cmd_flex_filter_filter,
                (void *)&cmd_flex_filter_port_id,
@@ -8110,7 +9775,7 @@ cmdline_parse_inst_t cmd_flex_filter = {
 /* *** deal with ethertype filter *** */
 struct cmd_ethertype_filter_result {
        cmdline_fixed_string_t filter;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t ops;
        cmdline_fixed_string_t mac;
        struct ether_addr mac_addr;
@@ -8126,7 +9791,7 @@ cmdline_parse_token_string_t cmd_ethertype_filter_filter =
                                 filter, "ethertype_filter");
 cmdline_parse_token_num_t cmd_ethertype_filter_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_ethertype_filter_result,
-                             port_id, UINT8);
+                             port_id, UINT16);
 cmdline_parse_token_string_t cmd_ethertype_filter_ops =
        TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result,
                                 ops, "add#del");
@@ -8172,7 +9837,7 @@ cmd_ethertype_filter_parsed(void *parsed_result,
        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,
+               rte_memcpy(&filter.mac_addr, &res->mac_addr,
                        sizeof(struct ether_addr));
        }
        if (!strcmp(res->drop, "drop"))
@@ -8198,7 +9863,9 @@ cmd_ethertype_filter_parsed(void *parsed_result,
 cmdline_parse_inst_t cmd_ethertype_filter = {
        .f = cmd_ethertype_filter_parsed,
        .data = NULL,
-       .help_str = "add or delete an ethertype filter entry",
+       .help_str = "ethertype_filter <port_id> add|del mac_addr|mac_ignr "
+               "<mac_addr> ethertype <value> drop|fw queue <queue_id>: "
+               "Add or delete an ethertype filter entry",
        .tokens = {
                (void *)&cmd_ethertype_filter_filter,
                (void *)&cmd_ethertype_filter_port_id,
@@ -8217,7 +9884,7 @@ cmdline_parse_inst_t cmd_ethertype_filter = {
 /* *** deal with flow director filter *** */
 struct cmd_flow_director_result {
        cmdline_fixed_string_t flow_director_filter;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t mode;
        cmdline_fixed_string_t mode_value;
        cmdline_fixed_string_t ops;
@@ -8233,11 +9900,11 @@ struct cmd_flow_director_result {
        uint16_t port_dst;
        cmdline_fixed_string_t verify_tag;
        uint32_t verify_tag_value;
-       cmdline_ipaddr_t tos;
+       cmdline_fixed_string_t tos;
        uint8_t tos_value;
-       cmdline_ipaddr_t proto;
+       cmdline_fixed_string_t proto;
        uint8_t proto_value;
-       cmdline_ipaddr_t ttl;
+       cmdline_fixed_string_t ttl;
        uint8_t ttl_value;
        cmdline_fixed_string_t vlan;
        uint16_t vlan_value;
@@ -8255,6 +9922,8 @@ struct cmd_flow_director_result {
        cmdline_fixed_string_t tunnel_type;
        cmdline_fixed_string_t tunnel_id;
        uint32_t tunnel_id_value;
+       cmdline_fixed_string_t packet;
+       char filepath[];
 };
 
 static inline int
@@ -8323,6 +9992,10 @@ str2flowtype(char *string)
                if (!strcmp(flowtype_str[i].str, string))
                        return flowtype_str[i].type;
        }
+
+       if (isdigit(string[0]) && atoi(string) > 0 && atoi(string) < 64)
+               return (uint16_t)atoi(string);
+
        return RTE_ETH_FLOW_UNKNOWN;
 }
 
@@ -8359,7 +10032,7 @@ do { \
 #define IPV6_ADDR_TO_ARRAY(ip_addr, ip) \
 do { \
        if ((ip_addr).family == AF_INET6) \
-               (void)rte_memcpy(&(ip), \
+               rte_memcpy(&(ip), \
                                 &((ip_addr).addr.ipv6), \
                                 sizeof(struct in6_addr)); \
        else { \
@@ -8400,8 +10073,62 @@ cmd_flow_director_filter_parsed(void *parsed_result,
                        return;
                }
        } else {
-               if (strcmp(res->mode_value, "IP")) {
-                       printf("Please set mode to IP.\n");
+               if (!strcmp(res->mode_value, "raw")) {
+#ifdef RTE_LIBRTE_I40E_PMD
+                       struct rte_pmd_i40e_flow_type_mapping
+                                       mapping[RTE_PMD_I40E_FLOW_TYPE_MAX];
+                       struct rte_pmd_i40e_pkt_template_conf conf;
+                       uint16_t flow_type = str2flowtype(res->flow_type);
+                       uint16_t i, port = res->port_id;
+                       uint8_t add;
+
+                       memset(&conf, 0, sizeof(conf));
+
+                       if (flow_type == RTE_ETH_FLOW_UNKNOWN) {
+                               printf("Invalid flow type specified.\n");
+                               return;
+                       }
+                       ret = rte_pmd_i40e_flow_type_mapping_get(res->port_id,
+                                                                mapping);
+                       if (ret)
+                               return;
+                       if (mapping[flow_type].pctype == 0ULL) {
+                               printf("Invalid flow type specified.\n");
+                               return;
+                       }
+                       for (i = 0; i < RTE_PMD_I40E_PCTYPE_MAX; i++) {
+                               if (mapping[flow_type].pctype & (1ULL << i)) {
+                                       conf.input.pctype = i;
+                                       break;
+                               }
+                       }
+
+                       conf.input.packet = open_file(res->filepath,
+                                               &conf.input.length);
+                       if (!conf.input.packet)
+                               return;
+                       if (!strcmp(res->drop, "drop"))
+                               conf.action.behavior =
+                                       RTE_PMD_I40E_PKT_TEMPLATE_REJECT;
+                       else
+                               conf.action.behavior =
+                                       RTE_PMD_I40E_PKT_TEMPLATE_ACCEPT;
+                       conf.action.report_status =
+                                       RTE_PMD_I40E_PKT_TEMPLATE_REPORT_ID;
+                       conf.action.rx_queue = res->queue_id;
+                       conf.soft_id = res->fd_id_value;
+                       add  = strcmp(res->ops, "del") ? 1 : 0;
+                       ret = rte_pmd_i40e_flow_add_del_packet_template(port,
+                                                                       &conf,
+                                                                       add);
+                       if (ret < 0)
+                               printf("flow director config error: (%s)\n",
+                                      strerror(-ret));
+                       close_file(conf.input.packet);
+#endif
+                       return;
+               } else if (strcmp(res->mode_value, "IP")) {
+                       printf("Please set mode to IP or raw.\n");
                        return;
                }
                entry.input.flow_type = str2flowtype(res->flow_type);
@@ -8419,6 +10146,7 @@ cmd_flow_director_filter_parsed(void *parsed_result,
        case RTE_ETH_FLOW_FRAG_IPV4:
        case RTE_ETH_FLOW_NONFRAG_IPV4_OTHER:
                entry.input.flow.ip4_flow.proto = res->proto_value;
+               /* fall-through */
        case RTE_ETH_FLOW_NONFRAG_IPV4_UDP:
        case RTE_ETH_FLOW_NONFRAG_IPV4_TCP:
                IPV4_ADDR_TO_UINT(res->ip_dst,
@@ -8451,6 +10179,7 @@ cmd_flow_director_filter_parsed(void *parsed_result,
        case RTE_ETH_FLOW_FRAG_IPV6:
        case RTE_ETH_FLOW_NONFRAG_IPV6_OTHER:
                entry.input.flow.ipv6_flow.proto = res->proto_value;
+               /* fall-through */
        case RTE_ETH_FLOW_NONFRAG_IPV6_UDP:
        case RTE_ETH_FLOW_NONFRAG_IPV6_TCP:
                IPV6_ADDR_TO_ARRAY(res->ip_dst,
@@ -8489,12 +10218,12 @@ cmd_flow_director_filter_parsed(void *parsed_result,
        }
 
        if (fdir_conf.mode ==  RTE_FDIR_MODE_PERFECT_MAC_VLAN)
-               (void)rte_memcpy(&entry.input.flow.mac_vlan_flow.mac_addr,
+               rte_memcpy(&entry.input.flow.mac_vlan_flow.mac_addr,
                                 &res->mac_addr,
                                 sizeof(struct ether_addr));
 
        if (fdir_conf.mode ==  RTE_FDIR_MODE_PERFECT_TUNNEL) {
-               (void)rte_memcpy(&entry.input.flow.tunnel_flow.mac_addr,
+               rte_memcpy(&entry.input.flow.tunnel_flow.mac_addr,
                                 &res->mac_addr,
                                 sizeof(struct ether_addr));
                entry.input.flow.tunnel_flow.tunnel_type =
@@ -8503,7 +10232,7 @@ cmd_flow_director_filter_parsed(void *parsed_result,
                        rte_cpu_to_be_32(res->tunnel_id_value);
        }
 
-       (void)rte_memcpy(entry.input.flow_ext.flexbytes,
+       rte_memcpy(entry.input.flow_ext.flexbytes,
                   flexbytes,
                   RTE_ETH_FDIR_MAX_FLEXLEN);
 
@@ -8562,7 +10291,7 @@ cmdline_parse_token_string_t cmd_flow_director_filter =
                                 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);
+                             port_id, UINT16);
 cmdline_parse_token_string_t cmd_flow_director_ops =
        TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
                                 ops, "add#del#update");
@@ -8571,8 +10300,7 @@ cmdline_parse_token_string_t cmd_flow_director_flow =
                                 flow, "flow");
 cmdline_parse_token_string_t cmd_flow_director_flow_type =
        TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
-               flow_type, "ipv4-other#ipv4-frag#ipv4-tcp#ipv4-udp#ipv4-sctp#"
-               "ipv6-other#ipv6-frag#ipv6-tcp#ipv6-udp#ipv6-sctp#l2_payload");
+               flow_type, NULL);
 cmdline_parse_token_string_t cmd_flow_director_ether =
        TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
                                 ether, "ether");
@@ -8664,6 +10392,9 @@ cmdline_parse_token_string_t cmd_flow_director_mode_mac_vlan =
 cmdline_parse_token_string_t cmd_flow_director_mode_tunnel =
        TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
                                 mode_value, "Tunnel");
+cmdline_parse_token_string_t cmd_flow_director_mode_raw =
+       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
+                                mode_value, "raw");
 cmdline_parse_token_string_t cmd_flow_director_mac =
        TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
                                 mac, "mac");
@@ -8682,11 +10413,24 @@ cmdline_parse_token_string_t cmd_flow_director_tunnel_id =
 cmdline_parse_token_num_t cmd_flow_director_tunnel_id_value =
        TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
                              tunnel_id_value, UINT32);
+cmdline_parse_token_string_t cmd_flow_director_packet =
+       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
+                                packet, "packet");
+cmdline_parse_token_string_t cmd_flow_director_filepath =
+       TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
+                                filepath, NULL);
 
 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",
+       .help_str = "flow_director_filter <port_id> mode IP add|del|update flow"
+               " ipv4-other|ipv4-frag|ipv4-tcp|ipv4-udp|ipv4-sctp|"
+               "ipv6-other|ipv6-frag|ipv6-tcp|ipv6-udp|ipv6-sctp|"
+               "l2_payload src <src_ip> dst <dst_ip> tos <tos_value> "
+               "proto <proto_value> ttl <ttl_value> vlan <vlan_value> "
+               "flexbytes <flexbyte_values> drop|fw <pf_vf> queue <queue_id> "
+               "fd_id <fd_id_value>: "
+               "Add or delete an ip flow director entry on NIC",
        .tokens = {
                (void *)&cmd_flow_director_filter,
                (void *)&cmd_flow_director_port_id,
@@ -8722,7 +10466,8 @@ cmdline_parse_inst_t cmd_add_del_ip_flow_director = {
 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",
+       .help_str = "flow_director_filter ... : Add or delete an udp/tcp flow "
+               "director entry on NIC",
        .tokens = {
                (void *)&cmd_flow_director_filter,
                (void *)&cmd_flow_director_port_id,
@@ -8758,7 +10503,8 @@ cmdline_parse_inst_t cmd_add_del_udp_flow_director = {
 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",
+       .help_str = "flow_director_filter ... : Add or delete a sctp flow "
+               "director entry on NIC",
        .tokens = {
                (void *)&cmd_flow_director_filter,
                (void *)&cmd_flow_director_port_id,
@@ -8769,7 +10515,7 @@ cmdline_parse_inst_t cmd_add_del_sctp_flow_director = {
                (void *)&cmd_flow_director_flow_type,
                (void *)&cmd_flow_director_src,
                (void *)&cmd_flow_director_ip_src,
-               (void *)&cmd_flow_director_port_dst,
+               (void *)&cmd_flow_director_port_src,
                (void *)&cmd_flow_director_dst,
                (void *)&cmd_flow_director_ip_dst,
                (void *)&cmd_flow_director_port_dst,
@@ -8796,7 +10542,8 @@ cmdline_parse_inst_t cmd_add_del_sctp_flow_director = {
 cmdline_parse_inst_t cmd_add_del_l2_flow_director = {
        .f = cmd_flow_director_filter_parsed,
        .data = NULL,
-       .help_str = "add or delete a L2 flow director entry on NIC",
+       .help_str = "flow_director_filter ... : Add or delete a L2 flow "
+               "director entry on NIC",
        .tokens = {
                (void *)&cmd_flow_director_filter,
                (void *)&cmd_flow_director_port_id,
@@ -8822,7 +10569,8 @@ cmdline_parse_inst_t cmd_add_del_l2_flow_director = {
 cmdline_parse_inst_t cmd_add_del_mac_vlan_flow_director = {
        .f = cmd_flow_director_filter_parsed,
        .data = NULL,
-       .help_str = "add or delete a MAC VLAN flow director entry on NIC",
+       .help_str = "flow_director_filter ... : Add or delete a MAC VLAN flow "
+               "director entry on NIC",
        .tokens = {
                (void *)&cmd_flow_director_filter,
                (void *)&cmd_flow_director_port_id,
@@ -8847,7 +10595,8 @@ cmdline_parse_inst_t cmd_add_del_mac_vlan_flow_director = {
 cmdline_parse_inst_t cmd_add_del_tunnel_flow_director = {
        .f = cmd_flow_director_filter_parsed,
        .data = NULL,
-       .help_str = "add or delete a tunnel flow director entry on NIC",
+       .help_str = "flow_director_filter ... : Add or delete a tunnel flow "
+               "director entry on NIC",
        .tokens = {
                (void *)&cmd_flow_director_filter,
                (void *)&cmd_flow_director_port_id,
@@ -8873,17 +10622,41 @@ cmdline_parse_inst_t cmd_add_del_tunnel_flow_director = {
        },
 };
 
-struct cmd_flush_flow_director_result {
-       cmdline_fixed_string_t flush_flow_director;
-       uint8_t port_id;
-};
-
+cmdline_parse_inst_t cmd_add_del_raw_flow_director = {
+       .f = cmd_flow_director_filter_parsed,
+       .data = NULL,
+       .help_str = "flow_director_filter ... : Add or delete a raw flow "
+               "director entry on NIC",
+       .tokens = {
+               (void *)&cmd_flow_director_filter,
+               (void *)&cmd_flow_director_port_id,
+               (void *)&cmd_flow_director_mode,
+               (void *)&cmd_flow_director_mode_raw,
+               (void *)&cmd_flow_director_ops,
+               (void *)&cmd_flow_director_flow,
+               (void *)&cmd_flow_director_flow_type,
+               (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,
+               (void *)&cmd_flow_director_packet,
+               (void *)&cmd_flow_director_filepath,
+               NULL,
+       },
+};
+
+struct cmd_flush_flow_director_result {
+       cmdline_fixed_string_t flush_flow_director;
+       portid_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);
+                             port_id, UINT16);
 
 static void
 cmd_flush_flow_director_parsed(void *parsed_result,
@@ -8910,7 +10683,8 @@ cmd_flush_flow_director_parsed(void *parsed_result,
 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",
+       .help_str = "flush_flow_director <port_id>: "
+               "Flush all flow director entries of a device on NIC",
        .tokens = {
                (void *)&cmd_flush_flow_director_flush,
                (void *)&cmd_flush_flow_director_port_id,
@@ -8921,7 +10695,7 @@ cmdline_parse_inst_t cmd_flush_flow_director = {
 /* *** deal with flow director mask *** */
 struct cmd_flow_director_mask_result {
        cmdline_fixed_string_t flow_director_mask;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t mode;
        cmdline_fixed_string_t mode_value;
        cmdline_fixed_string_t vlan;
@@ -9005,7 +10779,7 @@ cmdline_parse_token_string_t cmd_flow_director_mask =
                                 flow_director_mask, "flow_director_mask");
 cmdline_parse_token_num_t cmd_flow_director_mask_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-                             port_id, UINT8);
+                             port_id, UINT16);
 cmdline_parse_token_string_t cmd_flow_director_mask_vlan =
        TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
                                 vlan, "vlan");
@@ -9071,7 +10845,8 @@ cmdline_parse_token_num_t cmd_flow_director_mask_tunnel_id_value =
 cmdline_parse_inst_t cmd_set_flow_director_ip_mask = {
        .f = cmd_flow_director_mask_parsed,
        .data = NULL,
-       .help_str = "set IP mode flow director's mask on NIC",
+       .help_str = "flow_director_mask ... : "
+               "Set IP mode flow director's mask on NIC",
        .tokens = {
                (void *)&cmd_flow_director_mask,
                (void *)&cmd_flow_director_mask_port_id,
@@ -9094,7 +10869,8 @@ cmdline_parse_inst_t cmd_set_flow_director_ip_mask = {
 cmdline_parse_inst_t cmd_set_flow_director_mac_vlan_mask = {
        .f = cmd_flow_director_mask_parsed,
        .data = NULL,
-       .help_str = "set MAC VLAN mode flow director's mask on NIC",
+       .help_str = "flow_director_mask ... : Set MAC VLAN mode "
+               "flow director's mask on NIC",
        .tokens = {
                (void *)&cmd_flow_director_mask,
                (void *)&cmd_flow_director_mask_port_id,
@@ -9109,7 +10885,8 @@ cmdline_parse_inst_t cmd_set_flow_director_mac_vlan_mask = {
 cmdline_parse_inst_t cmd_set_flow_director_tunnel_mask = {
        .f = cmd_flow_director_mask_parsed,
        .data = NULL,
-       .help_str = "set tunnel mode flow director's mask on NIC",
+       .help_str = "flow_director_mask ... : Set tunnel mode "
+               "flow director's mask on NIC",
        .tokens = {
                (void *)&cmd_flow_director_mask,
                (void *)&cmd_flow_director_mask_port_id,
@@ -9130,7 +10907,7 @@ cmdline_parse_inst_t cmd_set_flow_director_tunnel_mask = {
 /* *** 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;
+       portid_t port_id;
        cmdline_fixed_string_t flow;
        cmdline_fixed_string_t flow_type;
        cmdline_fixed_string_t mask;
@@ -9145,7 +10922,7 @@ cmd_flow_director_flex_mask_parsed(void *parsed_result,
        struct rte_eth_fdir_info fdir_info;
        struct rte_eth_fdir_flex_mask flex_mask;
        struct rte_port *port;
-       uint32_t flow_type_mask;
+       uint64_t flow_type_mask;
        uint16_t i;
        int ret;
 
@@ -9185,7 +10962,7 @@ cmd_flow_director_flex_mask_parsed(void *parsed_result,
                        memset(&port->dev_conf.fdir_conf.flex_conf.flex_mask[i],
                               0, sizeof(struct rte_eth_fdir_flex_mask));
                port->dev_conf.fdir_conf.flex_conf.nb_flexmasks = 1;
-               (void)rte_memcpy(&port->dev_conf.fdir_conf.flex_conf.flex_mask[0],
+               rte_memcpy(&port->dev_conf.fdir_conf.flex_conf.flex_mask[0],
                                 &flex_mask,
                                 sizeof(struct rte_eth_fdir_flex_mask));
                cmd_reconfig_device_queue(res->port_id, 1, 1);
@@ -9198,7 +10975,7 @@ cmd_flow_director_flex_mask_parsed(void *parsed_result,
                        return;
                }
                for (i = RTE_ETH_FLOW_UNKNOWN; i < RTE_ETH_FLOW_MAX; i++) {
-                       if (flow_type_mask & (1 << i)) {
+                       if (flow_type_mask & (1ULL << i)) {
                                flex_mask.flow_type = i;
                                fdir_set_flex_mask(res->port_id, &flex_mask);
                        }
@@ -9207,7 +10984,7 @@ cmd_flow_director_flex_mask_parsed(void *parsed_result,
                return;
        }
        flex_mask.flow_type = str2flowtype(res->flow_type);
-       if (!(flow_type_mask & (1 << flex_mask.flow_type))) {
+       if (!(flow_type_mask & (1ULL << flex_mask.flow_type))) {
                printf("Flow type %s not supported on port %d\n",
                                res->flow_type, res->port_id);
                return;
@@ -9222,7 +10999,7 @@ cmdline_parse_token_string_t cmd_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);
+                             port_id, UINT16);
 cmdline_parse_token_string_t cmd_flow_director_flexmask_flow =
        TOKEN_STRING_INITIALIZER(struct cmd_flow_director_flex_mask_result,
                                 flow, "flow");
@@ -9237,7 +11014,8 @@ cmdline_parse_token_string_t cmd_flow_director_flexmask_mask =
 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",
+       .help_str = "flow_director_flex_mask ... : "
+               "Set flow director's flex mask on NIC",
        .tokens = {
                (void *)&cmd_flow_director_flexmask,
                (void *)&cmd_flow_director_flexmask_port_id,
@@ -9251,7 +11029,7 @@ cmdline_parse_inst_t cmd_set_flow_director_flex_mask = {
 /* *** deal with flow director flexible payload configuration *** */
 struct cmd_flow_director_flexpayload_result {
        cmdline_fixed_string_t flow_director_flexpayload;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t payload_layer;
        cmdline_fixed_string_t payload_cfg;
 };
@@ -9344,7 +11122,7 @@ cmdline_parse_token_string_t cmd_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);
+                             port_id, UINT16);
 cmdline_parse_token_string_t cmd_flow_director_flexpayload_payload_layer =
        TOKEN_STRING_INITIALIZER(struct cmd_flow_director_flexpayload_result,
                                 payload_layer, "raw#l2#l3#l4");
@@ -9355,7 +11133,8 @@ cmdline_parse_token_string_t cmd_flow_director_flexpayload_payload_cfg =
 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",
+       .help_str = "flow_director_flexpayload ... : "
+               "Set flow director's flex payload on NIC",
        .tokens = {
                (void *)&cmd_flow_director_flexpayload,
                (void *)&cmd_flow_director_flexpayload_port_id,
@@ -9365,11 +11144,14 @@ cmdline_parse_inst_t cmd_set_flow_director_flex_payload = {
        },
 };
 
+/* Generic flow interface command. */
+extern cmdline_parse_inst_t cmd_flow;
+
 /* *** 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;
+       portid_t port_id;
 };
 
 static void
@@ -9408,12 +11190,12 @@ cmdline_parse_token_string_t cmd_get_sym_hash_ena_per_port_all =
                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);
+               port_id, UINT16);
 
 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",
+       .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,
@@ -9425,7 +11207,7 @@ cmdline_parse_inst_t cmd_get_sym_hash_ena_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;
+       portid_t port_id;
 };
 
 static void
@@ -9464,7 +11246,7 @@ cmdline_parse_token_string_t cmd_set_sym_hash_ena_per_port_all =
                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);
+               port_id, UINT16);
 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");
@@ -9472,7 +11254,7 @@ cmdline_parse_token_string_t cmd_set_sym_hash_ena_per_port_enable =
 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",
+       .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,
@@ -9484,7 +11266,7 @@ cmdline_parse_inst_t cmd_set_sym_hash_ena_per_port = {
 /* 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;
+       portid_t port_id;
 };
 
 static char *
@@ -9564,10 +11346,10 @@ cmd_get_hash_global_config_parsed(void *parsed_result,
        }
 
        for (i = 0; i < RTE_ETH_FLOW_MAX; i++) {
-               idx = i / UINT32_BIT;
-               offset = i % UINT32_BIT;
+               idx = i / UINT64_BIT;
+               offset = i % UINT64_BIT;
                if (!(info.info.global_conf.valid_bit_mask[idx] &
-                                               (1UL << offset)))
+                                               (1ULL << offset)))
                        continue;
                str = flowtype_to_str(i);
                if (!str)
@@ -9575,7 +11357,7 @@ cmd_get_hash_global_config_parsed(void *parsed_result,
                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,
+                       (1ULL << offset)) ? "enabled" : "disabled"), str,
                                                        res->port_id);
        }
 }
@@ -9585,12 +11367,12 @@ cmdline_parse_token_string_t cmd_get_hash_global_config_all =
                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);
+               port_id, UINT16);
 
 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",
+       .help_str = "get_hash_global_config <port_id>",
        .tokens = {
                (void *)&cmd_get_hash_global_config_all,
                (void *)&cmd_get_hash_global_config_port_id,
@@ -9601,7 +11383,7 @@ cmdline_parse_inst_t cmd_get_hash_global_config = {
 /* 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;
+       portid_t port_id;
        cmdline_fixed_string_t hash_func;
        cmdline_fixed_string_t flow_type;
        cmdline_fixed_string_t enable;
@@ -9636,12 +11418,12 @@ cmd_set_hash_global_config_parsed(void *parsed_result,
                        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);
+       idx = ftype / UINT64_BIT;
+       offset = ftype % UINT64_BIT;
+       info.info.global_conf.valid_bit_mask[idx] |= (1ULL << offset);
        if (!strcmp(res->enable, "enable"))
                info.info.global_conf.sym_hash_enable_mask[idx] |=
-                                               (1UL << offset);
+                                               (1ULL << offset);
        ret = rte_eth_dev_filter_ctrl(res->port_id, RTE_ETH_FILTER_HASH,
                                        RTE_ETH_FILTER_SET, &info);
        if (ret < 0)
@@ -9657,7 +11439,7 @@ cmdline_parse_token_string_t cmd_set_hash_global_config_all =
                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);
+               port_id, UINT16);
 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");
@@ -9673,11 +11455,11 @@ cmdline_parse_token_string_t cmd_set_hash_global_config_enable =
 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 "
+       .help_str = "set_hash_global_config <port_id> "
                "toeplitz|simple_xor|default "
-               "ipv4|ipv4-frag|ipv4-tcp|ipv4-udp|ipv4-sctp|ipv4-other|ipv6|"
-               "ipv6-frag|ipv6-tcp|ipv6-udp|ipv6-sctp|ipv6-other|l2_payload "
-               "enable|disable",
+               "ipv4|ipv4-frag|ipv4-tcp|ipv4-udp|ipv4-sctp|ipv4-other|"
+               "ipv6|ipv6-frag|ipv6-tcp|ipv6-udp|ipv6-sctp|ipv6-other|"
+               "l2_payload enable|disable",
        .tokens = {
                (void *)&cmd_set_hash_global_config_all,
                (void *)&cmd_set_hash_global_config_port_id,
@@ -9691,7 +11473,7 @@ cmdline_parse_inst_t cmd_set_hash_global_config = {
 /* Set hash input set */
 struct cmd_set_hash_input_set_result {
        cmdline_fixed_string_t set_hash_input_set;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t flow_type;
        cmdline_fixed_string_t inset_field;
        cmdline_fixed_string_t select;
@@ -9773,12 +11555,10 @@ cmdline_parse_token_string_t cmd_set_hash_input_set_cmd =
                set_hash_input_set, "set_hash_input_set");
 cmdline_parse_token_num_t cmd_set_hash_input_set_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_set_hash_input_set_result,
-               port_id, UINT8);
+               port_id, UINT16);
 cmdline_parse_token_string_t cmd_set_hash_input_set_flow_type =
        TOKEN_STRING_INITIALIZER(struct cmd_set_hash_input_set_result,
-               flow_type,
-               "ipv4-frag#ipv4-tcp#ipv4-udp#ipv4-sctp#ipv4-other#"
-               "ipv6-frag#ipv6-tcp#ipv6-udp#ipv6-sctp#ipv6-other#l2_payload");
+               flow_type, NULL);
 cmdline_parse_token_string_t cmd_set_hash_input_set_field =
        TOKEN_STRING_INITIALIZER(struct cmd_set_hash_input_set_result,
                inset_field,
@@ -9797,7 +11577,7 @@ cmdline_parse_inst_t cmd_set_hash_input_set = {
        .data = NULL,
        .help_str = "set_hash_input_set <port_id> "
        "ipv4-frag|ipv4-tcp|ipv4-udp|ipv4-sctp|ipv4-other|"
-       "ipv6-frag|ipv6-tcp|ipv6-udp|ipv6-sctp|ipv6-other|l2_payload "
+       "ipv6-frag|ipv6-tcp|ipv6-udp|ipv6-sctp|ipv6-other|l2_payload|<flowtype_id> "
        "ovlan|ivlan|src-ipv4|dst-ipv4|src-ipv6|dst-ipv6|ipv4-tos|ipv4-proto|"
        "ipv6-tc|ipv6-next-header|udp-src-port|udp-dst-port|tcp-src-port|"
        "tcp-dst-port|sctp-src-port|sctp-dst-port|sctp-veri-tag|udp-key|"
@@ -9816,7 +11596,7 @@ cmdline_parse_inst_t cmd_set_hash_input_set = {
 /* Set flow director input set */
 struct cmd_set_fdir_input_set_result {
        cmdline_fixed_string_t set_fdir_input_set;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t flow_type;
        cmdline_fixed_string_t inset_field;
        cmdline_fixed_string_t select;
@@ -9848,7 +11628,7 @@ cmdline_parse_token_string_t cmd_set_fdir_input_set_cmd =
        set_fdir_input_set, "set_fdir_input_set");
 cmdline_parse_token_num_t cmd_set_fdir_input_set_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_set_fdir_input_set_result,
-       port_id, UINT8);
+       port_id, UINT16);
 cmdline_parse_token_string_t cmd_set_fdir_input_set_flow_type =
        TOKEN_STRING_INITIALIZER(struct cmd_set_fdir_input_set_result,
        flow_type,
@@ -9891,7 +11671,7 @@ cmdline_parse_inst_t cmd_set_fdir_input_set = {
 struct cmd_mcast_addr_result {
        cmdline_fixed_string_t mcast_addr_cmd;
        cmdline_fixed_string_t what;
-       uint8_t port_num;
+       uint16_t port_num;
        struct ether_addr mc_addr;
 };
 
@@ -9921,14 +11701,15 @@ cmdline_parse_token_string_t cmd_mcast_addr_what =
        TOKEN_STRING_INITIALIZER(struct cmd_mcast_addr_result, what,
                                 "add#remove");
 cmdline_parse_token_num_t cmd_mcast_addr_portnum =
-       TOKEN_NUM_INITIALIZER(struct cmd_mcast_addr_result, port_num, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_mcast_addr_result, port_num, UINT16);
 cmdline_parse_token_etheraddr_t cmd_mcast_addr_addr =
        TOKEN_ETHERADDR_INITIALIZER(struct cmd_mac_addr_result, address);
 
 cmdline_parse_inst_t cmd_mcast_addr = {
        .f = cmd_mcast_addr_parsed,
        .data = (void *)0,
-       .help_str = "mcast_addr add|remove X <mcast_addr>: add/remove multicast MAC address on port X",
+       .help_str = "mcast_addr add|remove <port_id> <mcast_addr>: "
+               "Add/Remove multicast MAC address on port_id",
        .tokens = {
                (void *)&cmd_mcast_addr_cmd,
                (void *)&cmd_mcast_addr_what,
@@ -10020,7 +11801,7 @@ cmd_config_l2_tunnel_eth_type_all_parsed
        entry.l2_tunnel_type = str2fdir_l2_tunnel_type(res->l2_tunnel_type);
        entry.ether_type = res->eth_type_val;
 
-       FOREACH_PORT(pid, ports) {
+       RTE_ETH_FOREACH_DEV(pid) {
                rte_eth_dev_l2_tunnel_eth_type_conf(pid, &entry);
        }
 }
@@ -10028,7 +11809,7 @@ cmd_config_l2_tunnel_eth_type_all_parsed
 cmdline_parse_inst_t cmd_config_l2_tunnel_eth_type_all = {
        .f = cmd_config_l2_tunnel_eth_type_all_parsed,
        .data = NULL,
-       .help_str = "port config all l2-tunnel ether-type",
+       .help_str = "port config all l2-tunnel E-tag ether-type <value>",
        .tokens = {
                (void *)&cmd_config_l2_tunnel_eth_type_port,
                (void *)&cmd_config_l2_tunnel_eth_type_config,
@@ -10064,7 +11845,7 @@ cmd_config_l2_tunnel_eth_type_specific_parsed(
 cmdline_parse_inst_t cmd_config_l2_tunnel_eth_type_specific = {
        .f = cmd_config_l2_tunnel_eth_type_specific_parsed,
        .data = NULL,
-       .help_str = "port config l2-tunnel ether-type",
+       .help_str = "port config <port_id> l2-tunnel E-tag ether-type <value>",
        .tokens = {
                (void *)&cmd_config_l2_tunnel_eth_type_port,
                (void *)&cmd_config_l2_tunnel_eth_type_config,
@@ -10136,7 +11917,7 @@ cmd_config_l2_tunnel_en_dis_all_parsed(
        else
                en = 0;
 
-       FOREACH_PORT(pid, ports) {
+       RTE_ETH_FOREACH_DEV(pid) {
                rte_eth_dev_l2_tunnel_offload_set(pid,
                                                  &entry,
                                                  ETH_L2_TUNNEL_ENABLE_MASK,
@@ -10147,7 +11928,7 @@ cmd_config_l2_tunnel_en_dis_all_parsed(
 cmdline_parse_inst_t cmd_config_l2_tunnel_en_dis_all = {
        .f = cmd_config_l2_tunnel_en_dis_all_parsed,
        .data = NULL,
-       .help_str = "port config all l2-tunnel enable/disable",
+       .help_str = "port config all l2-tunnel E-tag enable|disable",
        .tokens = {
                (void *)&cmd_config_l2_tunnel_en_dis_port,
                (void *)&cmd_config_l2_tunnel_en_dis_config,
@@ -10190,7 +11971,7 @@ cmd_config_l2_tunnel_en_dis_specific_parsed(
 cmdline_parse_inst_t cmd_config_l2_tunnel_en_dis_specific = {
        .f = cmd_config_l2_tunnel_en_dis_specific_parsed,
        .data = NULL,
-       .help_str = "port config l2-tunnel enable/disable",
+       .help_str = "port config <port_id> l2-tunnel E-tag enable|disable",
        .tokens = {
                (void *)&cmd_config_l2_tunnel_en_dis_port,
                (void *)&cmd_config_l2_tunnel_en_dis_config,
@@ -10224,7 +12005,7 @@ struct cmd_config_e_tag_result {
        cmdline_fixed_string_t dst_pool;
        uint8_t dst_pool_val;
        cmdline_fixed_string_t port;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t vf;
        uint8_t vf_id;
 };
@@ -10305,7 +12086,7 @@ cmdline_parse_token_string_t cmd_config_e_tag_port =
 cmdline_parse_token_num_t cmd_config_e_tag_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_config_e_tag_result,
-                port_id, UINT8);
+                port_id, UINT16);
 cmdline_parse_token_string_t cmd_config_e_tag_vf =
        TOKEN_STRING_INITIALIZER
                (struct cmd_config_e_tag_result,
@@ -10363,7 +12144,7 @@ cmd_config_e_tag_insertion_dis_parsed(
 cmdline_parse_inst_t cmd_config_e_tag_insertion_en = {
        .f = cmd_config_e_tag_insertion_en_parsed,
        .data = NULL,
-       .help_str = "E-tag insertion enable",
+       .help_str = "E-tag ... : E-tag insertion enable",
        .tokens = {
                (void *)&cmd_config_e_tag_e_tag,
                (void *)&cmd_config_e_tag_set,
@@ -10382,7 +12163,7 @@ cmdline_parse_inst_t cmd_config_e_tag_insertion_en = {
 cmdline_parse_inst_t cmd_config_e_tag_insertion_dis = {
        .f = cmd_config_e_tag_insertion_dis_parsed,
        .data = NULL,
-       .help_str = "E-tag insertion disable",
+       .help_str = "E-tag ... : E-tag insertion disable",
        .tokens = {
                (void *)&cmd_config_e_tag_e_tag,
                (void *)&cmd_config_e_tag_set,
@@ -10429,7 +12210,7 @@ cmd_config_e_tag_stripping_parsed(
 cmdline_parse_inst_t cmd_config_e_tag_stripping_en_dis = {
        .f = cmd_config_e_tag_stripping_parsed,
        .data = NULL,
-       .help_str = "E-tag stripping enable/disable",
+       .help_str = "E-tag ... : E-tag stripping enable/disable",
        .tokens = {
                (void *)&cmd_config_e_tag_e_tag,
                (void *)&cmd_config_e_tag_set,
@@ -10473,7 +12254,7 @@ cmd_config_e_tag_forwarding_parsed(
 cmdline_parse_inst_t cmd_config_e_tag_forwarding_en_dis = {
        .f = cmd_config_e_tag_forwarding_parsed,
        .data = NULL,
-       .help_str = "E-tag forwarding enable/disable",
+       .help_str = "E-tag ... : E-tag forwarding enable/disable",
        .tokens = {
                (void *)&cmd_config_e_tag_e_tag,
                (void *)&cmd_config_e_tag_set,
@@ -10528,7 +12309,7 @@ cmd_config_e_tag_filter_add_parsed(
 cmdline_parse_inst_t cmd_config_e_tag_filter_add = {
        .f = cmd_config_e_tag_filter_add_parsed,
        .data = NULL,
-       .help_str = "E-tag filter add",
+       .help_str = "E-tag ... : E-tag filter add",
        .tokens = {
                (void *)&cmd_config_e_tag_e_tag,
                (void *)&cmd_config_e_tag_set,
@@ -10585,7 +12366,7 @@ cmd_config_e_tag_filter_del_parsed(
 cmdline_parse_inst_t cmd_config_e_tag_filter_del = {
        .f = cmd_config_e_tag_filter_del_parsed,
        .data = NULL,
-       .help_str = "E-tag filter delete",
+       .help_str = "E-tag ... : E-tag filter delete",
        .tokens = {
                (void *)&cmd_config_e_tag_e_tag,
                (void *)&cmd_config_e_tag_set,
@@ -10599,163 +12380,3922 @@ cmdline_parse_inst_t cmd_config_e_tag_filter_del = {
        },
 };
 
-/* ******************************************************************************** */
+/* vf vlan anti spoof configuration */
 
-/* list of instructions */
-cmdline_parse_ctx_t main_ctx[] = {
-       (cmdline_parse_inst_t *)&cmd_help_brief,
-       (cmdline_parse_inst_t *)&cmd_help_long,
-       (cmdline_parse_inst_t *)&cmd_quit,
-       (cmdline_parse_inst_t *)&cmd_showport,
-       (cmdline_parse_inst_t *)&cmd_showqueue,
-       (cmdline_parse_inst_t *)&cmd_showportall,
-       (cmdline_parse_inst_t *)&cmd_showcfg,
-       (cmdline_parse_inst_t *)&cmd_start,
-       (cmdline_parse_inst_t *)&cmd_start_tx_first,
-       (cmdline_parse_inst_t *)&cmd_start_tx_first_n,
-       (cmdline_parse_inst_t *)&cmd_set_link_up,
-       (cmdline_parse_inst_t *)&cmd_set_link_down,
-       (cmdline_parse_inst_t *)&cmd_reset,
-       (cmdline_parse_inst_t *)&cmd_set_numbers,
-       (cmdline_parse_inst_t *)&cmd_set_txpkts,
-       (cmdline_parse_inst_t *)&cmd_set_txsplit,
-       (cmdline_parse_inst_t *)&cmd_set_fwd_list,
-       (cmdline_parse_inst_t *)&cmd_set_fwd_mask,
-       (cmdline_parse_inst_t *)&cmd_set_fwd_mode,
-       (cmdline_parse_inst_t *)&cmd_set_fwd_retry_mode,
-       (cmdline_parse_inst_t *)&cmd_set_burst_tx_retry,
-       (cmdline_parse_inst_t *)&cmd_set_promisc_mode_one,
-       (cmdline_parse_inst_t *)&cmd_set_promisc_mode_all,
-       (cmdline_parse_inst_t *)&cmd_set_allmulti_mode_one,
-       (cmdline_parse_inst_t *)&cmd_set_allmulti_mode_all,
-       (cmdline_parse_inst_t *)&cmd_set_flush_rx,
-       (cmdline_parse_inst_t *)&cmd_set_link_check,
-#ifdef RTE_NIC_BYPASS
-       (cmdline_parse_inst_t *)&cmd_set_bypass_mode,
-       (cmdline_parse_inst_t *)&cmd_set_bypass_event,
-       (cmdline_parse_inst_t *)&cmd_set_bypass_timeout,
-       (cmdline_parse_inst_t *)&cmd_show_bypass_config,
+/* Common result structure for vf vlan anti spoof */
+struct cmd_vf_vlan_anti_spoof_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t vf;
+       cmdline_fixed_string_t vlan;
+       cmdline_fixed_string_t antispoof;
+       portid_t port_id;
+       uint32_t vf_id;
+       cmdline_fixed_string_t on_off;
+};
+
+/* Common CLI fields for vf vlan anti spoof enable disable */
+cmdline_parse_token_string_t cmd_vf_vlan_anti_spoof_set =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_vlan_anti_spoof_result,
+                set, "set");
+cmdline_parse_token_string_t cmd_vf_vlan_anti_spoof_vf =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_vlan_anti_spoof_result,
+                vf, "vf");
+cmdline_parse_token_string_t cmd_vf_vlan_anti_spoof_vlan =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_vlan_anti_spoof_result,
+                vlan, "vlan");
+cmdline_parse_token_string_t cmd_vf_vlan_anti_spoof_antispoof =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_vlan_anti_spoof_result,
+                antispoof, "antispoof");
+cmdline_parse_token_num_t cmd_vf_vlan_anti_spoof_port_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_vf_vlan_anti_spoof_result,
+                port_id, UINT16);
+cmdline_parse_token_num_t cmd_vf_vlan_anti_spoof_vf_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_vf_vlan_anti_spoof_result,
+                vf_id, UINT32);
+cmdline_parse_token_string_t cmd_vf_vlan_anti_spoof_on_off =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_vlan_anti_spoof_result,
+                on_off, "on#off");
+
+static void
+cmd_set_vf_vlan_anti_spoof_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_vf_vlan_anti_spoof_result *res = parsed_result;
+       int ret = -ENOTSUP;
+
+       __rte_unused int is_on = (strcmp(res->on_off, "on") == 0) ? 1 : 0;
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_IXGBE_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_ixgbe_set_vf_vlan_anti_spoof(res->port_id,
+                               res->vf_id, is_on);
 #endif
-#ifdef RTE_LIBRTE_PMD_BOND
-       (cmdline_parse_inst_t *) &cmd_set_bonding_mode,
-       (cmdline_parse_inst_t *) &cmd_show_bonding_config,
-       (cmdline_parse_inst_t *) &cmd_set_bonding_primary,
-       (cmdline_parse_inst_t *) &cmd_add_bonding_slave,
-       (cmdline_parse_inst_t *) &cmd_remove_bonding_slave,
-       (cmdline_parse_inst_t *) &cmd_create_bonded_device,
-       (cmdline_parse_inst_t *) &cmd_set_bond_mac_addr,
-       (cmdline_parse_inst_t *) &cmd_set_balance_xmit_policy,
-       (cmdline_parse_inst_t *) &cmd_set_bond_mon_period,
+#ifdef RTE_LIBRTE_I40E_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_i40e_set_vf_vlan_anti_spoof(res->port_id,
+                               res->vf_id, is_on);
 #endif
-       (cmdline_parse_inst_t *)&cmd_vlan_offload,
-       (cmdline_parse_inst_t *)&cmd_vlan_tpid,
-       (cmdline_parse_inst_t *)&cmd_rx_vlan_filter_all,
-       (cmdline_parse_inst_t *)&cmd_rx_vlan_filter,
-       (cmdline_parse_inst_t *)&cmd_tx_vlan_set,
-       (cmdline_parse_inst_t *)&cmd_tx_vlan_set_qinq,
-       (cmdline_parse_inst_t *)&cmd_tx_vlan_reset,
-       (cmdline_parse_inst_t *)&cmd_tx_vlan_set_pvid,
-       (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,
-       (cmdline_parse_inst_t *)&cmd_link_flow_control_set_hw,
-       (cmdline_parse_inst_t *)&cmd_link_flow_control_set_lw,
-       (cmdline_parse_inst_t *)&cmd_link_flow_control_set_pt,
-       (cmdline_parse_inst_t *)&cmd_link_flow_control_set_xon,
-       (cmdline_parse_inst_t *)&cmd_link_flow_control_set_macfwd,
-       (cmdline_parse_inst_t *)&cmd_link_flow_control_set_autoneg,
-       (cmdline_parse_inst_t *)&cmd_priority_flow_control_set,
-       (cmdline_parse_inst_t *)&cmd_config_dcb,
-       (cmdline_parse_inst_t *)&cmd_read_reg,
-       (cmdline_parse_inst_t *)&cmd_read_reg_bit_field,
-       (cmdline_parse_inst_t *)&cmd_read_reg_bit,
-       (cmdline_parse_inst_t *)&cmd_write_reg,
-       (cmdline_parse_inst_t *)&cmd_write_reg_bit_field,
-       (cmdline_parse_inst_t *)&cmd_write_reg_bit,
-       (cmdline_parse_inst_t *)&cmd_read_rxd_txd,
-       (cmdline_parse_inst_t *)&cmd_stop,
-       (cmdline_parse_inst_t *)&cmd_mac_addr,
-       (cmdline_parse_inst_t *)&cmd_set_qmap,
-       (cmdline_parse_inst_t *)&cmd_operate_port,
-       (cmdline_parse_inst_t *)&cmd_operate_specific_port,
-       (cmdline_parse_inst_t *)&cmd_operate_attach_port,
-       (cmdline_parse_inst_t *)&cmd_operate_detach_port,
-       (cmdline_parse_inst_t *)&cmd_config_speed_all,
-       (cmdline_parse_inst_t *)&cmd_config_speed_specific,
-       (cmdline_parse_inst_t *)&cmd_config_rx_tx,
-       (cmdline_parse_inst_t *)&cmd_config_mtu,
-       (cmdline_parse_inst_t *)&cmd_config_max_pkt_len,
-       (cmdline_parse_inst_t *)&cmd_config_rx_mode_flag,
-       (cmdline_parse_inst_t *)&cmd_config_rss,
-       (cmdline_parse_inst_t *)&cmd_config_rxtx_queue,
-       (cmdline_parse_inst_t *)&cmd_config_txqflags,
-       (cmdline_parse_inst_t *)&cmd_config_rss_reta,
-       (cmdline_parse_inst_t *)&cmd_showport_reta,
-       (cmdline_parse_inst_t *)&cmd_config_burst,
-       (cmdline_parse_inst_t *)&cmd_config_thresh,
-       (cmdline_parse_inst_t *)&cmd_config_threshold,
-       (cmdline_parse_inst_t *)&cmd_set_vf_rxmode,
-       (cmdline_parse_inst_t *)&cmd_set_uc_hash_filter,
-       (cmdline_parse_inst_t *)&cmd_set_uc_all_hash_filter,
-       (cmdline_parse_inst_t *)&cmd_vf_mac_addr_filter,
-       (cmdline_parse_inst_t *)&cmd_set_vf_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_global_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,
-       (cmdline_parse_inst_t *)&cmd_showport_rss_hash,
-       (cmdline_parse_inst_t *)&cmd_showport_rss_hash_key,
-       (cmdline_parse_inst_t *)&cmd_config_rss_hash_key,
-       (cmdline_parse_inst_t *)&cmd_dump,
-       (cmdline_parse_inst_t *)&cmd_dump_one,
-       (cmdline_parse_inst_t *)&cmd_ethertype_filter,
-       (cmdline_parse_inst_t *)&cmd_syn_filter,
-       (cmdline_parse_inst_t *)&cmd_2tuple_filter,
-       (cmdline_parse_inst_t *)&cmd_5tuple_filter,
-       (cmdline_parse_inst_t *)&cmd_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_add_del_l2_flow_director,
-       (cmdline_parse_inst_t *)&cmd_add_del_mac_vlan_flow_director,
-       (cmdline_parse_inst_t *)&cmd_add_del_tunnel_flow_director,
-       (cmdline_parse_inst_t *)&cmd_flush_flow_director,
-       (cmdline_parse_inst_t *)&cmd_set_flow_director_ip_mask,
-       (cmdline_parse_inst_t *)&cmd_set_flow_director_mac_vlan_mask,
-       (cmdline_parse_inst_t *)&cmd_set_flow_director_tunnel_mask,
-       (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,
-       (cmdline_parse_inst_t *)&cmd_set_hash_input_set,
-       (cmdline_parse_inst_t *)&cmd_set_fdir_input_set,
-       (cmdline_parse_inst_t *)&cmd_mcast_addr,
-       (cmdline_parse_inst_t *)&cmd_config_l2_tunnel_eth_type_all,
-       (cmdline_parse_inst_t *)&cmd_config_l2_tunnel_eth_type_specific,
-       (cmdline_parse_inst_t *)&cmd_config_l2_tunnel_en_dis_all,
-       (cmdline_parse_inst_t *)&cmd_config_l2_tunnel_en_dis_specific,
-       (cmdline_parse_inst_t *)&cmd_config_e_tag_insertion_en,
-       (cmdline_parse_inst_t *)&cmd_config_e_tag_insertion_dis,
-       (cmdline_parse_inst_t *)&cmd_config_e_tag_stripping_en_dis,
-       (cmdline_parse_inst_t *)&cmd_config_e_tag_forwarding_en_dis,
-       (cmdline_parse_inst_t *)&cmd_config_e_tag_filter_add,
-       (cmdline_parse_inst_t *)&cmd_config_e_tag_filter_del,
-       NULL,
+#ifdef RTE_LIBRTE_BNXT_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_bnxt_set_vf_vlan_anti_spoof(res->port_id,
+                               res->vf_id, is_on);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -EINVAL:
+               printf("invalid vf_id %d\n", res->vf_id);
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               break;
+       case -ENOTSUP:
+               printf("function not implemented\n");
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_inst_t cmd_set_vf_vlan_anti_spoof = {
+       .f = cmd_set_vf_vlan_anti_spoof_parsed,
+       .data = NULL,
+       .help_str = "set vf vlan antispoof <port_id> <vf_id> on|off",
+       .tokens = {
+               (void *)&cmd_vf_vlan_anti_spoof_set,
+               (void *)&cmd_vf_vlan_anti_spoof_vf,
+               (void *)&cmd_vf_vlan_anti_spoof_vlan,
+               (void *)&cmd_vf_vlan_anti_spoof_antispoof,
+               (void *)&cmd_vf_vlan_anti_spoof_port_id,
+               (void *)&cmd_vf_vlan_anti_spoof_vf_id,
+               (void *)&cmd_vf_vlan_anti_spoof_on_off,
+               NULL,
+       },
+};
+
+/* vf mac anti spoof configuration */
+
+/* Common result structure for vf mac anti spoof */
+struct cmd_vf_mac_anti_spoof_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t vf;
+       cmdline_fixed_string_t mac;
+       cmdline_fixed_string_t antispoof;
+       portid_t port_id;
+       uint32_t vf_id;
+       cmdline_fixed_string_t on_off;
 };
 
+/* Common CLI fields for vf mac anti spoof enable disable */
+cmdline_parse_token_string_t cmd_vf_mac_anti_spoof_set =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_mac_anti_spoof_result,
+                set, "set");
+cmdline_parse_token_string_t cmd_vf_mac_anti_spoof_vf =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_mac_anti_spoof_result,
+                vf, "vf");
+cmdline_parse_token_string_t cmd_vf_mac_anti_spoof_mac =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_mac_anti_spoof_result,
+                mac, "mac");
+cmdline_parse_token_string_t cmd_vf_mac_anti_spoof_antispoof =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_mac_anti_spoof_result,
+                antispoof, "antispoof");
+cmdline_parse_token_num_t cmd_vf_mac_anti_spoof_port_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_vf_mac_anti_spoof_result,
+                port_id, UINT16);
+cmdline_parse_token_num_t cmd_vf_mac_anti_spoof_vf_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_vf_mac_anti_spoof_result,
+                vf_id, UINT32);
+cmdline_parse_token_string_t cmd_vf_mac_anti_spoof_on_off =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_mac_anti_spoof_result,
+                on_off, "on#off");
+
+static void
+cmd_set_vf_mac_anti_spoof_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_vf_mac_anti_spoof_result *res = parsed_result;
+       int ret = -ENOTSUP;
+
+       __rte_unused int is_on = (strcmp(res->on_off, "on") == 0) ? 1 : 0;
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_IXGBE_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_ixgbe_set_vf_mac_anti_spoof(res->port_id,
+                       res->vf_id, is_on);
+#endif
+#ifdef RTE_LIBRTE_I40E_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_i40e_set_vf_mac_anti_spoof(res->port_id,
+                       res->vf_id, is_on);
+#endif
+#ifdef RTE_LIBRTE_BNXT_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_bnxt_set_vf_mac_anti_spoof(res->port_id,
+                       res->vf_id, is_on);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -EINVAL:
+               printf("invalid vf_id %d or is_on %d\n", res->vf_id, is_on);
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               break;
+       case -ENOTSUP:
+               printf("function not implemented\n");
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_inst_t cmd_set_vf_mac_anti_spoof = {
+       .f = cmd_set_vf_mac_anti_spoof_parsed,
+       .data = NULL,
+       .help_str = "set vf mac antispoof <port_id> <vf_id> on|off",
+       .tokens = {
+               (void *)&cmd_vf_mac_anti_spoof_set,
+               (void *)&cmd_vf_mac_anti_spoof_vf,
+               (void *)&cmd_vf_mac_anti_spoof_mac,
+               (void *)&cmd_vf_mac_anti_spoof_antispoof,
+               (void *)&cmd_vf_mac_anti_spoof_port_id,
+               (void *)&cmd_vf_mac_anti_spoof_vf_id,
+               (void *)&cmd_vf_mac_anti_spoof_on_off,
+               NULL,
+       },
+};
+
+/* vf vlan strip queue configuration */
+
+/* Common result structure for vf mac anti spoof */
+struct cmd_vf_vlan_stripq_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t vf;
+       cmdline_fixed_string_t vlan;
+       cmdline_fixed_string_t stripq;
+       portid_t port_id;
+       uint16_t vf_id;
+       cmdline_fixed_string_t on_off;
+};
+
+/* Common CLI fields for vf vlan strip enable disable */
+cmdline_parse_token_string_t cmd_vf_vlan_stripq_set =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_vlan_stripq_result,
+                set, "set");
+cmdline_parse_token_string_t cmd_vf_vlan_stripq_vf =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_vlan_stripq_result,
+                vf, "vf");
+cmdline_parse_token_string_t cmd_vf_vlan_stripq_vlan =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_vlan_stripq_result,
+                vlan, "vlan");
+cmdline_parse_token_string_t cmd_vf_vlan_stripq_stripq =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_vlan_stripq_result,
+                stripq, "stripq");
+cmdline_parse_token_num_t cmd_vf_vlan_stripq_port_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_vf_vlan_stripq_result,
+                port_id, UINT16);
+cmdline_parse_token_num_t cmd_vf_vlan_stripq_vf_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_vf_vlan_stripq_result,
+                vf_id, UINT16);
+cmdline_parse_token_string_t cmd_vf_vlan_stripq_on_off =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_vlan_stripq_result,
+                on_off, "on#off");
+
+static void
+cmd_set_vf_vlan_stripq_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_vf_vlan_stripq_result *res = parsed_result;
+       int ret = -ENOTSUP;
+
+       __rte_unused int is_on = (strcmp(res->on_off, "on") == 0) ? 1 : 0;
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_IXGBE_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_ixgbe_set_vf_vlan_stripq(res->port_id,
+                       res->vf_id, is_on);
+#endif
+#ifdef RTE_LIBRTE_I40E_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_i40e_set_vf_vlan_stripq(res->port_id,
+                       res->vf_id, is_on);
+#endif
+#ifdef RTE_LIBRTE_BNXT_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_bnxt_set_vf_vlan_stripq(res->port_id,
+                       res->vf_id, is_on);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -EINVAL:
+               printf("invalid vf_id %d or is_on %d\n", res->vf_id, is_on);
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               break;
+       case -ENOTSUP:
+               printf("function not implemented\n");
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_inst_t cmd_set_vf_vlan_stripq = {
+       .f = cmd_set_vf_vlan_stripq_parsed,
+       .data = NULL,
+       .help_str = "set vf vlan stripq <port_id> <vf_id> on|off",
+       .tokens = {
+               (void *)&cmd_vf_vlan_stripq_set,
+               (void *)&cmd_vf_vlan_stripq_vf,
+               (void *)&cmd_vf_vlan_stripq_vlan,
+               (void *)&cmd_vf_vlan_stripq_stripq,
+               (void *)&cmd_vf_vlan_stripq_port_id,
+               (void *)&cmd_vf_vlan_stripq_vf_id,
+               (void *)&cmd_vf_vlan_stripq_on_off,
+               NULL,
+       },
+};
+
+/* vf vlan insert configuration */
+
+/* Common result structure for vf vlan insert */
+struct cmd_vf_vlan_insert_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t vf;
+       cmdline_fixed_string_t vlan;
+       cmdline_fixed_string_t insert;
+       portid_t port_id;
+       uint16_t vf_id;
+       uint16_t vlan_id;
+};
+
+/* Common CLI fields for vf vlan insert enable disable */
+cmdline_parse_token_string_t cmd_vf_vlan_insert_set =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_vlan_insert_result,
+                set, "set");
+cmdline_parse_token_string_t cmd_vf_vlan_insert_vf =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_vlan_insert_result,
+                vf, "vf");
+cmdline_parse_token_string_t cmd_vf_vlan_insert_vlan =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_vlan_insert_result,
+                vlan, "vlan");
+cmdline_parse_token_string_t cmd_vf_vlan_insert_insert =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_vlan_insert_result,
+                insert, "insert");
+cmdline_parse_token_num_t cmd_vf_vlan_insert_port_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_vf_vlan_insert_result,
+                port_id, UINT16);
+cmdline_parse_token_num_t cmd_vf_vlan_insert_vf_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_vf_vlan_insert_result,
+                vf_id, UINT16);
+cmdline_parse_token_num_t cmd_vf_vlan_insert_vlan_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_vf_vlan_insert_result,
+                vlan_id, UINT16);
+
+static void
+cmd_set_vf_vlan_insert_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_vf_vlan_insert_result *res = parsed_result;
+       int ret = -ENOTSUP;
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_IXGBE_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_ixgbe_set_vf_vlan_insert(res->port_id, res->vf_id,
+                       res->vlan_id);
+#endif
+#ifdef RTE_LIBRTE_I40E_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_i40e_set_vf_vlan_insert(res->port_id, res->vf_id,
+                       res->vlan_id);
+#endif
+#ifdef RTE_LIBRTE_BNXT_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_bnxt_set_vf_vlan_insert(res->port_id, res->vf_id,
+                       res->vlan_id);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -EINVAL:
+               printf("invalid vf_id %d or vlan_id %d\n", res->vf_id, res->vlan_id);
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               break;
+       case -ENOTSUP:
+               printf("function not implemented\n");
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_inst_t cmd_set_vf_vlan_insert = {
+       .f = cmd_set_vf_vlan_insert_parsed,
+       .data = NULL,
+       .help_str = "set vf vlan insert <port_id> <vf_id> <vlan_id>",
+       .tokens = {
+               (void *)&cmd_vf_vlan_insert_set,
+               (void *)&cmd_vf_vlan_insert_vf,
+               (void *)&cmd_vf_vlan_insert_vlan,
+               (void *)&cmd_vf_vlan_insert_insert,
+               (void *)&cmd_vf_vlan_insert_port_id,
+               (void *)&cmd_vf_vlan_insert_vf_id,
+               (void *)&cmd_vf_vlan_insert_vlan_id,
+               NULL,
+       },
+};
+
+/* tx loopback configuration */
+
+/* Common result structure for tx loopback */
+struct cmd_tx_loopback_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t tx;
+       cmdline_fixed_string_t loopback;
+       portid_t port_id;
+       cmdline_fixed_string_t on_off;
+};
+
+/* Common CLI fields for tx loopback enable disable */
+cmdline_parse_token_string_t cmd_tx_loopback_set =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_tx_loopback_result,
+                set, "set");
+cmdline_parse_token_string_t cmd_tx_loopback_tx =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_tx_loopback_result,
+                tx, "tx");
+cmdline_parse_token_string_t cmd_tx_loopback_loopback =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_tx_loopback_result,
+                loopback, "loopback");
+cmdline_parse_token_num_t cmd_tx_loopback_port_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_tx_loopback_result,
+                port_id, UINT16);
+cmdline_parse_token_string_t cmd_tx_loopback_on_off =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_tx_loopback_result,
+                on_off, "on#off");
+
+static void
+cmd_set_tx_loopback_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_tx_loopback_result *res = parsed_result;
+       int ret = -ENOTSUP;
+
+       __rte_unused int is_on = (strcmp(res->on_off, "on") == 0) ? 1 : 0;
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_IXGBE_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_ixgbe_set_tx_loopback(res->port_id, is_on);
+#endif
+#ifdef RTE_LIBRTE_I40E_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_i40e_set_tx_loopback(res->port_id, is_on);
+#endif
+#ifdef RTE_LIBRTE_BNXT_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_bnxt_set_tx_loopback(res->port_id, is_on);
+#endif
+#ifdef RTE_LIBRTE_DPAA_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_dpaa_set_tx_loopback(res->port_id, is_on);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -EINVAL:
+               printf("invalid is_on %d\n", is_on);
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               break;
+       case -ENOTSUP:
+               printf("function not implemented\n");
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_inst_t cmd_set_tx_loopback = {
+       .f = cmd_set_tx_loopback_parsed,
+       .data = NULL,
+       .help_str = "set tx loopback <port_id> on|off",
+       .tokens = {
+               (void *)&cmd_tx_loopback_set,
+               (void *)&cmd_tx_loopback_tx,
+               (void *)&cmd_tx_loopback_loopback,
+               (void *)&cmd_tx_loopback_port_id,
+               (void *)&cmd_tx_loopback_on_off,
+               NULL,
+       },
+};
+
+/* all queues drop enable configuration */
+
+/* Common result structure for all queues drop enable */
+struct cmd_all_queues_drop_en_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t all;
+       cmdline_fixed_string_t queues;
+       cmdline_fixed_string_t drop;
+       portid_t port_id;
+       cmdline_fixed_string_t on_off;
+};
+
+/* Common CLI fields for tx loopback enable disable */
+cmdline_parse_token_string_t cmd_all_queues_drop_en_set =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_all_queues_drop_en_result,
+                set, "set");
+cmdline_parse_token_string_t cmd_all_queues_drop_en_all =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_all_queues_drop_en_result,
+                all, "all");
+cmdline_parse_token_string_t cmd_all_queues_drop_en_queues =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_all_queues_drop_en_result,
+                queues, "queues");
+cmdline_parse_token_string_t cmd_all_queues_drop_en_drop =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_all_queues_drop_en_result,
+                drop, "drop");
+cmdline_parse_token_num_t cmd_all_queues_drop_en_port_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_all_queues_drop_en_result,
+                port_id, UINT16);
+cmdline_parse_token_string_t cmd_all_queues_drop_en_on_off =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_all_queues_drop_en_result,
+                on_off, "on#off");
+
+static void
+cmd_set_all_queues_drop_en_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_all_queues_drop_en_result *res = parsed_result;
+       int ret = -ENOTSUP;
+       int is_on = (strcmp(res->on_off, "on") == 0) ? 1 : 0;
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_IXGBE_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_ixgbe_set_all_queues_drop_en(res->port_id, is_on);
+#endif
+#ifdef RTE_LIBRTE_BNXT_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_bnxt_set_all_queues_drop_en(res->port_id, is_on);
+#endif
+       switch (ret) {
+       case 0:
+               break;
+       case -EINVAL:
+               printf("invalid is_on %d\n", is_on);
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               break;
+       case -ENOTSUP:
+               printf("function not implemented\n");
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_inst_t cmd_set_all_queues_drop_en = {
+       .f = cmd_set_all_queues_drop_en_parsed,
+       .data = NULL,
+       .help_str = "set all queues drop <port_id> on|off",
+       .tokens = {
+               (void *)&cmd_all_queues_drop_en_set,
+               (void *)&cmd_all_queues_drop_en_all,
+               (void *)&cmd_all_queues_drop_en_queues,
+               (void *)&cmd_all_queues_drop_en_drop,
+               (void *)&cmd_all_queues_drop_en_port_id,
+               (void *)&cmd_all_queues_drop_en_on_off,
+               NULL,
+       },
+};
+
+/* vf split drop enable configuration */
+
+/* Common result structure for vf split drop enable */
+struct cmd_vf_split_drop_en_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t vf;
+       cmdline_fixed_string_t split;
+       cmdline_fixed_string_t drop;
+       portid_t port_id;
+       uint16_t vf_id;
+       cmdline_fixed_string_t on_off;
+};
+
+/* Common CLI fields for vf split drop enable disable */
+cmdline_parse_token_string_t cmd_vf_split_drop_en_set =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_split_drop_en_result,
+                set, "set");
+cmdline_parse_token_string_t cmd_vf_split_drop_en_vf =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_split_drop_en_result,
+                vf, "vf");
+cmdline_parse_token_string_t cmd_vf_split_drop_en_split =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_split_drop_en_result,
+                split, "split");
+cmdline_parse_token_string_t cmd_vf_split_drop_en_drop =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_split_drop_en_result,
+                drop, "drop");
+cmdline_parse_token_num_t cmd_vf_split_drop_en_port_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_vf_split_drop_en_result,
+                port_id, UINT16);
+cmdline_parse_token_num_t cmd_vf_split_drop_en_vf_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_vf_split_drop_en_result,
+                vf_id, UINT16);
+cmdline_parse_token_string_t cmd_vf_split_drop_en_on_off =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_split_drop_en_result,
+                on_off, "on#off");
+
+static void
+cmd_set_vf_split_drop_en_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_vf_split_drop_en_result *res = parsed_result;
+       int ret = -ENOTSUP;
+       int is_on = (strcmp(res->on_off, "on") == 0) ? 1 : 0;
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_IXGBE_PMD
+       ret = rte_pmd_ixgbe_set_vf_split_drop_en(res->port_id, res->vf_id,
+                       is_on);
+#endif
+       switch (ret) {
+       case 0:
+               break;
+       case -EINVAL:
+               printf("invalid vf_id %d or is_on %d\n", res->vf_id, is_on);
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               break;
+       case -ENOTSUP:
+               printf("not supported on port %d\n", res->port_id);
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_inst_t cmd_set_vf_split_drop_en = {
+       .f = cmd_set_vf_split_drop_en_parsed,
+       .data = NULL,
+       .help_str = "set vf split drop <port_id> <vf_id> on|off",
+       .tokens = {
+               (void *)&cmd_vf_split_drop_en_set,
+               (void *)&cmd_vf_split_drop_en_vf,
+               (void *)&cmd_vf_split_drop_en_split,
+               (void *)&cmd_vf_split_drop_en_drop,
+               (void *)&cmd_vf_split_drop_en_port_id,
+               (void *)&cmd_vf_split_drop_en_vf_id,
+               (void *)&cmd_vf_split_drop_en_on_off,
+               NULL,
+       },
+};
+
+/* vf mac address configuration */
+
+/* Common result structure for vf mac address */
+struct cmd_set_vf_mac_addr_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t vf;
+       cmdline_fixed_string_t mac;
+       cmdline_fixed_string_t addr;
+       portid_t port_id;
+       uint16_t vf_id;
+       struct ether_addr mac_addr;
+
+};
+
+/* Common CLI fields for vf split drop enable disable */
+cmdline_parse_token_string_t cmd_set_vf_mac_addr_set =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_set_vf_mac_addr_result,
+                set, "set");
+cmdline_parse_token_string_t cmd_set_vf_mac_addr_vf =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_set_vf_mac_addr_result,
+                vf, "vf");
+cmdline_parse_token_string_t cmd_set_vf_mac_addr_mac =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_set_vf_mac_addr_result,
+                mac, "mac");
+cmdline_parse_token_string_t cmd_set_vf_mac_addr_addr =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_set_vf_mac_addr_result,
+                addr, "addr");
+cmdline_parse_token_num_t cmd_set_vf_mac_addr_port_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_set_vf_mac_addr_result,
+                port_id, UINT16);
+cmdline_parse_token_num_t cmd_set_vf_mac_addr_vf_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_set_vf_mac_addr_result,
+                vf_id, UINT16);
+cmdline_parse_token_etheraddr_t cmd_set_vf_mac_addr_mac_addr =
+       TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_vf_mac_addr_result,
+                mac_addr);
+
+static void
+cmd_set_vf_mac_addr_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_set_vf_mac_addr_result *res = parsed_result;
+       int ret = -ENOTSUP;
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_IXGBE_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_ixgbe_set_vf_mac_addr(res->port_id, res->vf_id,
+                               &res->mac_addr);
+#endif
+#ifdef RTE_LIBRTE_I40E_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_i40e_set_vf_mac_addr(res->port_id, res->vf_id,
+                               &res->mac_addr);
+#endif
+#ifdef RTE_LIBRTE_BNXT_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_bnxt_set_vf_mac_addr(res->port_id, res->vf_id,
+                               &res->mac_addr);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -EINVAL:
+               printf("invalid vf_id %d or mac_addr\n", res->vf_id);
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               break;
+       case -ENOTSUP:
+               printf("function not implemented\n");
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_inst_t cmd_set_vf_mac_addr = {
+       .f = cmd_set_vf_mac_addr_parsed,
+       .data = NULL,
+       .help_str = "set vf mac addr <port_id> <vf_id> <mac_addr>",
+       .tokens = {
+               (void *)&cmd_set_vf_mac_addr_set,
+               (void *)&cmd_set_vf_mac_addr_vf,
+               (void *)&cmd_set_vf_mac_addr_mac,
+               (void *)&cmd_set_vf_mac_addr_addr,
+               (void *)&cmd_set_vf_mac_addr_port_id,
+               (void *)&cmd_set_vf_mac_addr_vf_id,
+               (void *)&cmd_set_vf_mac_addr_mac_addr,
+               NULL,
+       },
+};
+
+/* MACsec configuration */
+
+/* Common result structure for MACsec offload enable */
+struct cmd_macsec_offload_on_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t macsec;
+       cmdline_fixed_string_t offload;
+       portid_t port_id;
+       cmdline_fixed_string_t on;
+       cmdline_fixed_string_t encrypt;
+       cmdline_fixed_string_t en_on_off;
+       cmdline_fixed_string_t replay_protect;
+       cmdline_fixed_string_t rp_on_off;
+};
+
+/* Common CLI fields for MACsec offload disable */
+cmdline_parse_token_string_t cmd_macsec_offload_on_set =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_macsec_offload_on_result,
+                set, "set");
+cmdline_parse_token_string_t cmd_macsec_offload_on_macsec =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_macsec_offload_on_result,
+                macsec, "macsec");
+cmdline_parse_token_string_t cmd_macsec_offload_on_offload =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_macsec_offload_on_result,
+                offload, "offload");
+cmdline_parse_token_num_t cmd_macsec_offload_on_port_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_macsec_offload_on_result,
+                port_id, UINT16);
+cmdline_parse_token_string_t cmd_macsec_offload_on_on =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_macsec_offload_on_result,
+                on, "on");
+cmdline_parse_token_string_t cmd_macsec_offload_on_encrypt =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_macsec_offload_on_result,
+                encrypt, "encrypt");
+cmdline_parse_token_string_t cmd_macsec_offload_on_en_on_off =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_macsec_offload_on_result,
+                en_on_off, "on#off");
+cmdline_parse_token_string_t cmd_macsec_offload_on_replay_protect =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_macsec_offload_on_result,
+                replay_protect, "replay-protect");
+cmdline_parse_token_string_t cmd_macsec_offload_on_rp_on_off =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_macsec_offload_on_result,
+                rp_on_off, "on#off");
+
+static void
+cmd_set_macsec_offload_on_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_macsec_offload_on_result *res = parsed_result;
+       int ret = -ENOTSUP;
+       portid_t port_id = res->port_id;
+       int en = (strcmp(res->en_on_off, "on") == 0) ? 1 : 0;
+       int rp = (strcmp(res->rp_on_off, "on") == 0) ? 1 : 0;
+       struct rte_eth_dev_info dev_info;
+
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
+               return;
+       if (!port_is_stopped(port_id)) {
+               printf("Please stop port %d first\n", port_id);
+               return;
+       }
+
+       rte_eth_dev_info_get(port_id, &dev_info);
+       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MACSEC_INSERT) {
+#ifdef RTE_LIBRTE_IXGBE_PMD
+               ret = rte_pmd_ixgbe_macsec_enable(port_id, en, rp);
+#endif
+       }
+       RTE_SET_USED(en);
+       RTE_SET_USED(rp);
+
+       switch (ret) {
+       case 0:
+               ports[port_id].dev_conf.txmode.offloads |=
+                                               DEV_TX_OFFLOAD_MACSEC_INSERT;
+               cmd_reconfig_device_queue(port_id, 1, 1);
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", port_id);
+               break;
+       case -ENOTSUP:
+               printf("not supported on port %d\n", port_id);
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_inst_t cmd_set_macsec_offload_on = {
+       .f = cmd_set_macsec_offload_on_parsed,
+       .data = NULL,
+       .help_str = "set macsec offload <port_id> on "
+               "encrypt on|off replay-protect on|off",
+       .tokens = {
+               (void *)&cmd_macsec_offload_on_set,
+               (void *)&cmd_macsec_offload_on_macsec,
+               (void *)&cmd_macsec_offload_on_offload,
+               (void *)&cmd_macsec_offload_on_port_id,
+               (void *)&cmd_macsec_offload_on_on,
+               (void *)&cmd_macsec_offload_on_encrypt,
+               (void *)&cmd_macsec_offload_on_en_on_off,
+               (void *)&cmd_macsec_offload_on_replay_protect,
+               (void *)&cmd_macsec_offload_on_rp_on_off,
+               NULL,
+       },
+};
+
+/* Common result structure for MACsec offload disable */
+struct cmd_macsec_offload_off_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t macsec;
+       cmdline_fixed_string_t offload;
+       portid_t port_id;
+       cmdline_fixed_string_t off;
+};
+
+/* Common CLI fields for MACsec offload disable */
+cmdline_parse_token_string_t cmd_macsec_offload_off_set =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_macsec_offload_off_result,
+                set, "set");
+cmdline_parse_token_string_t cmd_macsec_offload_off_macsec =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_macsec_offload_off_result,
+                macsec, "macsec");
+cmdline_parse_token_string_t cmd_macsec_offload_off_offload =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_macsec_offload_off_result,
+                offload, "offload");
+cmdline_parse_token_num_t cmd_macsec_offload_off_port_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_macsec_offload_off_result,
+                port_id, UINT16);
+cmdline_parse_token_string_t cmd_macsec_offload_off_off =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_macsec_offload_off_result,
+                off, "off");
+
+static void
+cmd_set_macsec_offload_off_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_macsec_offload_off_result *res = parsed_result;
+       int ret = -ENOTSUP;
+       struct rte_eth_dev_info dev_info;
+       portid_t port_id = res->port_id;
+
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
+               return;
+       if (!port_is_stopped(port_id)) {
+               printf("Please stop port %d first\n", port_id);
+               return;
+       }
+
+       rte_eth_dev_info_get(port_id, &dev_info);
+       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MACSEC_INSERT) {
+#ifdef RTE_LIBRTE_IXGBE_PMD
+               ret = rte_pmd_ixgbe_macsec_disable(port_id);
+#endif
+       }
+       switch (ret) {
+       case 0:
+               ports[port_id].dev_conf.txmode.offloads &=
+                                               ~DEV_TX_OFFLOAD_MACSEC_INSERT;
+               cmd_reconfig_device_queue(port_id, 1, 1);
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", port_id);
+               break;
+       case -ENOTSUP:
+               printf("not supported on port %d\n", port_id);
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_inst_t cmd_set_macsec_offload_off = {
+       .f = cmd_set_macsec_offload_off_parsed,
+       .data = NULL,
+       .help_str = "set macsec offload <port_id> off",
+       .tokens = {
+               (void *)&cmd_macsec_offload_off_set,
+               (void *)&cmd_macsec_offload_off_macsec,
+               (void *)&cmd_macsec_offload_off_offload,
+               (void *)&cmd_macsec_offload_off_port_id,
+               (void *)&cmd_macsec_offload_off_off,
+               NULL,
+       },
+};
+
+/* Common result structure for MACsec secure connection configure */
+struct cmd_macsec_sc_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t macsec;
+       cmdline_fixed_string_t sc;
+       cmdline_fixed_string_t tx_rx;
+       portid_t port_id;
+       struct ether_addr mac;
+       uint16_t pi;
+};
+
+/* Common CLI fields for MACsec secure connection configure */
+cmdline_parse_token_string_t cmd_macsec_sc_set =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_macsec_sc_result,
+                set, "set");
+cmdline_parse_token_string_t cmd_macsec_sc_macsec =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_macsec_sc_result,
+                macsec, "macsec");
+cmdline_parse_token_string_t cmd_macsec_sc_sc =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_macsec_sc_result,
+                sc, "sc");
+cmdline_parse_token_string_t cmd_macsec_sc_tx_rx =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_macsec_sc_result,
+                tx_rx, "tx#rx");
+cmdline_parse_token_num_t cmd_macsec_sc_port_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_macsec_sc_result,
+                port_id, UINT16);
+cmdline_parse_token_etheraddr_t cmd_macsec_sc_mac =
+       TOKEN_ETHERADDR_INITIALIZER
+               (struct cmd_macsec_sc_result,
+                mac);
+cmdline_parse_token_num_t cmd_macsec_sc_pi =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_macsec_sc_result,
+                pi, UINT16);
+
+static void
+cmd_set_macsec_sc_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_macsec_sc_result *res = parsed_result;
+       int ret = -ENOTSUP;
+       int is_tx = (strcmp(res->tx_rx, "tx") == 0) ? 1 : 0;
+
+#ifdef RTE_LIBRTE_IXGBE_PMD
+       ret = is_tx ?
+               rte_pmd_ixgbe_macsec_config_txsc(res->port_id,
+                               res->mac.addr_bytes) :
+               rte_pmd_ixgbe_macsec_config_rxsc(res->port_id,
+                               res->mac.addr_bytes, res->pi);
+#endif
+       RTE_SET_USED(is_tx);
+
+       switch (ret) {
+       case 0:
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               break;
+       case -ENOTSUP:
+               printf("not supported on port %d\n", res->port_id);
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_inst_t cmd_set_macsec_sc = {
+       .f = cmd_set_macsec_sc_parsed,
+       .data = NULL,
+       .help_str = "set macsec sc tx|rx <port_id> <mac> <pi>",
+       .tokens = {
+               (void *)&cmd_macsec_sc_set,
+               (void *)&cmd_macsec_sc_macsec,
+               (void *)&cmd_macsec_sc_sc,
+               (void *)&cmd_macsec_sc_tx_rx,
+               (void *)&cmd_macsec_sc_port_id,
+               (void *)&cmd_macsec_sc_mac,
+               (void *)&cmd_macsec_sc_pi,
+               NULL,
+       },
+};
+
+/* Common result structure for MACsec secure connection configure */
+struct cmd_macsec_sa_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t macsec;
+       cmdline_fixed_string_t sa;
+       cmdline_fixed_string_t tx_rx;
+       portid_t port_id;
+       uint8_t idx;
+       uint8_t an;
+       uint32_t pn;
+       cmdline_fixed_string_t key;
+};
+
+/* Common CLI fields for MACsec secure connection configure */
+cmdline_parse_token_string_t cmd_macsec_sa_set =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_macsec_sa_result,
+                set, "set");
+cmdline_parse_token_string_t cmd_macsec_sa_macsec =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_macsec_sa_result,
+                macsec, "macsec");
+cmdline_parse_token_string_t cmd_macsec_sa_sa =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_macsec_sa_result,
+                sa, "sa");
+cmdline_parse_token_string_t cmd_macsec_sa_tx_rx =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_macsec_sa_result,
+                tx_rx, "tx#rx");
+cmdline_parse_token_num_t cmd_macsec_sa_port_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_macsec_sa_result,
+                port_id, UINT16);
+cmdline_parse_token_num_t cmd_macsec_sa_idx =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_macsec_sa_result,
+                idx, UINT8);
+cmdline_parse_token_num_t cmd_macsec_sa_an =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_macsec_sa_result,
+                an, UINT8);
+cmdline_parse_token_num_t cmd_macsec_sa_pn =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_macsec_sa_result,
+                pn, UINT32);
+cmdline_parse_token_string_t cmd_macsec_sa_key =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_macsec_sa_result,
+                key, NULL);
+
+static void
+cmd_set_macsec_sa_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_macsec_sa_result *res = parsed_result;
+       int ret = -ENOTSUP;
+       int is_tx = (strcmp(res->tx_rx, "tx") == 0) ? 1 : 0;
+       uint8_t key[16] = { 0 };
+       uint8_t xdgt0;
+       uint8_t xdgt1;
+       int key_len;
+       int i;
+
+       key_len = strlen(res->key) / 2;
+       if (key_len > 16)
+               key_len = 16;
+
+       for (i = 0; i < key_len; i++) {
+               xdgt0 = parse_and_check_key_hexa_digit(res->key, (i * 2));
+               if (xdgt0 == 0xFF)
+                       return;
+               xdgt1 = parse_and_check_key_hexa_digit(res->key, (i * 2) + 1);
+               if (xdgt1 == 0xFF)
+                       return;
+               key[i] = (uint8_t) ((xdgt0 * 16) + xdgt1);
+       }
+
+#ifdef RTE_LIBRTE_IXGBE_PMD
+       ret = is_tx ?
+               rte_pmd_ixgbe_macsec_select_txsa(res->port_id,
+                       res->idx, res->an, res->pn, key) :
+               rte_pmd_ixgbe_macsec_select_rxsa(res->port_id,
+                       res->idx, res->an, res->pn, key);
+#endif
+       RTE_SET_USED(is_tx);
+       RTE_SET_USED(key);
+
+       switch (ret) {
+       case 0:
+               break;
+       case -EINVAL:
+               printf("invalid idx %d or an %d\n", res->idx, res->an);
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               break;
+       case -ENOTSUP:
+               printf("not supported on port %d\n", res->port_id);
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_inst_t cmd_set_macsec_sa = {
+       .f = cmd_set_macsec_sa_parsed,
+       .data = NULL,
+       .help_str = "set macsec sa tx|rx <port_id> <idx> <an> <pn> <key>",
+       .tokens = {
+               (void *)&cmd_macsec_sa_set,
+               (void *)&cmd_macsec_sa_macsec,
+               (void *)&cmd_macsec_sa_sa,
+               (void *)&cmd_macsec_sa_tx_rx,
+               (void *)&cmd_macsec_sa_port_id,
+               (void *)&cmd_macsec_sa_idx,
+               (void *)&cmd_macsec_sa_an,
+               (void *)&cmd_macsec_sa_pn,
+               (void *)&cmd_macsec_sa_key,
+               NULL,
+       },
+};
+
+/* VF unicast promiscuous mode configuration */
+
+/* Common result structure for VF unicast promiscuous mode */
+struct cmd_vf_promisc_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t vf;
+       cmdline_fixed_string_t promisc;
+       portid_t port_id;
+       uint32_t vf_id;
+       cmdline_fixed_string_t on_off;
+};
+
+/* Common CLI fields for VF unicast promiscuous mode enable disable */
+cmdline_parse_token_string_t cmd_vf_promisc_set =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_promisc_result,
+                set, "set");
+cmdline_parse_token_string_t cmd_vf_promisc_vf =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_promisc_result,
+                vf, "vf");
+cmdline_parse_token_string_t cmd_vf_promisc_promisc =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_promisc_result,
+                promisc, "promisc");
+cmdline_parse_token_num_t cmd_vf_promisc_port_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_vf_promisc_result,
+                port_id, UINT16);
+cmdline_parse_token_num_t cmd_vf_promisc_vf_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_vf_promisc_result,
+                vf_id, UINT32);
+cmdline_parse_token_string_t cmd_vf_promisc_on_off =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_promisc_result,
+                on_off, "on#off");
+
+static void
+cmd_set_vf_promisc_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_vf_promisc_result *res = parsed_result;
+       int ret = -ENOTSUP;
+
+       __rte_unused int is_on = (strcmp(res->on_off, "on") == 0) ? 1 : 0;
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       ret = rte_pmd_i40e_set_vf_unicast_promisc(res->port_id,
+                                                 res->vf_id, is_on);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -EINVAL:
+               printf("invalid vf_id %d\n", res->vf_id);
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               break;
+       case -ENOTSUP:
+               printf("function not implemented\n");
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_inst_t cmd_set_vf_promisc = {
+       .f = cmd_set_vf_promisc_parsed,
+       .data = NULL,
+       .help_str = "set vf promisc <port_id> <vf_id> on|off: "
+               "Set unicast promiscuous mode for a VF from the PF",
+       .tokens = {
+               (void *)&cmd_vf_promisc_set,
+               (void *)&cmd_vf_promisc_vf,
+               (void *)&cmd_vf_promisc_promisc,
+               (void *)&cmd_vf_promisc_port_id,
+               (void *)&cmd_vf_promisc_vf_id,
+               (void *)&cmd_vf_promisc_on_off,
+               NULL,
+       },
+};
+
+/* VF multicast promiscuous mode configuration */
+
+/* Common result structure for VF multicast promiscuous mode */
+struct cmd_vf_allmulti_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t vf;
+       cmdline_fixed_string_t allmulti;
+       portid_t port_id;
+       uint32_t vf_id;
+       cmdline_fixed_string_t on_off;
+};
+
+/* Common CLI fields for VF multicast promiscuous mode enable disable */
+cmdline_parse_token_string_t cmd_vf_allmulti_set =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_allmulti_result,
+                set, "set");
+cmdline_parse_token_string_t cmd_vf_allmulti_vf =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_allmulti_result,
+                vf, "vf");
+cmdline_parse_token_string_t cmd_vf_allmulti_allmulti =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_allmulti_result,
+                allmulti, "allmulti");
+cmdline_parse_token_num_t cmd_vf_allmulti_port_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_vf_allmulti_result,
+                port_id, UINT16);
+cmdline_parse_token_num_t cmd_vf_allmulti_vf_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_vf_allmulti_result,
+                vf_id, UINT32);
+cmdline_parse_token_string_t cmd_vf_allmulti_on_off =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_allmulti_result,
+                on_off, "on#off");
+
+static void
+cmd_set_vf_allmulti_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_vf_allmulti_result *res = parsed_result;
+       int ret = -ENOTSUP;
+
+       __rte_unused int is_on = (strcmp(res->on_off, "on") == 0) ? 1 : 0;
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       ret = rte_pmd_i40e_set_vf_multicast_promisc(res->port_id,
+                                                   res->vf_id, is_on);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -EINVAL:
+               printf("invalid vf_id %d\n", res->vf_id);
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               break;
+       case -ENOTSUP:
+               printf("function not implemented\n");
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_inst_t cmd_set_vf_allmulti = {
+       .f = cmd_set_vf_allmulti_parsed,
+       .data = NULL,
+       .help_str = "set vf allmulti <port_id> <vf_id> on|off: "
+               "Set multicast promiscuous mode for a VF from the PF",
+       .tokens = {
+               (void *)&cmd_vf_allmulti_set,
+               (void *)&cmd_vf_allmulti_vf,
+               (void *)&cmd_vf_allmulti_allmulti,
+               (void *)&cmd_vf_allmulti_port_id,
+               (void *)&cmd_vf_allmulti_vf_id,
+               (void *)&cmd_vf_allmulti_on_off,
+               NULL,
+       },
+};
+
+/* vf broadcast mode configuration */
+
+/* Common result structure for vf broadcast */
+struct cmd_set_vf_broadcast_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t vf;
+       cmdline_fixed_string_t broadcast;
+       portid_t port_id;
+       uint16_t vf_id;
+       cmdline_fixed_string_t on_off;
+};
+
+/* Common CLI fields for vf broadcast enable disable */
+cmdline_parse_token_string_t cmd_set_vf_broadcast_set =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_set_vf_broadcast_result,
+                set, "set");
+cmdline_parse_token_string_t cmd_set_vf_broadcast_vf =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_set_vf_broadcast_result,
+                vf, "vf");
+cmdline_parse_token_string_t cmd_set_vf_broadcast_broadcast =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_set_vf_broadcast_result,
+                broadcast, "broadcast");
+cmdline_parse_token_num_t cmd_set_vf_broadcast_port_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_set_vf_broadcast_result,
+                port_id, UINT16);
+cmdline_parse_token_num_t cmd_set_vf_broadcast_vf_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_set_vf_broadcast_result,
+                vf_id, UINT16);
+cmdline_parse_token_string_t cmd_set_vf_broadcast_on_off =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_set_vf_broadcast_result,
+                on_off, "on#off");
+
+static void
+cmd_set_vf_broadcast_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_set_vf_broadcast_result *res = parsed_result;
+       int ret = -ENOTSUP;
+
+       __rte_unused int is_on = (strcmp(res->on_off, "on") == 0) ? 1 : 0;
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       ret = rte_pmd_i40e_set_vf_broadcast(res->port_id,
+                                           res->vf_id, is_on);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -EINVAL:
+               printf("invalid vf_id %d or is_on %d\n", res->vf_id, is_on);
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               break;
+       case -ENOTSUP:
+               printf("function not implemented\n");
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_inst_t cmd_set_vf_broadcast = {
+       .f = cmd_set_vf_broadcast_parsed,
+       .data = NULL,
+       .help_str = "set vf broadcast <port_id> <vf_id> on|off",
+       .tokens = {
+               (void *)&cmd_set_vf_broadcast_set,
+               (void *)&cmd_set_vf_broadcast_vf,
+               (void *)&cmd_set_vf_broadcast_broadcast,
+               (void *)&cmd_set_vf_broadcast_port_id,
+               (void *)&cmd_set_vf_broadcast_vf_id,
+               (void *)&cmd_set_vf_broadcast_on_off,
+               NULL,
+       },
+};
+
+/* vf vlan tag configuration */
+
+/* Common result structure for vf vlan tag */
+struct cmd_set_vf_vlan_tag_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t vf;
+       cmdline_fixed_string_t vlan;
+       cmdline_fixed_string_t tag;
+       portid_t port_id;
+       uint16_t vf_id;
+       cmdline_fixed_string_t on_off;
+};
+
+/* Common CLI fields for vf vlan tag enable disable */
+cmdline_parse_token_string_t cmd_set_vf_vlan_tag_set =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_set_vf_vlan_tag_result,
+                set, "set");
+cmdline_parse_token_string_t cmd_set_vf_vlan_tag_vf =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_set_vf_vlan_tag_result,
+                vf, "vf");
+cmdline_parse_token_string_t cmd_set_vf_vlan_tag_vlan =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_set_vf_vlan_tag_result,
+                vlan, "vlan");
+cmdline_parse_token_string_t cmd_set_vf_vlan_tag_tag =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_set_vf_vlan_tag_result,
+                tag, "tag");
+cmdline_parse_token_num_t cmd_set_vf_vlan_tag_port_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_set_vf_vlan_tag_result,
+                port_id, UINT16);
+cmdline_parse_token_num_t cmd_set_vf_vlan_tag_vf_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_set_vf_vlan_tag_result,
+                vf_id, UINT16);
+cmdline_parse_token_string_t cmd_set_vf_vlan_tag_on_off =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_set_vf_vlan_tag_result,
+                on_off, "on#off");
+
+static void
+cmd_set_vf_vlan_tag_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_set_vf_vlan_tag_result *res = parsed_result;
+       int ret = -ENOTSUP;
+
+       __rte_unused int is_on = (strcmp(res->on_off, "on") == 0) ? 1 : 0;
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       ret = rte_pmd_i40e_set_vf_vlan_tag(res->port_id,
+                                          res->vf_id, is_on);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -EINVAL:
+               printf("invalid vf_id %d or is_on %d\n", res->vf_id, is_on);
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               break;
+       case -ENOTSUP:
+               printf("function not implemented\n");
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_inst_t cmd_set_vf_vlan_tag = {
+       .f = cmd_set_vf_vlan_tag_parsed,
+       .data = NULL,
+       .help_str = "set vf vlan tag <port_id> <vf_id> on|off",
+       .tokens = {
+               (void *)&cmd_set_vf_vlan_tag_set,
+               (void *)&cmd_set_vf_vlan_tag_vf,
+               (void *)&cmd_set_vf_vlan_tag_vlan,
+               (void *)&cmd_set_vf_vlan_tag_tag,
+               (void *)&cmd_set_vf_vlan_tag_port_id,
+               (void *)&cmd_set_vf_vlan_tag_vf_id,
+               (void *)&cmd_set_vf_vlan_tag_on_off,
+               NULL,
+       },
+};
+
+/* Common definition of VF and TC TX bandwidth configuration */
+struct cmd_vf_tc_bw_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t vf;
+       cmdline_fixed_string_t tc;
+       cmdline_fixed_string_t tx;
+       cmdline_fixed_string_t min_bw;
+       cmdline_fixed_string_t max_bw;
+       cmdline_fixed_string_t strict_link_prio;
+       portid_t port_id;
+       uint16_t vf_id;
+       uint8_t tc_no;
+       uint32_t bw;
+       cmdline_fixed_string_t bw_list;
+       uint8_t tc_map;
+};
+
+cmdline_parse_token_string_t cmd_vf_tc_bw_set =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_tc_bw_result,
+                set, "set");
+cmdline_parse_token_string_t cmd_vf_tc_bw_vf =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_tc_bw_result,
+                vf, "vf");
+cmdline_parse_token_string_t cmd_vf_tc_bw_tc =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_tc_bw_result,
+                tc, "tc");
+cmdline_parse_token_string_t cmd_vf_tc_bw_tx =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_tc_bw_result,
+                tx, "tx");
+cmdline_parse_token_string_t cmd_vf_tc_bw_strict_link_prio =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_tc_bw_result,
+                strict_link_prio, "strict-link-priority");
+cmdline_parse_token_string_t cmd_vf_tc_bw_min_bw =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_tc_bw_result,
+                min_bw, "min-bandwidth");
+cmdline_parse_token_string_t cmd_vf_tc_bw_max_bw =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_tc_bw_result,
+                max_bw, "max-bandwidth");
+cmdline_parse_token_num_t cmd_vf_tc_bw_port_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_vf_tc_bw_result,
+                port_id, UINT16);
+cmdline_parse_token_num_t cmd_vf_tc_bw_vf_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_vf_tc_bw_result,
+                vf_id, UINT16);
+cmdline_parse_token_num_t cmd_vf_tc_bw_tc_no =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_vf_tc_bw_result,
+                tc_no, UINT8);
+cmdline_parse_token_num_t cmd_vf_tc_bw_bw =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_vf_tc_bw_result,
+                bw, UINT32);
+cmdline_parse_token_string_t cmd_vf_tc_bw_bw_list =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_vf_tc_bw_result,
+                bw_list, NULL);
+cmdline_parse_token_num_t cmd_vf_tc_bw_tc_map =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_vf_tc_bw_result,
+                tc_map, UINT8);
+
+/* VF max bandwidth setting */
+static void
+cmd_vf_max_bw_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_vf_tc_bw_result *res = parsed_result;
+       int ret = -ENOTSUP;
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       ret = rte_pmd_i40e_set_vf_max_bw(res->port_id,
+                                        res->vf_id, res->bw);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -EINVAL:
+               printf("invalid vf_id %d or bandwidth %d\n",
+                      res->vf_id, res->bw);
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               break;
+       case -ENOTSUP:
+               printf("function not implemented\n");
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_inst_t cmd_vf_max_bw = {
+       .f = cmd_vf_max_bw_parsed,
+       .data = NULL,
+       .help_str = "set vf tx max-bandwidth <port_id> <vf_id> <bandwidth>",
+       .tokens = {
+               (void *)&cmd_vf_tc_bw_set,
+               (void *)&cmd_vf_tc_bw_vf,
+               (void *)&cmd_vf_tc_bw_tx,
+               (void *)&cmd_vf_tc_bw_max_bw,
+               (void *)&cmd_vf_tc_bw_port_id,
+               (void *)&cmd_vf_tc_bw_vf_id,
+               (void *)&cmd_vf_tc_bw_bw,
+               NULL,
+       },
+};
+
+static int
+vf_tc_min_bw_parse_bw_list(uint8_t *bw_list,
+                          uint8_t *tc_num,
+                          char *str)
+{
+       uint32_t size;
+       const char *p, *p0 = str;
+       char s[256];
+       char *end;
+       char *str_fld[16];
+       uint16_t i;
+       int ret;
+
+       p = strchr(p0, '(');
+       if (p == NULL) {
+               printf("The bandwidth-list should be '(bw1, bw2, ...)'\n");
+               return -1;
+       }
+       p++;
+       p0 = strchr(p, ')');
+       if (p0 == NULL) {
+               printf("The bandwidth-list should be '(bw1, bw2, ...)'\n");
+               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, 16, ',');
+       if (ret <= 0) {
+               printf("Failed to get the bandwidth list. ");
+               return -1;
+       }
+       *tc_num = ret;
+       for (i = 0; i < ret; i++)
+               bw_list[i] = (uint8_t)strtoul(str_fld[i], &end, 0);
+
+       return 0;
+}
+
+/* TC min bandwidth setting */
+static void
+cmd_vf_tc_min_bw_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_vf_tc_bw_result *res = parsed_result;
+       uint8_t tc_num;
+       uint8_t bw[16];
+       int ret = -ENOTSUP;
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+       ret = vf_tc_min_bw_parse_bw_list(bw, &tc_num, res->bw_list);
+       if (ret)
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       ret = rte_pmd_i40e_set_vf_tc_bw_alloc(res->port_id, res->vf_id,
+                                             tc_num, bw);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -EINVAL:
+               printf("invalid vf_id %d or bandwidth\n", res->vf_id);
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               break;
+       case -ENOTSUP:
+               printf("function not implemented\n");
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_inst_t cmd_vf_tc_min_bw = {
+       .f = cmd_vf_tc_min_bw_parsed,
+       .data = NULL,
+       .help_str = "set vf tc tx min-bandwidth <port_id> <vf_id>"
+                   " <bw1, bw2, ...>",
+       .tokens = {
+               (void *)&cmd_vf_tc_bw_set,
+               (void *)&cmd_vf_tc_bw_vf,
+               (void *)&cmd_vf_tc_bw_tc,
+               (void *)&cmd_vf_tc_bw_tx,
+               (void *)&cmd_vf_tc_bw_min_bw,
+               (void *)&cmd_vf_tc_bw_port_id,
+               (void *)&cmd_vf_tc_bw_vf_id,
+               (void *)&cmd_vf_tc_bw_bw_list,
+               NULL,
+       },
+};
+
+static void
+cmd_tc_min_bw_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_vf_tc_bw_result *res = parsed_result;
+       struct rte_port *port;
+       uint8_t tc_num;
+       uint8_t bw[16];
+       int ret = -ENOTSUP;
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               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;
+       }
+
+       ret = vf_tc_min_bw_parse_bw_list(bw, &tc_num, res->bw_list);
+       if (ret)
+               return;
+
+#ifdef RTE_LIBRTE_IXGBE_PMD
+       ret = rte_pmd_ixgbe_set_tc_bw_alloc(res->port_id, tc_num, bw);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -EINVAL:
+               printf("invalid bandwidth\n");
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               break;
+       case -ENOTSUP:
+               printf("function not implemented\n");
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_inst_t cmd_tc_min_bw = {
+       .f = cmd_tc_min_bw_parsed,
+       .data = NULL,
+       .help_str = "set tc tx min-bandwidth <port_id> <bw1, bw2, ...>",
+       .tokens = {
+               (void *)&cmd_vf_tc_bw_set,
+               (void *)&cmd_vf_tc_bw_tc,
+               (void *)&cmd_vf_tc_bw_tx,
+               (void *)&cmd_vf_tc_bw_min_bw,
+               (void *)&cmd_vf_tc_bw_port_id,
+               (void *)&cmd_vf_tc_bw_bw_list,
+               NULL,
+       },
+};
+
+/* TC max bandwidth setting */
+static void
+cmd_vf_tc_max_bw_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_vf_tc_bw_result *res = parsed_result;
+       int ret = -ENOTSUP;
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       ret = rte_pmd_i40e_set_vf_tc_max_bw(res->port_id, res->vf_id,
+                                           res->tc_no, res->bw);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -EINVAL:
+               printf("invalid vf_id %d, tc_no %d or bandwidth %d\n",
+                      res->vf_id, res->tc_no, res->bw);
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               break;
+       case -ENOTSUP:
+               printf("function not implemented\n");
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_inst_t cmd_vf_tc_max_bw = {
+       .f = cmd_vf_tc_max_bw_parsed,
+       .data = NULL,
+       .help_str = "set vf tc tx max-bandwidth <port_id> <vf_id> <tc_no>"
+                   " <bandwidth>",
+       .tokens = {
+               (void *)&cmd_vf_tc_bw_set,
+               (void *)&cmd_vf_tc_bw_vf,
+               (void *)&cmd_vf_tc_bw_tc,
+               (void *)&cmd_vf_tc_bw_tx,
+               (void *)&cmd_vf_tc_bw_max_bw,
+               (void *)&cmd_vf_tc_bw_port_id,
+               (void *)&cmd_vf_tc_bw_vf_id,
+               (void *)&cmd_vf_tc_bw_tc_no,
+               (void *)&cmd_vf_tc_bw_bw,
+               NULL,
+       },
+};
+
+
+#if defined RTE_LIBRTE_PMD_SOFTNIC && defined RTE_LIBRTE_SCHED
+
+/* *** Set Port default Traffic Management Hierarchy *** */
+struct cmd_set_port_tm_hierarchy_default_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t port;
+       cmdline_fixed_string_t tm;
+       cmdline_fixed_string_t hierarchy;
+       cmdline_fixed_string_t def;
+       portid_t port_id;
+};
+
+cmdline_parse_token_string_t cmd_set_port_tm_hierarchy_default_set =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_set_port_tm_hierarchy_default_result, set, "set");
+cmdline_parse_token_string_t cmd_set_port_tm_hierarchy_default_port =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_set_port_tm_hierarchy_default_result, port, "port");
+cmdline_parse_token_string_t cmd_set_port_tm_hierarchy_default_tm =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_set_port_tm_hierarchy_default_result, tm, "tm");
+cmdline_parse_token_string_t cmd_set_port_tm_hierarchy_default_hierarchy =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_set_port_tm_hierarchy_default_result,
+                       hierarchy, "hierarchy");
+cmdline_parse_token_string_t cmd_set_port_tm_hierarchy_default_default =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_set_port_tm_hierarchy_default_result,
+                       def, "default");
+cmdline_parse_token_num_t cmd_set_port_tm_hierarchy_default_port_id =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_set_port_tm_hierarchy_default_result,
+                       port_id, UINT16);
+
+static void cmd_set_port_tm_hierarchy_default_parsed(void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_set_port_tm_hierarchy_default_result *res = parsed_result;
+       struct rte_port *p;
+       portid_t port_id = res->port_id;
+
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
+               return;
+
+       p = &ports[port_id];
+
+       /* Port tm flag */
+       if (p->softport.tm_flag == 0) {
+               printf("  tm not enabled on port %u (error)\n", port_id);
+               return;
+       }
+
+       /* Forward mode: tm */
+       if (strcmp(cur_fwd_config.fwd_eng->fwd_mode_name, "tm")) {
+               printf("  tm mode not enabled(error)\n");
+               return;
+       }
+
+       /* Set the default tm hierarchy */
+       p->softport.tm.default_hierarchy_enable = 1;
+}
+
+cmdline_parse_inst_t cmd_set_port_tm_hierarchy_default = {
+       .f = cmd_set_port_tm_hierarchy_default_parsed,
+       .data = NULL,
+       .help_str = "set port tm hierarchy default <port_id>",
+       .tokens = {
+               (void *)&cmd_set_port_tm_hierarchy_default_set,
+               (void *)&cmd_set_port_tm_hierarchy_default_port,
+               (void *)&cmd_set_port_tm_hierarchy_default_tm,
+               (void *)&cmd_set_port_tm_hierarchy_default_hierarchy,
+               (void *)&cmd_set_port_tm_hierarchy_default_default,
+               (void *)&cmd_set_port_tm_hierarchy_default_port_id,
+               NULL,
+       },
+};
+#endif
+
+/* Strict link priority scheduling mode setting */
+static void
+cmd_strict_link_prio_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_vf_tc_bw_result *res = parsed_result;
+       int ret = -ENOTSUP;
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       ret = rte_pmd_i40e_set_tc_strict_prio(res->port_id, res->tc_map);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -EINVAL:
+               printf("invalid tc_bitmap 0x%x\n", res->tc_map);
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               break;
+       case -ENOTSUP:
+               printf("function not implemented\n");
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_inst_t cmd_strict_link_prio = {
+       .f = cmd_strict_link_prio_parsed,
+       .data = NULL,
+       .help_str = "set tx strict-link-priority <port_id> <tc_bitmap>",
+       .tokens = {
+               (void *)&cmd_vf_tc_bw_set,
+               (void *)&cmd_vf_tc_bw_tx,
+               (void *)&cmd_vf_tc_bw_strict_link_prio,
+               (void *)&cmd_vf_tc_bw_port_id,
+               (void *)&cmd_vf_tc_bw_tc_map,
+               NULL,
+       },
+};
+
+/* Load dynamic device personalization*/
+struct cmd_ddp_add_result {
+       cmdline_fixed_string_t ddp;
+       cmdline_fixed_string_t add;
+       portid_t port_id;
+       char filepath[];
+};
+
+cmdline_parse_token_string_t cmd_ddp_add_ddp =
+       TOKEN_STRING_INITIALIZER(struct cmd_ddp_add_result, ddp, "ddp");
+cmdline_parse_token_string_t cmd_ddp_add_add =
+       TOKEN_STRING_INITIALIZER(struct cmd_ddp_add_result, add, "add");
+cmdline_parse_token_num_t cmd_ddp_add_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_ddp_add_result, port_id, UINT16);
+cmdline_parse_token_string_t cmd_ddp_add_filepath =
+       TOKEN_STRING_INITIALIZER(struct cmd_ddp_add_result, filepath, NULL);
+
+static void
+cmd_ddp_add_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_ddp_add_result *res = parsed_result;
+       uint8_t *buff;
+       uint32_t size;
+       char *filepath;
+       char *file_fld[2];
+       int file_num;
+       int ret = -ENOTSUP;
+
+       if (res->port_id > nb_ports) {
+               printf("Invalid port, range is [0, %d]\n", nb_ports - 1);
+               return;
+       }
+
+       if (!all_ports_stopped()) {
+               printf("Please stop all ports first\n");
+               return;
+       }
+
+       filepath = strdup(res->filepath);
+       if (filepath == NULL) {
+               printf("Failed to allocate memory\n");
+               return;
+       }
+       file_num = rte_strsplit(filepath, strlen(filepath), file_fld, 2, ',');
+
+       buff = open_file(file_fld[0], &size);
+       if (!buff) {
+               free((void *)filepath);
+               return;
+       }
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_i40e_process_ddp_package(res->port_id,
+                                              buff, size,
+                                              RTE_PMD_I40E_PKG_OP_WR_ADD);
+#endif
+
+       if (ret == -EEXIST)
+               printf("Profile has already existed.\n");
+       else if (ret < 0)
+               printf("Failed to load profile.\n");
+       else if (file_num == 2)
+               save_file(file_fld[1], buff, size);
+
+       close_file(buff);
+       free((void *)filepath);
+}
+
+cmdline_parse_inst_t cmd_ddp_add = {
+       .f = cmd_ddp_add_parsed,
+       .data = NULL,
+       .help_str = "ddp add <port_id> <profile_path[,backup_profile_path]>",
+       .tokens = {
+               (void *)&cmd_ddp_add_ddp,
+               (void *)&cmd_ddp_add_add,
+               (void *)&cmd_ddp_add_port_id,
+               (void *)&cmd_ddp_add_filepath,
+               NULL,
+       },
+};
+
+/* Delete dynamic device personalization*/
+struct cmd_ddp_del_result {
+       cmdline_fixed_string_t ddp;
+       cmdline_fixed_string_t del;
+       portid_t port_id;
+       char filepath[];
+};
+
+cmdline_parse_token_string_t cmd_ddp_del_ddp =
+       TOKEN_STRING_INITIALIZER(struct cmd_ddp_del_result, ddp, "ddp");
+cmdline_parse_token_string_t cmd_ddp_del_del =
+       TOKEN_STRING_INITIALIZER(struct cmd_ddp_del_result, del, "del");
+cmdline_parse_token_num_t cmd_ddp_del_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_ddp_del_result, port_id, UINT16);
+cmdline_parse_token_string_t cmd_ddp_del_filepath =
+       TOKEN_STRING_INITIALIZER(struct cmd_ddp_del_result, filepath, NULL);
+
+static void
+cmd_ddp_del_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_ddp_del_result *res = parsed_result;
+       uint8_t *buff;
+       uint32_t size;
+       int ret = -ENOTSUP;
+
+       if (res->port_id > nb_ports) {
+               printf("Invalid port, range is [0, %d]\n", nb_ports - 1);
+               return;
+       }
+
+       if (!all_ports_stopped()) {
+               printf("Please stop all ports first\n");
+               return;
+       }
+
+       buff = open_file(res->filepath, &size);
+       if (!buff)
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_i40e_process_ddp_package(res->port_id,
+                                              buff, size,
+                                              RTE_PMD_I40E_PKG_OP_WR_DEL);
+#endif
+
+       if (ret == -EACCES)
+               printf("Profile does not exist.\n");
+       else if (ret < 0)
+               printf("Failed to delete profile.\n");
+
+       close_file(buff);
+}
+
+cmdline_parse_inst_t cmd_ddp_del = {
+       .f = cmd_ddp_del_parsed,
+       .data = NULL,
+       .help_str = "ddp del <port_id> <backup_profile_path>",
+       .tokens = {
+               (void *)&cmd_ddp_del_ddp,
+               (void *)&cmd_ddp_del_del,
+               (void *)&cmd_ddp_del_port_id,
+               (void *)&cmd_ddp_del_filepath,
+               NULL,
+       },
+};
+
+/* Get dynamic device personalization profile info */
+struct cmd_ddp_info_result {
+       cmdline_fixed_string_t ddp;
+       cmdline_fixed_string_t get;
+       cmdline_fixed_string_t info;
+       char filepath[];
+};
+
+cmdline_parse_token_string_t cmd_ddp_info_ddp =
+       TOKEN_STRING_INITIALIZER(struct cmd_ddp_info_result, ddp, "ddp");
+cmdline_parse_token_string_t cmd_ddp_info_get =
+       TOKEN_STRING_INITIALIZER(struct cmd_ddp_info_result, get, "get");
+cmdline_parse_token_string_t cmd_ddp_info_info =
+       TOKEN_STRING_INITIALIZER(struct cmd_ddp_info_result, info, "info");
+cmdline_parse_token_string_t cmd_ddp_info_filepath =
+       TOKEN_STRING_INITIALIZER(struct cmd_ddp_info_result, filepath, NULL);
+
+static void
+cmd_ddp_info_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_ddp_info_result *res = parsed_result;
+       uint8_t *pkg;
+       uint32_t pkg_size;
+       int ret = -ENOTSUP;
+#ifdef RTE_LIBRTE_I40E_PMD
+       uint32_t i, j, n;
+       uint8_t *buff;
+       uint32_t buff_size = 0;
+       struct rte_pmd_i40e_profile_info info;
+       uint32_t dev_num = 0;
+       struct rte_pmd_i40e_ddp_device_id *devs;
+       uint32_t proto_num = 0;
+       struct rte_pmd_i40e_proto_info *proto = NULL;
+       uint32_t pctype_num = 0;
+       struct rte_pmd_i40e_ptype_info *pctype;
+       uint32_t ptype_num = 0;
+       struct rte_pmd_i40e_ptype_info *ptype;
+       uint8_t proto_id;
+
+#endif
+
+       pkg = open_file(res->filepath, &pkg_size);
+       if (!pkg)
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       ret = rte_pmd_i40e_get_ddp_info(pkg, pkg_size,
+                               (uint8_t *)&info, sizeof(info),
+                               RTE_PMD_I40E_PKG_INFO_GLOBAL_HEADER);
+       if (!ret) {
+               printf("Global Track id:       0x%x\n", info.track_id);
+               printf("Global Version:        %d.%d.%d.%d\n",
+                       info.version.major,
+                       info.version.minor,
+                       info.version.update,
+                       info.version.draft);
+               printf("Global Package name:   %s\n\n", info.name);
+       }
+
+       ret = rte_pmd_i40e_get_ddp_info(pkg, pkg_size,
+                               (uint8_t *)&info, sizeof(info),
+                               RTE_PMD_I40E_PKG_INFO_HEADER);
+       if (!ret) {
+               printf("i40e Profile Track id: 0x%x\n", info.track_id);
+               printf("i40e Profile Version:  %d.%d.%d.%d\n",
+                       info.version.major,
+                       info.version.minor,
+                       info.version.update,
+                       info.version.draft);
+               printf("i40e Profile name:     %s\n\n", info.name);
+       }
+
+       ret = rte_pmd_i40e_get_ddp_info(pkg, pkg_size,
+                               (uint8_t *)&buff_size, sizeof(buff_size),
+                               RTE_PMD_I40E_PKG_INFO_GLOBAL_NOTES_SIZE);
+       if (!ret && buff_size) {
+               buff = (uint8_t *)malloc(buff_size);
+               if (buff) {
+                       ret = rte_pmd_i40e_get_ddp_info(pkg, pkg_size,
+                                               buff, buff_size,
+                                               RTE_PMD_I40E_PKG_INFO_GLOBAL_NOTES);
+                       if (!ret)
+                               printf("Package Notes:\n%s\n\n", buff);
+                       free(buff);
+               }
+       }
+
+       ret = rte_pmd_i40e_get_ddp_info(pkg, pkg_size,
+                               (uint8_t *)&dev_num, sizeof(dev_num),
+                               RTE_PMD_I40E_PKG_INFO_DEVID_NUM);
+       if (!ret && dev_num) {
+               buff_size = dev_num * sizeof(struct rte_pmd_i40e_ddp_device_id);
+               devs = (struct rte_pmd_i40e_ddp_device_id *)malloc(buff_size);
+               if (devs) {
+                       ret = rte_pmd_i40e_get_ddp_info(pkg, pkg_size,
+                                               (uint8_t *)devs, buff_size,
+                                               RTE_PMD_I40E_PKG_INFO_DEVID_LIST);
+                       if (!ret) {
+                               printf("List of supported devices:\n");
+                               for (i = 0; i < dev_num; i++) {
+                                       printf("  %04X:%04X %04X:%04X\n",
+                                               devs[i].vendor_dev_id >> 16,
+                                               devs[i].vendor_dev_id & 0xFFFF,
+                                               devs[i].sub_vendor_dev_id >> 16,
+                                               devs[i].sub_vendor_dev_id & 0xFFFF);
+                               }
+                               printf("\n");
+                       }
+                       free(devs);
+               }
+       }
+
+       /* get information about protocols and packet types */
+       ret = rte_pmd_i40e_get_ddp_info(pkg, pkg_size,
+               (uint8_t *)&proto_num, sizeof(proto_num),
+               RTE_PMD_I40E_PKG_INFO_PROTOCOL_NUM);
+       if (ret || !proto_num)
+               goto no_print_return;
+
+       buff_size = proto_num * sizeof(struct rte_pmd_i40e_proto_info);
+       proto = (struct rte_pmd_i40e_proto_info *)malloc(buff_size);
+       if (!proto)
+               goto no_print_return;
+
+       ret = rte_pmd_i40e_get_ddp_info(pkg, pkg_size, (uint8_t *)proto,
+                                       buff_size,
+                                       RTE_PMD_I40E_PKG_INFO_PROTOCOL_LIST);
+       if (!ret) {
+               printf("List of used protocols:\n");
+               for (i = 0; i < proto_num; i++)
+                       printf("  %2u: %s\n", proto[i].proto_id,
+                              proto[i].name);
+               printf("\n");
+       }
+       ret = rte_pmd_i40e_get_ddp_info(pkg, pkg_size,
+               (uint8_t *)&pctype_num, sizeof(pctype_num),
+               RTE_PMD_I40E_PKG_INFO_PCTYPE_NUM);
+       if (ret || !pctype_num)
+               goto no_print_pctypes;
+
+       buff_size = pctype_num * sizeof(struct rte_pmd_i40e_ptype_info);
+       pctype = (struct rte_pmd_i40e_ptype_info *)malloc(buff_size);
+       if (!pctype)
+               goto no_print_pctypes;
+
+       ret = rte_pmd_i40e_get_ddp_info(pkg, pkg_size, (uint8_t *)pctype,
+                                       buff_size,
+                                       RTE_PMD_I40E_PKG_INFO_PCTYPE_LIST);
+       if (ret) {
+               free(pctype);
+               goto no_print_pctypes;
+       }
+
+       printf("List of defined packet classification types:\n");
+       for (i = 0; i < pctype_num; i++) {
+               printf("  %2u:", pctype[i].ptype_id);
+               for (j = 0; j < RTE_PMD_I40E_PROTO_NUM; j++) {
+                       proto_id = pctype[i].protocols[j];
+                       if (proto_id != RTE_PMD_I40E_PROTO_UNUSED) {
+                               for (n = 0; n < proto_num; n++) {
+                                       if (proto[n].proto_id == proto_id) {
+                                               printf(" %s", proto[n].name);
+                                               break;
+                                       }
+                               }
+                       }
+               }
+               printf("\n");
+       }
+       printf("\n");
+       free(pctype);
+
+no_print_pctypes:
+
+       ret = rte_pmd_i40e_get_ddp_info(pkg, pkg_size, (uint8_t *)&ptype_num,
+                                       sizeof(ptype_num),
+                                       RTE_PMD_I40E_PKG_INFO_PTYPE_NUM);
+       if (ret || !ptype_num)
+               goto no_print_return;
+
+       buff_size = ptype_num * sizeof(struct rte_pmd_i40e_ptype_info);
+       ptype = (struct rte_pmd_i40e_ptype_info *)malloc(buff_size);
+       if (!ptype)
+               goto no_print_return;
+
+       ret = rte_pmd_i40e_get_ddp_info(pkg, pkg_size, (uint8_t *)ptype,
+                                       buff_size,
+                                       RTE_PMD_I40E_PKG_INFO_PTYPE_LIST);
+       if (ret) {
+               free(ptype);
+               goto no_print_return;
+       }
+       printf("List of defined packet types:\n");
+       for (i = 0; i < ptype_num; i++) {
+               printf("  %2u:", ptype[i].ptype_id);
+               for (j = 0; j < RTE_PMD_I40E_PROTO_NUM; j++) {
+                       proto_id = ptype[i].protocols[j];
+                       if (proto_id != RTE_PMD_I40E_PROTO_UNUSED) {
+                               for (n = 0; n < proto_num; n++) {
+                                       if (proto[n].proto_id == proto_id) {
+                                               printf(" %s", proto[n].name);
+                                               break;
+                                       }
+                               }
+                       }
+               }
+               printf("\n");
+       }
+       free(ptype);
+       printf("\n");
+
+       ret = 0;
+no_print_return:
+       if (proto)
+               free(proto);
+#endif
+       if (ret == -ENOTSUP)
+               printf("Function not supported in PMD driver\n");
+       close_file(pkg);
+}
+
+cmdline_parse_inst_t cmd_ddp_get_info = {
+       .f = cmd_ddp_info_parsed,
+       .data = NULL,
+       .help_str = "ddp get info <profile_path>",
+       .tokens = {
+               (void *)&cmd_ddp_info_ddp,
+               (void *)&cmd_ddp_info_get,
+               (void *)&cmd_ddp_info_info,
+               (void *)&cmd_ddp_info_filepath,
+               NULL,
+       },
+};
+
+/* Get dynamic device personalization profile info list*/
+#define PROFILE_INFO_SIZE 48
+#define MAX_PROFILE_NUM 16
+
+struct cmd_ddp_get_list_result {
+       cmdline_fixed_string_t ddp;
+       cmdline_fixed_string_t get;
+       cmdline_fixed_string_t list;
+       portid_t port_id;
+};
+
+cmdline_parse_token_string_t cmd_ddp_get_list_ddp =
+       TOKEN_STRING_INITIALIZER(struct cmd_ddp_get_list_result, ddp, "ddp");
+cmdline_parse_token_string_t cmd_ddp_get_list_get =
+       TOKEN_STRING_INITIALIZER(struct cmd_ddp_get_list_result, get, "get");
+cmdline_parse_token_string_t cmd_ddp_get_list_list =
+       TOKEN_STRING_INITIALIZER(struct cmd_ddp_get_list_result, list, "list");
+cmdline_parse_token_num_t cmd_ddp_get_list_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_ddp_get_list_result, port_id, UINT16);
+
+static void
+cmd_ddp_get_list_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_ddp_get_list_result *res = parsed_result;
+#ifdef RTE_LIBRTE_I40E_PMD
+       struct rte_pmd_i40e_profile_list *p_list;
+       struct rte_pmd_i40e_profile_info *p_info;
+       uint32_t p_num;
+       uint32_t size;
+       uint32_t i;
+#endif
+       int ret = -ENOTSUP;
+
+       if (res->port_id > nb_ports) {
+               printf("Invalid port, range is [0, %d]\n", nb_ports - 1);
+               return;
+       }
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       size = PROFILE_INFO_SIZE * MAX_PROFILE_NUM + 4;
+       p_list = (struct rte_pmd_i40e_profile_list *)malloc(size);
+       if (!p_list)
+               printf("%s: Failed to malloc buffer\n", __func__);
+
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_i40e_get_ddp_list(res->port_id,
+                                               (uint8_t *)p_list, size);
+
+       if (!ret) {
+               p_num = p_list->p_count;
+               printf("Profile number is: %d\n\n", p_num);
+
+               for (i = 0; i < p_num; i++) {
+                       p_info = &p_list->p_info[i];
+                       printf("Profile %d:\n", i);
+                       printf("Track id:     0x%x\n", p_info->track_id);
+                       printf("Version:      %d.%d.%d.%d\n",
+                              p_info->version.major,
+                              p_info->version.minor,
+                              p_info->version.update,
+                              p_info->version.draft);
+                       printf("Profile name: %s\n\n", p_info->name);
+               }
+       }
+
+       free(p_list);
+#endif
+
+       if (ret < 0)
+               printf("Failed to get ddp list\n");
+}
+
+cmdline_parse_inst_t cmd_ddp_get_list = {
+       .f = cmd_ddp_get_list_parsed,
+       .data = NULL,
+       .help_str = "ddp get list <port_id>",
+       .tokens = {
+               (void *)&cmd_ddp_get_list_ddp,
+               (void *)&cmd_ddp_get_list_get,
+               (void *)&cmd_ddp_get_list_list,
+               (void *)&cmd_ddp_get_list_port_id,
+               NULL,
+       },
+};
+
+/* Configure input set */
+struct cmd_cfg_input_set_result {
+       cmdline_fixed_string_t port;
+       cmdline_fixed_string_t cfg;
+       portid_t port_id;
+       cmdline_fixed_string_t pctype;
+       uint8_t pctype_id;
+       cmdline_fixed_string_t inset_type;
+       cmdline_fixed_string_t opt;
+       cmdline_fixed_string_t field;
+       uint8_t field_idx;
+};
+
+static void
+cmd_cfg_input_set_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_cfg_input_set_result *res = parsed_result;
+#ifdef RTE_LIBRTE_I40E_PMD
+       enum rte_pmd_i40e_inset_type inset_type = INSET_NONE;
+       struct rte_pmd_i40e_inset inset;
+#endif
+       int ret = -ENOTSUP;
+
+       if (res->port_id > nb_ports) {
+               printf("Invalid port, range is [0, %d]\n", nb_ports - 1);
+               return;
+       }
+
+       if (!all_ports_stopped()) {
+               printf("Please stop all ports first\n");
+               return;
+       }
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       if (!strcmp(res->inset_type, "hash_inset"))
+               inset_type = INSET_HASH;
+       else if (!strcmp(res->inset_type, "fdir_inset"))
+               inset_type = INSET_FDIR;
+       else if (!strcmp(res->inset_type, "fdir_flx_inset"))
+               inset_type = INSET_FDIR_FLX;
+       ret = rte_pmd_i40e_inset_get(res->port_id, res->pctype_id,
+                                    &inset, inset_type);
+       if (ret) {
+               printf("Failed to get input set.\n");
+               return;
+       }
+
+       if (!strcmp(res->opt, "get")) {
+               ret = rte_pmd_i40e_inset_field_get(inset.inset,
+                                                  res->field_idx);
+               if (ret)
+                       printf("Field index %d is enabled.\n", res->field_idx);
+               else
+                       printf("Field index %d is disabled.\n", res->field_idx);
+               return;
+       } else if (!strcmp(res->opt, "set"))
+               ret = rte_pmd_i40e_inset_field_set(&inset.inset,
+                                                  res->field_idx);
+       else if (!strcmp(res->opt, "clear"))
+               ret = rte_pmd_i40e_inset_field_clear(&inset.inset,
+                                                    res->field_idx);
+       if (ret) {
+               printf("Failed to configure input set field.\n");
+               return;
+       }
+
+       ret = rte_pmd_i40e_inset_set(res->port_id, res->pctype_id,
+                                    &inset, inset_type);
+       if (ret) {
+               printf("Failed to set input set.\n");
+               return;
+       }
+#endif
+
+       if (ret == -ENOTSUP)
+               printf("Function not supported\n");
+}
+
+cmdline_parse_token_string_t cmd_cfg_input_set_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_cfg_input_set_result,
+                                port, "port");
+cmdline_parse_token_string_t cmd_cfg_input_set_cfg =
+       TOKEN_STRING_INITIALIZER(struct cmd_cfg_input_set_result,
+                                cfg, "config");
+cmdline_parse_token_num_t cmd_cfg_input_set_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_cfg_input_set_result,
+                             port_id, UINT16);
+cmdline_parse_token_string_t cmd_cfg_input_set_pctype =
+       TOKEN_STRING_INITIALIZER(struct cmd_cfg_input_set_result,
+                                pctype, "pctype");
+cmdline_parse_token_num_t cmd_cfg_input_set_pctype_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_cfg_input_set_result,
+                             pctype_id, UINT8);
+cmdline_parse_token_string_t cmd_cfg_input_set_inset_type =
+       TOKEN_STRING_INITIALIZER(struct cmd_cfg_input_set_result,
+                                inset_type,
+                                "hash_inset#fdir_inset#fdir_flx_inset");
+cmdline_parse_token_string_t cmd_cfg_input_set_opt =
+       TOKEN_STRING_INITIALIZER(struct cmd_cfg_input_set_result,
+                                opt, "get#set#clear");
+cmdline_parse_token_string_t cmd_cfg_input_set_field =
+       TOKEN_STRING_INITIALIZER(struct cmd_cfg_input_set_result,
+                                field, "field");
+cmdline_parse_token_num_t cmd_cfg_input_set_field_idx =
+       TOKEN_NUM_INITIALIZER(struct cmd_cfg_input_set_result,
+                             field_idx, UINT8);
+
+cmdline_parse_inst_t cmd_cfg_input_set = {
+       .f = cmd_cfg_input_set_parsed,
+       .data = NULL,
+       .help_str = "port config <port_id> pctype <pctype_id> hash_inset|"
+                   "fdir_inset|fdir_flx_inset get|set|clear field <field_idx>",
+       .tokens = {
+               (void *)&cmd_cfg_input_set_port,
+               (void *)&cmd_cfg_input_set_cfg,
+               (void *)&cmd_cfg_input_set_port_id,
+               (void *)&cmd_cfg_input_set_pctype,
+               (void *)&cmd_cfg_input_set_pctype_id,
+               (void *)&cmd_cfg_input_set_inset_type,
+               (void *)&cmd_cfg_input_set_opt,
+               (void *)&cmd_cfg_input_set_field,
+               (void *)&cmd_cfg_input_set_field_idx,
+               NULL,
+       },
+};
+
+/* Clear input set */
+struct cmd_clear_input_set_result {
+       cmdline_fixed_string_t port;
+       cmdline_fixed_string_t cfg;
+       portid_t port_id;
+       cmdline_fixed_string_t pctype;
+       uint8_t pctype_id;
+       cmdline_fixed_string_t inset_type;
+       cmdline_fixed_string_t clear;
+       cmdline_fixed_string_t all;
+};
+
+static void
+cmd_clear_input_set_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_clear_input_set_result *res = parsed_result;
+#ifdef RTE_LIBRTE_I40E_PMD
+       enum rte_pmd_i40e_inset_type inset_type = INSET_NONE;
+       struct rte_pmd_i40e_inset inset;
+#endif
+       int ret = -ENOTSUP;
+
+       if (res->port_id > nb_ports) {
+               printf("Invalid port, range is [0, %d]\n", nb_ports - 1);
+               return;
+       }
+
+       if (!all_ports_stopped()) {
+               printf("Please stop all ports first\n");
+               return;
+       }
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       if (!strcmp(res->inset_type, "hash_inset"))
+               inset_type = INSET_HASH;
+       else if (!strcmp(res->inset_type, "fdir_inset"))
+               inset_type = INSET_FDIR;
+       else if (!strcmp(res->inset_type, "fdir_flx_inset"))
+               inset_type = INSET_FDIR_FLX;
+
+       memset(&inset, 0, sizeof(inset));
+
+       ret = rte_pmd_i40e_inset_set(res->port_id, res->pctype_id,
+                                    &inset, inset_type);
+       if (ret) {
+               printf("Failed to clear input set.\n");
+               return;
+       }
+
+#endif
+
+       if (ret == -ENOTSUP)
+               printf("Function not supported\n");
+}
+
+cmdline_parse_token_string_t cmd_clear_input_set_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_clear_input_set_result,
+                                port, "port");
+cmdline_parse_token_string_t cmd_clear_input_set_cfg =
+       TOKEN_STRING_INITIALIZER(struct cmd_clear_input_set_result,
+                                cfg, "config");
+cmdline_parse_token_num_t cmd_clear_input_set_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_clear_input_set_result,
+                             port_id, UINT16);
+cmdline_parse_token_string_t cmd_clear_input_set_pctype =
+       TOKEN_STRING_INITIALIZER(struct cmd_clear_input_set_result,
+                                pctype, "pctype");
+cmdline_parse_token_num_t cmd_clear_input_set_pctype_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_clear_input_set_result,
+                             pctype_id, UINT8);
+cmdline_parse_token_string_t cmd_clear_input_set_inset_type =
+       TOKEN_STRING_INITIALIZER(struct cmd_clear_input_set_result,
+                                inset_type,
+                                "hash_inset#fdir_inset#fdir_flx_inset");
+cmdline_parse_token_string_t cmd_clear_input_set_clear =
+       TOKEN_STRING_INITIALIZER(struct cmd_clear_input_set_result,
+                                clear, "clear");
+cmdline_parse_token_string_t cmd_clear_input_set_all =
+       TOKEN_STRING_INITIALIZER(struct cmd_clear_input_set_result,
+                                all, "all");
+
+cmdline_parse_inst_t cmd_clear_input_set = {
+       .f = cmd_clear_input_set_parsed,
+       .data = NULL,
+       .help_str = "port config <port_id> pctype <pctype_id> hash_inset|"
+                   "fdir_inset|fdir_flx_inset clear all",
+       .tokens = {
+               (void *)&cmd_clear_input_set_port,
+               (void *)&cmd_clear_input_set_cfg,
+               (void *)&cmd_clear_input_set_port_id,
+               (void *)&cmd_clear_input_set_pctype,
+               (void *)&cmd_clear_input_set_pctype_id,
+               (void *)&cmd_clear_input_set_inset_type,
+               (void *)&cmd_clear_input_set_clear,
+               (void *)&cmd_clear_input_set_all,
+               NULL,
+       },
+};
+
+/* show vf stats */
+
+/* Common result structure for show vf stats */
+struct cmd_show_vf_stats_result {
+       cmdline_fixed_string_t show;
+       cmdline_fixed_string_t vf;
+       cmdline_fixed_string_t stats;
+       portid_t port_id;
+       uint16_t vf_id;
+};
+
+/* Common CLI fields show vf stats*/
+cmdline_parse_token_string_t cmd_show_vf_stats_show =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_show_vf_stats_result,
+                show, "show");
+cmdline_parse_token_string_t cmd_show_vf_stats_vf =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_show_vf_stats_result,
+                vf, "vf");
+cmdline_parse_token_string_t cmd_show_vf_stats_stats =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_show_vf_stats_result,
+                stats, "stats");
+cmdline_parse_token_num_t cmd_show_vf_stats_port_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_show_vf_stats_result,
+                port_id, UINT16);
+cmdline_parse_token_num_t cmd_show_vf_stats_vf_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_show_vf_stats_result,
+                vf_id, UINT16);
+
+static void
+cmd_show_vf_stats_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_show_vf_stats_result *res = parsed_result;
+       struct rte_eth_stats stats;
+       int ret = -ENOTSUP;
+       static const char *nic_stats_border = "########################";
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+       memset(&stats, 0, sizeof(stats));
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_i40e_get_vf_stats(res->port_id,
+                                               res->vf_id,
+                                               &stats);
+#endif
+#ifdef RTE_LIBRTE_BNXT_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_bnxt_get_vf_stats(res->port_id,
+                                               res->vf_id,
+                                               &stats);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -EINVAL:
+               printf("invalid vf_id %d\n", res->vf_id);
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               break;
+       case -ENOTSUP:
+               printf("function not implemented\n");
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+
+       printf("\n  %s NIC statistics for port %-2d vf %-2d %s\n",
+               nic_stats_border, res->port_id, res->vf_id, nic_stats_border);
+
+       printf("  RX-packets: %-10"PRIu64" RX-missed: %-10"PRIu64" RX-bytes:  "
+              "%-"PRIu64"\n",
+              stats.ipackets, stats.imissed, stats.ibytes);
+       printf("  RX-errors: %-"PRIu64"\n", stats.ierrors);
+       printf("  RX-nombuf:  %-10"PRIu64"\n",
+              stats.rx_nombuf);
+       printf("  TX-packets: %-10"PRIu64" TX-errors: %-10"PRIu64" TX-bytes:  "
+              "%-"PRIu64"\n",
+              stats.opackets, stats.oerrors, stats.obytes);
+
+       printf("  %s############################%s\n",
+                              nic_stats_border, nic_stats_border);
+}
+
+cmdline_parse_inst_t cmd_show_vf_stats = {
+       .f = cmd_show_vf_stats_parsed,
+       .data = NULL,
+       .help_str = "show vf stats <port_id> <vf_id>",
+       .tokens = {
+               (void *)&cmd_show_vf_stats_show,
+               (void *)&cmd_show_vf_stats_vf,
+               (void *)&cmd_show_vf_stats_stats,
+               (void *)&cmd_show_vf_stats_port_id,
+               (void *)&cmd_show_vf_stats_vf_id,
+               NULL,
+       },
+};
+
+/* clear vf stats */
+
+/* Common result structure for clear vf stats */
+struct cmd_clear_vf_stats_result {
+       cmdline_fixed_string_t clear;
+       cmdline_fixed_string_t vf;
+       cmdline_fixed_string_t stats;
+       portid_t port_id;
+       uint16_t vf_id;
+};
+
+/* Common CLI fields clear vf stats*/
+cmdline_parse_token_string_t cmd_clear_vf_stats_clear =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_clear_vf_stats_result,
+                clear, "clear");
+cmdline_parse_token_string_t cmd_clear_vf_stats_vf =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_clear_vf_stats_result,
+                vf, "vf");
+cmdline_parse_token_string_t cmd_clear_vf_stats_stats =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_clear_vf_stats_result,
+                stats, "stats");
+cmdline_parse_token_num_t cmd_clear_vf_stats_port_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_clear_vf_stats_result,
+                port_id, UINT16);
+cmdline_parse_token_num_t cmd_clear_vf_stats_vf_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_clear_vf_stats_result,
+                vf_id, UINT16);
+
+static void
+cmd_clear_vf_stats_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_clear_vf_stats_result *res = parsed_result;
+       int ret = -ENOTSUP;
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_i40e_reset_vf_stats(res->port_id,
+                                                 res->vf_id);
+#endif
+#ifdef RTE_LIBRTE_BNXT_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_bnxt_reset_vf_stats(res->port_id,
+                                                 res->vf_id);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -EINVAL:
+               printf("invalid vf_id %d\n", res->vf_id);
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               break;
+       case -ENOTSUP:
+               printf("function not implemented\n");
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_inst_t cmd_clear_vf_stats = {
+       .f = cmd_clear_vf_stats_parsed,
+       .data = NULL,
+       .help_str = "clear vf stats <port_id> <vf_id>",
+       .tokens = {
+               (void *)&cmd_clear_vf_stats_clear,
+               (void *)&cmd_clear_vf_stats_vf,
+               (void *)&cmd_clear_vf_stats_stats,
+               (void *)&cmd_clear_vf_stats_port_id,
+               (void *)&cmd_clear_vf_stats_vf_id,
+               NULL,
+       },
+};
+
+/* port config pctype mapping reset */
+
+/* Common result structure for port config pctype mapping reset */
+struct cmd_pctype_mapping_reset_result {
+       cmdline_fixed_string_t port;
+       cmdline_fixed_string_t config;
+       portid_t port_id;
+       cmdline_fixed_string_t pctype;
+       cmdline_fixed_string_t mapping;
+       cmdline_fixed_string_t reset;
+};
+
+/* Common CLI fields for port config pctype mapping reset*/
+cmdline_parse_token_string_t cmd_pctype_mapping_reset_port =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_pctype_mapping_reset_result,
+                port, "port");
+cmdline_parse_token_string_t cmd_pctype_mapping_reset_config =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_pctype_mapping_reset_result,
+                config, "config");
+cmdline_parse_token_num_t cmd_pctype_mapping_reset_port_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_pctype_mapping_reset_result,
+                port_id, UINT16);
+cmdline_parse_token_string_t cmd_pctype_mapping_reset_pctype =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_pctype_mapping_reset_result,
+                pctype, "pctype");
+cmdline_parse_token_string_t cmd_pctype_mapping_reset_mapping =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_pctype_mapping_reset_result,
+                mapping, "mapping");
+cmdline_parse_token_string_t cmd_pctype_mapping_reset_reset =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_pctype_mapping_reset_result,
+                reset, "reset");
+
+static void
+cmd_pctype_mapping_reset_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_pctype_mapping_reset_result *res = parsed_result;
+       int ret = -ENOTSUP;
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       ret = rte_pmd_i40e_flow_type_mapping_reset(res->port_id);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               break;
+       case -ENOTSUP:
+               printf("function not implemented\n");
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_inst_t cmd_pctype_mapping_reset = {
+       .f = cmd_pctype_mapping_reset_parsed,
+       .data = NULL,
+       .help_str = "port config <port_id> pctype mapping reset",
+       .tokens = {
+               (void *)&cmd_pctype_mapping_reset_port,
+               (void *)&cmd_pctype_mapping_reset_config,
+               (void *)&cmd_pctype_mapping_reset_port_id,
+               (void *)&cmd_pctype_mapping_reset_pctype,
+               (void *)&cmd_pctype_mapping_reset_mapping,
+               (void *)&cmd_pctype_mapping_reset_reset,
+               NULL,
+       },
+};
+
+/* show port pctype mapping */
+
+/* Common result structure for show port pctype mapping */
+struct cmd_pctype_mapping_get_result {
+       cmdline_fixed_string_t show;
+       cmdline_fixed_string_t port;
+       portid_t port_id;
+       cmdline_fixed_string_t pctype;
+       cmdline_fixed_string_t mapping;
+};
+
+/* Common CLI fields for pctype mapping get */
+cmdline_parse_token_string_t cmd_pctype_mapping_get_show =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_pctype_mapping_get_result,
+                show, "show");
+cmdline_parse_token_string_t cmd_pctype_mapping_get_port =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_pctype_mapping_get_result,
+                port, "port");
+cmdline_parse_token_num_t cmd_pctype_mapping_get_port_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_pctype_mapping_get_result,
+                port_id, UINT16);
+cmdline_parse_token_string_t cmd_pctype_mapping_get_pctype =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_pctype_mapping_get_result,
+                pctype, "pctype");
+cmdline_parse_token_string_t cmd_pctype_mapping_get_mapping =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_pctype_mapping_get_result,
+                mapping, "mapping");
+
+static void
+cmd_pctype_mapping_get_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_pctype_mapping_get_result *res = parsed_result;
+       int ret = -ENOTSUP;
+#ifdef RTE_LIBRTE_I40E_PMD
+       struct rte_pmd_i40e_flow_type_mapping
+                               mapping[RTE_PMD_I40E_FLOW_TYPE_MAX];
+       int i, j, first_pctype;
+#endif
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       ret = rte_pmd_i40e_flow_type_mapping_get(res->port_id, mapping);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               return;
+       case -ENOTSUP:
+               printf("function not implemented\n");
+               return;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+               return;
+       }
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       for (i = 0; i < RTE_PMD_I40E_FLOW_TYPE_MAX; i++) {
+               if (mapping[i].pctype != 0ULL) {
+                       first_pctype = 1;
+
+                       printf("pctype: ");
+                       for (j = 0; j < RTE_PMD_I40E_PCTYPE_MAX; j++) {
+                               if (mapping[i].pctype & (1ULL << j)) {
+                                       printf(first_pctype ?
+                                              "%02d" : ",%02d", j);
+                                       first_pctype = 0;
+                               }
+                       }
+                       printf("  ->  flowtype: %02d\n", mapping[i].flow_type);
+               }
+       }
+#endif
+}
+
+cmdline_parse_inst_t cmd_pctype_mapping_get = {
+       .f = cmd_pctype_mapping_get_parsed,
+       .data = NULL,
+       .help_str = "show port <port_id> pctype mapping",
+       .tokens = {
+               (void *)&cmd_pctype_mapping_get_show,
+               (void *)&cmd_pctype_mapping_get_port,
+               (void *)&cmd_pctype_mapping_get_port_id,
+               (void *)&cmd_pctype_mapping_get_pctype,
+               (void *)&cmd_pctype_mapping_get_mapping,
+               NULL,
+       },
+};
+
+/* port config pctype mapping update */
+
+/* Common result structure for port config pctype mapping update */
+struct cmd_pctype_mapping_update_result {
+       cmdline_fixed_string_t port;
+       cmdline_fixed_string_t config;
+       portid_t port_id;
+       cmdline_fixed_string_t pctype;
+       cmdline_fixed_string_t mapping;
+       cmdline_fixed_string_t update;
+       cmdline_fixed_string_t pctype_list;
+       uint16_t flow_type;
+};
+
+/* Common CLI fields for pctype mapping update*/
+cmdline_parse_token_string_t cmd_pctype_mapping_update_port =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_pctype_mapping_update_result,
+                port, "port");
+cmdline_parse_token_string_t cmd_pctype_mapping_update_config =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_pctype_mapping_update_result,
+                config, "config");
+cmdline_parse_token_num_t cmd_pctype_mapping_update_port_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_pctype_mapping_update_result,
+                port_id, UINT16);
+cmdline_parse_token_string_t cmd_pctype_mapping_update_pctype =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_pctype_mapping_update_result,
+                pctype, "pctype");
+cmdline_parse_token_string_t cmd_pctype_mapping_update_mapping =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_pctype_mapping_update_result,
+                mapping, "mapping");
+cmdline_parse_token_string_t cmd_pctype_mapping_update_update =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_pctype_mapping_update_result,
+                update, "update");
+cmdline_parse_token_string_t cmd_pctype_mapping_update_pc_type =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_pctype_mapping_update_result,
+                pctype_list, NULL);
+cmdline_parse_token_num_t cmd_pctype_mapping_update_flow_type =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_pctype_mapping_update_result,
+                flow_type, UINT16);
+
+static void
+cmd_pctype_mapping_update_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_pctype_mapping_update_result *res = parsed_result;
+       int ret = -ENOTSUP;
+#ifdef RTE_LIBRTE_I40E_PMD
+       struct rte_pmd_i40e_flow_type_mapping mapping;
+       unsigned int i;
+       unsigned int nb_item;
+       unsigned int pctype_list[RTE_PMD_I40E_PCTYPE_MAX];
+#endif
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       nb_item = parse_item_list(res->pctype_list, "pctypes",
+                                 RTE_PMD_I40E_PCTYPE_MAX, pctype_list, 1);
+       mapping.flow_type = res->flow_type;
+       for (i = 0, mapping.pctype = 0ULL; i < nb_item; i++)
+               mapping.pctype |= (1ULL << pctype_list[i]);
+       ret = rte_pmd_i40e_flow_type_mapping_update(res->port_id,
+                                               &mapping,
+                                               1,
+                                               0);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -EINVAL:
+               printf("invalid pctype or flow type\n");
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               break;
+       case -ENOTSUP:
+               printf("function not implemented\n");
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_inst_t cmd_pctype_mapping_update = {
+       .f = cmd_pctype_mapping_update_parsed,
+       .data = NULL,
+       .help_str = "port config <port_id> pctype mapping update"
+       " <pctype_id_0,[pctype_id_1]*> <flowtype_id>",
+       .tokens = {
+               (void *)&cmd_pctype_mapping_update_port,
+               (void *)&cmd_pctype_mapping_update_config,
+               (void *)&cmd_pctype_mapping_update_port_id,
+               (void *)&cmd_pctype_mapping_update_pctype,
+               (void *)&cmd_pctype_mapping_update_mapping,
+               (void *)&cmd_pctype_mapping_update_update,
+               (void *)&cmd_pctype_mapping_update_pc_type,
+               (void *)&cmd_pctype_mapping_update_flow_type,
+               NULL,
+       },
+};
+
+/* ptype mapping get */
+
+/* Common result structure for ptype mapping get */
+struct cmd_ptype_mapping_get_result {
+       cmdline_fixed_string_t ptype;
+       cmdline_fixed_string_t mapping;
+       cmdline_fixed_string_t get;
+       portid_t port_id;
+       uint8_t valid_only;
+};
+
+/* Common CLI fields for ptype mapping get */
+cmdline_parse_token_string_t cmd_ptype_mapping_get_ptype =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_ptype_mapping_get_result,
+                ptype, "ptype");
+cmdline_parse_token_string_t cmd_ptype_mapping_get_mapping =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_ptype_mapping_get_result,
+                mapping, "mapping");
+cmdline_parse_token_string_t cmd_ptype_mapping_get_get =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_ptype_mapping_get_result,
+                get, "get");
+cmdline_parse_token_num_t cmd_ptype_mapping_get_port_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_ptype_mapping_get_result,
+                port_id, UINT16);
+cmdline_parse_token_num_t cmd_ptype_mapping_get_valid_only =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_ptype_mapping_get_result,
+                valid_only, UINT8);
+
+static void
+cmd_ptype_mapping_get_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_ptype_mapping_get_result *res = parsed_result;
+       int ret = -ENOTSUP;
+#ifdef RTE_LIBRTE_I40E_PMD
+       int max_ptype_num = 256;
+       struct rte_pmd_i40e_ptype_mapping mapping[max_ptype_num];
+       uint16_t count;
+       int i;
+#endif
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       ret = rte_pmd_i40e_ptype_mapping_get(res->port_id,
+                                       mapping,
+                                       max_ptype_num,
+                                       &count,
+                                       res->valid_only);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               break;
+       case -ENOTSUP:
+               printf("function not implemented\n");
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       if (!ret) {
+               for (i = 0; i < count; i++)
+                       printf("%3d\t0x%08x\n",
+                               mapping[i].hw_ptype, mapping[i].sw_ptype);
+       }
+#endif
+}
+
+cmdline_parse_inst_t cmd_ptype_mapping_get = {
+       .f = cmd_ptype_mapping_get_parsed,
+       .data = NULL,
+       .help_str = "ptype mapping get <port_id> <valid_only>",
+       .tokens = {
+               (void *)&cmd_ptype_mapping_get_ptype,
+               (void *)&cmd_ptype_mapping_get_mapping,
+               (void *)&cmd_ptype_mapping_get_get,
+               (void *)&cmd_ptype_mapping_get_port_id,
+               (void *)&cmd_ptype_mapping_get_valid_only,
+               NULL,
+       },
+};
+
+/* ptype mapping replace */
+
+/* Common result structure for ptype mapping replace */
+struct cmd_ptype_mapping_replace_result {
+       cmdline_fixed_string_t ptype;
+       cmdline_fixed_string_t mapping;
+       cmdline_fixed_string_t replace;
+       portid_t port_id;
+       uint32_t target;
+       uint8_t mask;
+       uint32_t pkt_type;
+};
+
+/* Common CLI fields for ptype mapping replace */
+cmdline_parse_token_string_t cmd_ptype_mapping_replace_ptype =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_ptype_mapping_replace_result,
+                ptype, "ptype");
+cmdline_parse_token_string_t cmd_ptype_mapping_replace_mapping =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_ptype_mapping_replace_result,
+                mapping, "mapping");
+cmdline_parse_token_string_t cmd_ptype_mapping_replace_replace =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_ptype_mapping_replace_result,
+                replace, "replace");
+cmdline_parse_token_num_t cmd_ptype_mapping_replace_port_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_ptype_mapping_replace_result,
+                port_id, UINT16);
+cmdline_parse_token_num_t cmd_ptype_mapping_replace_target =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_ptype_mapping_replace_result,
+                target, UINT32);
+cmdline_parse_token_num_t cmd_ptype_mapping_replace_mask =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_ptype_mapping_replace_result,
+                mask, UINT8);
+cmdline_parse_token_num_t cmd_ptype_mapping_replace_pkt_type =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_ptype_mapping_replace_result,
+                pkt_type, UINT32);
+
+static void
+cmd_ptype_mapping_replace_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_ptype_mapping_replace_result *res = parsed_result;
+       int ret = -ENOTSUP;
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       ret = rte_pmd_i40e_ptype_mapping_replace(res->port_id,
+                                       res->target,
+                                       res->mask,
+                                       res->pkt_type);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -EINVAL:
+               printf("invalid ptype 0x%8x or 0x%8x\n",
+                               res->target, res->pkt_type);
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               break;
+       case -ENOTSUP:
+               printf("function not implemented\n");
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_inst_t cmd_ptype_mapping_replace = {
+       .f = cmd_ptype_mapping_replace_parsed,
+       .data = NULL,
+       .help_str =
+               "ptype mapping replace <port_id> <target> <mask> <pkt_type>",
+       .tokens = {
+               (void *)&cmd_ptype_mapping_replace_ptype,
+               (void *)&cmd_ptype_mapping_replace_mapping,
+               (void *)&cmd_ptype_mapping_replace_replace,
+               (void *)&cmd_ptype_mapping_replace_port_id,
+               (void *)&cmd_ptype_mapping_replace_target,
+               (void *)&cmd_ptype_mapping_replace_mask,
+               (void *)&cmd_ptype_mapping_replace_pkt_type,
+               NULL,
+       },
+};
+
+/* ptype mapping reset */
+
+/* Common result structure for ptype mapping reset */
+struct cmd_ptype_mapping_reset_result {
+       cmdline_fixed_string_t ptype;
+       cmdline_fixed_string_t mapping;
+       cmdline_fixed_string_t reset;
+       portid_t port_id;
+};
+
+/* Common CLI fields for ptype mapping reset*/
+cmdline_parse_token_string_t cmd_ptype_mapping_reset_ptype =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_ptype_mapping_reset_result,
+                ptype, "ptype");
+cmdline_parse_token_string_t cmd_ptype_mapping_reset_mapping =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_ptype_mapping_reset_result,
+                mapping, "mapping");
+cmdline_parse_token_string_t cmd_ptype_mapping_reset_reset =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_ptype_mapping_reset_result,
+                reset, "reset");
+cmdline_parse_token_num_t cmd_ptype_mapping_reset_port_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_ptype_mapping_reset_result,
+                port_id, UINT16);
+
+static void
+cmd_ptype_mapping_reset_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_ptype_mapping_reset_result *res = parsed_result;
+       int ret = -ENOTSUP;
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       ret = rte_pmd_i40e_ptype_mapping_reset(res->port_id);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               break;
+       case -ENOTSUP:
+               printf("function not implemented\n");
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_inst_t cmd_ptype_mapping_reset = {
+       .f = cmd_ptype_mapping_reset_parsed,
+       .data = NULL,
+       .help_str = "ptype mapping reset <port_id>",
+       .tokens = {
+               (void *)&cmd_ptype_mapping_reset_ptype,
+               (void *)&cmd_ptype_mapping_reset_mapping,
+               (void *)&cmd_ptype_mapping_reset_reset,
+               (void *)&cmd_ptype_mapping_reset_port_id,
+               NULL,
+       },
+};
+
+/* ptype mapping update */
+
+/* Common result structure for ptype mapping update */
+struct cmd_ptype_mapping_update_result {
+       cmdline_fixed_string_t ptype;
+       cmdline_fixed_string_t mapping;
+       cmdline_fixed_string_t reset;
+       portid_t port_id;
+       uint8_t hw_ptype;
+       uint32_t sw_ptype;
+};
+
+/* Common CLI fields for ptype mapping update*/
+cmdline_parse_token_string_t cmd_ptype_mapping_update_ptype =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_ptype_mapping_update_result,
+                ptype, "ptype");
+cmdline_parse_token_string_t cmd_ptype_mapping_update_mapping =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_ptype_mapping_update_result,
+                mapping, "mapping");
+cmdline_parse_token_string_t cmd_ptype_mapping_update_update =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_ptype_mapping_update_result,
+                reset, "update");
+cmdline_parse_token_num_t cmd_ptype_mapping_update_port_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_ptype_mapping_update_result,
+                port_id, UINT16);
+cmdline_parse_token_num_t cmd_ptype_mapping_update_hw_ptype =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_ptype_mapping_update_result,
+                hw_ptype, UINT8);
+cmdline_parse_token_num_t cmd_ptype_mapping_update_sw_ptype =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_ptype_mapping_update_result,
+                sw_ptype, UINT32);
+
+static void
+cmd_ptype_mapping_update_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_ptype_mapping_update_result *res = parsed_result;
+       int ret = -ENOTSUP;
+#ifdef RTE_LIBRTE_I40E_PMD
+       struct rte_pmd_i40e_ptype_mapping mapping;
+#endif
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       mapping.hw_ptype = res->hw_ptype;
+       mapping.sw_ptype = res->sw_ptype;
+       ret = rte_pmd_i40e_ptype_mapping_update(res->port_id,
+                                               &mapping,
+                                               1,
+                                               0);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -EINVAL:
+               printf("invalid ptype 0x%8x\n", res->sw_ptype);
+               break;
+       case -ENODEV:
+               printf("invalid port_id %d\n", res->port_id);
+               break;
+       case -ENOTSUP:
+               printf("function not implemented\n");
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_inst_t cmd_ptype_mapping_update = {
+       .f = cmd_ptype_mapping_update_parsed,
+       .data = NULL,
+       .help_str = "ptype mapping update <port_id> <hw_ptype> <sw_ptype>",
+       .tokens = {
+               (void *)&cmd_ptype_mapping_update_ptype,
+               (void *)&cmd_ptype_mapping_update_mapping,
+               (void *)&cmd_ptype_mapping_update_update,
+               (void *)&cmd_ptype_mapping_update_port_id,
+               (void *)&cmd_ptype_mapping_update_hw_ptype,
+               (void *)&cmd_ptype_mapping_update_sw_ptype,
+               NULL,
+       },
+};
+
+/* Common result structure for file commands */
+struct cmd_cmdfile_result {
+       cmdline_fixed_string_t load;
+       cmdline_fixed_string_t filename;
+};
+
+/* Common CLI fields for file commands */
+cmdline_parse_token_string_t cmd_load_cmdfile =
+       TOKEN_STRING_INITIALIZER(struct cmd_cmdfile_result, load, "load");
+cmdline_parse_token_string_t cmd_load_cmdfile_filename =
+       TOKEN_STRING_INITIALIZER(struct cmd_cmdfile_result, filename, NULL);
+
+static void
+cmd_load_from_file_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_cmdfile_result *res = parsed_result;
+
+       cmdline_read_from_file(res->filename);
+}
+
+cmdline_parse_inst_t cmd_load_from_file = {
+       .f = cmd_load_from_file_parsed,
+       .data = NULL,
+       .help_str = "load <filename>",
+       .tokens = {
+               (void *)&cmd_load_cmdfile,
+               (void *)&cmd_load_cmdfile_filename,
+               NULL,
+       },
+};
+
+/* ******************************************************************************** */
+
+/* list of instructions */
+cmdline_parse_ctx_t main_ctx[] = {
+       (cmdline_parse_inst_t *)&cmd_help_brief,
+       (cmdline_parse_inst_t *)&cmd_help_long,
+       (cmdline_parse_inst_t *)&cmd_quit,
+       (cmdline_parse_inst_t *)&cmd_load_from_file,
+       (cmdline_parse_inst_t *)&cmd_showport,
+       (cmdline_parse_inst_t *)&cmd_showqueue,
+       (cmdline_parse_inst_t *)&cmd_showportall,
+       (cmdline_parse_inst_t *)&cmd_showcfg,
+       (cmdline_parse_inst_t *)&cmd_start,
+       (cmdline_parse_inst_t *)&cmd_start_tx_first,
+       (cmdline_parse_inst_t *)&cmd_start_tx_first_n,
+       (cmdline_parse_inst_t *)&cmd_set_link_up,
+       (cmdline_parse_inst_t *)&cmd_set_link_down,
+       (cmdline_parse_inst_t *)&cmd_reset,
+       (cmdline_parse_inst_t *)&cmd_set_numbers,
+       (cmdline_parse_inst_t *)&cmd_set_log,
+       (cmdline_parse_inst_t *)&cmd_set_txpkts,
+       (cmdline_parse_inst_t *)&cmd_set_txsplit,
+       (cmdline_parse_inst_t *)&cmd_set_fwd_list,
+       (cmdline_parse_inst_t *)&cmd_set_fwd_mask,
+       (cmdline_parse_inst_t *)&cmd_set_fwd_mode,
+       (cmdline_parse_inst_t *)&cmd_set_fwd_retry_mode,
+       (cmdline_parse_inst_t *)&cmd_set_burst_tx_retry,
+       (cmdline_parse_inst_t *)&cmd_set_promisc_mode_one,
+       (cmdline_parse_inst_t *)&cmd_set_promisc_mode_all,
+       (cmdline_parse_inst_t *)&cmd_set_allmulti_mode_one,
+       (cmdline_parse_inst_t *)&cmd_set_allmulti_mode_all,
+       (cmdline_parse_inst_t *)&cmd_set_flush_rx,
+       (cmdline_parse_inst_t *)&cmd_set_link_check,
+       (cmdline_parse_inst_t *)&cmd_set_bypass_mode,
+       (cmdline_parse_inst_t *)&cmd_set_bypass_event,
+       (cmdline_parse_inst_t *)&cmd_set_bypass_timeout,
+       (cmdline_parse_inst_t *)&cmd_show_bypass_config,
+#ifdef RTE_LIBRTE_PMD_BOND
+       (cmdline_parse_inst_t *) &cmd_set_bonding_mode,
+       (cmdline_parse_inst_t *) &cmd_show_bonding_config,
+       (cmdline_parse_inst_t *) &cmd_set_bonding_primary,
+       (cmdline_parse_inst_t *) &cmd_add_bonding_slave,
+       (cmdline_parse_inst_t *) &cmd_remove_bonding_slave,
+       (cmdline_parse_inst_t *) &cmd_create_bonded_device,
+       (cmdline_parse_inst_t *) &cmd_set_bond_mac_addr,
+       (cmdline_parse_inst_t *) &cmd_set_balance_xmit_policy,
+       (cmdline_parse_inst_t *) &cmd_set_bond_mon_period,
+       (cmdline_parse_inst_t *) &cmd_set_lacp_dedicated_queues,
+       (cmdline_parse_inst_t *) &cmd_set_bonding_agg_mode_policy,
+#endif
+       (cmdline_parse_inst_t *)&cmd_vlan_offload,
+       (cmdline_parse_inst_t *)&cmd_vlan_tpid,
+       (cmdline_parse_inst_t *)&cmd_rx_vlan_filter_all,
+       (cmdline_parse_inst_t *)&cmd_rx_vlan_filter,
+       (cmdline_parse_inst_t *)&cmd_tx_vlan_set,
+       (cmdline_parse_inst_t *)&cmd_tx_vlan_set_qinq,
+       (cmdline_parse_inst_t *)&cmd_tx_vlan_reset,
+       (cmdline_parse_inst_t *)&cmd_tx_vlan_set_pvid,
+       (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_tunnel_tso_set,
+       (cmdline_parse_inst_t *)&cmd_tunnel_tso_show,
+       (cmdline_parse_inst_t *)&cmd_gro_enable,
+       (cmdline_parse_inst_t *)&cmd_gro_flush,
+       (cmdline_parse_inst_t *)&cmd_gro_show,
+       (cmdline_parse_inst_t *)&cmd_gso_enable,
+       (cmdline_parse_inst_t *)&cmd_gso_size,
+       (cmdline_parse_inst_t *)&cmd_gso_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,
+       (cmdline_parse_inst_t *)&cmd_link_flow_control_set_hw,
+       (cmdline_parse_inst_t *)&cmd_link_flow_control_set_lw,
+       (cmdline_parse_inst_t *)&cmd_link_flow_control_set_pt,
+       (cmdline_parse_inst_t *)&cmd_link_flow_control_set_xon,
+       (cmdline_parse_inst_t *)&cmd_link_flow_control_set_macfwd,
+       (cmdline_parse_inst_t *)&cmd_link_flow_control_set_autoneg,
+       (cmdline_parse_inst_t *)&cmd_priority_flow_control_set,
+       (cmdline_parse_inst_t *)&cmd_config_dcb,
+       (cmdline_parse_inst_t *)&cmd_read_reg,
+       (cmdline_parse_inst_t *)&cmd_read_reg_bit_field,
+       (cmdline_parse_inst_t *)&cmd_read_reg_bit,
+       (cmdline_parse_inst_t *)&cmd_write_reg,
+       (cmdline_parse_inst_t *)&cmd_write_reg_bit_field,
+       (cmdline_parse_inst_t *)&cmd_write_reg_bit,
+       (cmdline_parse_inst_t *)&cmd_read_rxd_txd,
+       (cmdline_parse_inst_t *)&cmd_stop,
+       (cmdline_parse_inst_t *)&cmd_mac_addr,
+       (cmdline_parse_inst_t *)&cmd_set_fwd_eth_peer,
+       (cmdline_parse_inst_t *)&cmd_set_qmap,
+       (cmdline_parse_inst_t *)&cmd_set_xstats_hide_zero,
+       (cmdline_parse_inst_t *)&cmd_operate_port,
+       (cmdline_parse_inst_t *)&cmd_operate_specific_port,
+       (cmdline_parse_inst_t *)&cmd_operate_attach_port,
+       (cmdline_parse_inst_t *)&cmd_operate_detach_port,
+       (cmdline_parse_inst_t *)&cmd_config_speed_all,
+       (cmdline_parse_inst_t *)&cmd_config_speed_specific,
+       (cmdline_parse_inst_t *)&cmd_config_rx_tx,
+       (cmdline_parse_inst_t *)&cmd_config_mtu,
+       (cmdline_parse_inst_t *)&cmd_config_max_pkt_len,
+       (cmdline_parse_inst_t *)&cmd_config_rx_mode_flag,
+       (cmdline_parse_inst_t *)&cmd_config_rss,
+       (cmdline_parse_inst_t *)&cmd_config_rxtx_queue,
+       (cmdline_parse_inst_t *)&cmd_config_rss_reta,
+       (cmdline_parse_inst_t *)&cmd_showport_reta,
+       (cmdline_parse_inst_t *)&cmd_config_burst,
+       (cmdline_parse_inst_t *)&cmd_config_thresh,
+       (cmdline_parse_inst_t *)&cmd_config_threshold,
+       (cmdline_parse_inst_t *)&cmd_set_uc_hash_filter,
+       (cmdline_parse_inst_t *)&cmd_set_uc_all_hash_filter,
+       (cmdline_parse_inst_t *)&cmd_vf_mac_addr_filter,
+       (cmdline_parse_inst_t *)&cmd_set_vf_macvlan_filter,
+       (cmdline_parse_inst_t *)&cmd_queue_rate_limit,
+       (cmdline_parse_inst_t *)&cmd_tunnel_filter,
+       (cmdline_parse_inst_t *)&cmd_tunnel_udp_config,
+       (cmdline_parse_inst_t *)&cmd_global_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,
+       (cmdline_parse_inst_t *)&cmd_showport_rss_hash,
+       (cmdline_parse_inst_t *)&cmd_showport_rss_hash_key,
+       (cmdline_parse_inst_t *)&cmd_config_rss_hash_key,
+       (cmdline_parse_inst_t *)&cmd_dump,
+       (cmdline_parse_inst_t *)&cmd_dump_one,
+       (cmdline_parse_inst_t *)&cmd_ethertype_filter,
+       (cmdline_parse_inst_t *)&cmd_syn_filter,
+       (cmdline_parse_inst_t *)&cmd_2tuple_filter,
+       (cmdline_parse_inst_t *)&cmd_5tuple_filter,
+       (cmdline_parse_inst_t *)&cmd_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_add_del_l2_flow_director,
+       (cmdline_parse_inst_t *)&cmd_add_del_mac_vlan_flow_director,
+       (cmdline_parse_inst_t *)&cmd_add_del_tunnel_flow_director,
+       (cmdline_parse_inst_t *)&cmd_add_del_raw_flow_director,
+       (cmdline_parse_inst_t *)&cmd_flush_flow_director,
+       (cmdline_parse_inst_t *)&cmd_set_flow_director_ip_mask,
+       (cmdline_parse_inst_t *)&cmd_set_flow_director_mac_vlan_mask,
+       (cmdline_parse_inst_t *)&cmd_set_flow_director_tunnel_mask,
+       (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,
+       (cmdline_parse_inst_t *)&cmd_set_hash_input_set,
+       (cmdline_parse_inst_t *)&cmd_set_fdir_input_set,
+       (cmdline_parse_inst_t *)&cmd_flow,
+       (cmdline_parse_inst_t *)&cmd_show_port_meter_cap,
+       (cmdline_parse_inst_t *)&cmd_add_port_meter_profile_srtcm,
+       (cmdline_parse_inst_t *)&cmd_add_port_meter_profile_trtcm,
+       (cmdline_parse_inst_t *)&cmd_del_port_meter_profile,
+       (cmdline_parse_inst_t *)&cmd_create_port_meter,
+       (cmdline_parse_inst_t *)&cmd_enable_port_meter,
+       (cmdline_parse_inst_t *)&cmd_disable_port_meter,
+       (cmdline_parse_inst_t *)&cmd_del_port_meter,
+       (cmdline_parse_inst_t *)&cmd_set_port_meter_profile,
+       (cmdline_parse_inst_t *)&cmd_set_port_meter_dscp_table,
+       (cmdline_parse_inst_t *)&cmd_set_port_meter_policer_action,
+       (cmdline_parse_inst_t *)&cmd_set_port_meter_stats_mask,
+       (cmdline_parse_inst_t *)&cmd_show_port_meter_stats,
+       (cmdline_parse_inst_t *)&cmd_mcast_addr,
+       (cmdline_parse_inst_t *)&cmd_config_l2_tunnel_eth_type_all,
+       (cmdline_parse_inst_t *)&cmd_config_l2_tunnel_eth_type_specific,
+       (cmdline_parse_inst_t *)&cmd_config_l2_tunnel_en_dis_all,
+       (cmdline_parse_inst_t *)&cmd_config_l2_tunnel_en_dis_specific,
+       (cmdline_parse_inst_t *)&cmd_config_e_tag_insertion_en,
+       (cmdline_parse_inst_t *)&cmd_config_e_tag_insertion_dis,
+       (cmdline_parse_inst_t *)&cmd_config_e_tag_stripping_en_dis,
+       (cmdline_parse_inst_t *)&cmd_config_e_tag_forwarding_en_dis,
+       (cmdline_parse_inst_t *)&cmd_config_e_tag_filter_add,
+       (cmdline_parse_inst_t *)&cmd_config_e_tag_filter_del,
+       (cmdline_parse_inst_t *)&cmd_set_vf_vlan_anti_spoof,
+       (cmdline_parse_inst_t *)&cmd_set_vf_mac_anti_spoof,
+       (cmdline_parse_inst_t *)&cmd_set_vf_vlan_stripq,
+       (cmdline_parse_inst_t *)&cmd_set_vf_vlan_insert,
+       (cmdline_parse_inst_t *)&cmd_set_tx_loopback,
+       (cmdline_parse_inst_t *)&cmd_set_all_queues_drop_en,
+       (cmdline_parse_inst_t *)&cmd_set_vf_split_drop_en,
+       (cmdline_parse_inst_t *)&cmd_set_macsec_offload_on,
+       (cmdline_parse_inst_t *)&cmd_set_macsec_offload_off,
+       (cmdline_parse_inst_t *)&cmd_set_macsec_sc,
+       (cmdline_parse_inst_t *)&cmd_set_macsec_sa,
+       (cmdline_parse_inst_t *)&cmd_set_vf_traffic,
+       (cmdline_parse_inst_t *)&cmd_set_vf_rxmode,
+       (cmdline_parse_inst_t *)&cmd_vf_rate_limit,
+       (cmdline_parse_inst_t *)&cmd_vf_rxvlan_filter,
+       (cmdline_parse_inst_t *)&cmd_set_vf_mac_addr,
+       (cmdline_parse_inst_t *)&cmd_set_vf_promisc,
+       (cmdline_parse_inst_t *)&cmd_set_vf_allmulti,
+       (cmdline_parse_inst_t *)&cmd_set_vf_broadcast,
+       (cmdline_parse_inst_t *)&cmd_set_vf_vlan_tag,
+       (cmdline_parse_inst_t *)&cmd_vf_max_bw,
+       (cmdline_parse_inst_t *)&cmd_vf_tc_min_bw,
+       (cmdline_parse_inst_t *)&cmd_vf_tc_max_bw,
+       (cmdline_parse_inst_t *)&cmd_strict_link_prio,
+       (cmdline_parse_inst_t *)&cmd_tc_min_bw,
+#if defined RTE_LIBRTE_PMD_SOFTNIC && defined RTE_LIBRTE_SCHED
+       (cmdline_parse_inst_t *)&cmd_set_port_tm_hierarchy_default,
+#endif
+       (cmdline_parse_inst_t *)&cmd_ddp_add,
+       (cmdline_parse_inst_t *)&cmd_ddp_del,
+       (cmdline_parse_inst_t *)&cmd_ddp_get_list,
+       (cmdline_parse_inst_t *)&cmd_ddp_get_info,
+       (cmdline_parse_inst_t *)&cmd_cfg_input_set,
+       (cmdline_parse_inst_t *)&cmd_clear_input_set,
+       (cmdline_parse_inst_t *)&cmd_show_vf_stats,
+       (cmdline_parse_inst_t *)&cmd_clear_vf_stats,
+       (cmdline_parse_inst_t *)&cmd_ptype_mapping_get,
+       (cmdline_parse_inst_t *)&cmd_ptype_mapping_replace,
+       (cmdline_parse_inst_t *)&cmd_ptype_mapping_reset,
+       (cmdline_parse_inst_t *)&cmd_ptype_mapping_update,
+
+       (cmdline_parse_inst_t *)&cmd_pctype_mapping_get,
+       (cmdline_parse_inst_t *)&cmd_pctype_mapping_reset,
+       (cmdline_parse_inst_t *)&cmd_pctype_mapping_update,
+       (cmdline_parse_inst_t *)&cmd_queue_region,
+       (cmdline_parse_inst_t *)&cmd_region_flowtype,
+       (cmdline_parse_inst_t *)&cmd_user_priority_region,
+       (cmdline_parse_inst_t *)&cmd_flush_queue_region,
+       (cmdline_parse_inst_t *)&cmd_show_queue_region_info_all,
+       (cmdline_parse_inst_t *)&cmd_show_port_tm_cap,
+       (cmdline_parse_inst_t *)&cmd_show_port_tm_level_cap,
+       (cmdline_parse_inst_t *)&cmd_show_port_tm_node_cap,
+       (cmdline_parse_inst_t *)&cmd_show_port_tm_node_type,
+       (cmdline_parse_inst_t *)&cmd_show_port_tm_node_stats,
+       (cmdline_parse_inst_t *)&cmd_add_port_tm_node_shaper_profile,
+       (cmdline_parse_inst_t *)&cmd_del_port_tm_node_shaper_profile,
+       (cmdline_parse_inst_t *)&cmd_add_port_tm_node_shared_shaper,
+       (cmdline_parse_inst_t *)&cmd_del_port_tm_node_shared_shaper,
+       (cmdline_parse_inst_t *)&cmd_add_port_tm_node_wred_profile,
+       (cmdline_parse_inst_t *)&cmd_del_port_tm_node_wred_profile,
+       (cmdline_parse_inst_t *)&cmd_set_port_tm_node_shaper_profile,
+       (cmdline_parse_inst_t *)&cmd_add_port_tm_nonleaf_node,
+       (cmdline_parse_inst_t *)&cmd_add_port_tm_leaf_node,
+       (cmdline_parse_inst_t *)&cmd_del_port_tm_node,
+       (cmdline_parse_inst_t *)&cmd_set_port_tm_node_parent,
+       (cmdline_parse_inst_t *)&cmd_port_tm_hierarchy_commit,
+       NULL,
+};
+
+/* read cmdline commands from file */
+void
+cmdline_read_from_file(const char *filename)
+{
+       struct cmdline *cl;
+
+       cl = cmdline_file_new(main_ctx, "testpmd> ", filename);
+       if (cl == NULL) {
+               printf("Failed to create file based cmdline context: %s\n",
+                      filename);
+               return;
+       }
+
+       cmdline_interact(cl);
+       cmdline_quit(cl);
+
+       cmdline_free(cl);
+
+       printf("Read CLI commands from %s\n", filename);
+}
+
 /* prompt function, called from main on MASTER lcore */
 void
 prompt(void)
@@ -10784,7 +16324,7 @@ cmd_reconfig_device_queue(portid_t id, uint8_t dev, uint8_t queue)
        if (id == (portid_t)RTE_PORT_ALL) {
                portid_t pid;
 
-               FOREACH_PORT(pid, ports) {
+               RTE_ETH_FOREACH_DEV(pid) {
                        /* check if need_reconfig has been set to 1 */
                        if (ports[pid].need_reconfig == 0)
                                ports[pid].need_reconfig = dev;