net: add rte prefix to ether structures
[dpdk.git] / app / test-pmd / cmdline.c
index 276c751..90e3502 100644 (file)
@@ -44,7 +44,6 @@
 #include <rte_ethdev.h>
 #include <rte_string_fns.h>
 #include <rte_devargs.h>
-#include <rte_eth_ctrl.h>
 #include <rte_flow.h>
 #include <rte_gro.h>
 
@@ -75,6 +74,7 @@
 #include "testpmd.h"
 #include "cmdline_mtr.h"
 #include "cmdline_tm.h"
+#include "bpf_cmd.h"
 
 static struct cmdline *testpmd_cl;
 
@@ -93,14 +93,15 @@ static void cmd_help_brief_parsed(__attribute__((unused)) void *parsed_result,
                cl,
                "\n"
                "Help is available for the following sections:\n\n"
-               "    help control    : Start and stop forwarding.\n"
-               "    help display    : Displaying port, stats and config "
+               "    help control                    : Start and stop forwarding.\n"
+               "    help display                    : Displaying port, stats and config "
                "information.\n"
-               "    help config     : Configuration information.\n"
-               "    help ports      : Configuring ports.\n"
-               "    help registers  : Reading and setting port registers.\n"
-               "    help filters    : Filters configuration help.\n"
-               "    help all        : All of the above sections.\n\n"
+               "    help config                     : Configuration information.\n"
+               "    help ports                      : Configuring ports.\n"
+               "    help registers                  : Reading and setting port registers.\n"
+               "    help filters                    : Filters configuration help.\n"
+               "    help traffic_management         : Traffic Management commmands.\n"
+               "    help all                        : All of the above sections.\n\n"
        );
 
 }
@@ -166,7 +167,7 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "Display:\n"
                        "--------\n\n"
 
-                       "show port (info|stats|xstats|fdir|stat_qmap|dcb_tc|cap) (port_id|all)\n"
+                       "show port (info|stats|summary|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"
@@ -174,11 +175,8 @@ static void cmd_help_long_parsed(void *parsed_result,
                        " by masks on port X. size is used to indicate the"
                        " hardware supported reta size\n\n"
 
-                       "show port 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]\n"
-                       "    Display the RSS hash functions and RSS hash key"
-                       " of port X\n\n"
+                       "show port (port_id) rss-hash [key]\n"
+                       "    Display the RSS hash functions and RSS hash key of port\n\n"
 
                        "clear port (info|stats|xstats|fdir|stat_qmap) (port_id|all)\n"
                        "    Clear information for port_id, or all.\n\n"
@@ -212,21 +210,32 @@ static void cmd_help_long_parsed(void *parsed_result,
 
                        "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 fwd stats all\n"
+                       "    Display statistics for all fwd engines.\n\n"
 
-                        "show port tm node cap (port_id) (node_id)\n"
-                        "       Display the port TM node capability.\n\n"
+                       "clear fwd stats all\n"
+                       "    Clear statistics for all fwd engines.\n\n"
 
-                        "show port tm node type (port_id) (node_id)\n"
-                        "       Display the port TM node type.\n\n"
+                       "show port (port_id) rx_offload capabilities\n"
+                       "    List all per queue and per port Rx offloading"
+                       " capabilities of a port\n\n"
 
-                        "show port tm node stats (port_id) (node_id) (clear)\n"
-                        "       Display the port TM node stats.\n\n"
+                       "show port (port_id) rx_offload configuration\n"
+                       "    List port level and all queue level"
+                       " Rx offloading configuration\n\n"
 
+                       "show port (port_id) tx_offload capabilities\n"
+                       "    List all per queue and per port"
+                       " Tx offloading capabilities of a port\n\n"
+
+                       "show port (port_id) tx_offload configuration\n"
+                       "    List port level and all queue level"
+                       " Tx offloading configuration\n\n"
+
+                       "show port (port_id) tx_metadata\n"
+                       "    Show Tx metadata value set"
+                       " for a specific port\n\n"
                );
        }
 
@@ -282,6 +291,9 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "set portlist (x[,y]*)\n"
                        "    Set the list of forwarding ports.\n\n"
 
+                       "set port setup on (iterator|event)\n"
+                       "    Select how attached port is retrieved for setup.\n\n"
+
                        "set tx loopback (port_id) (on|off)\n"
                        "    Enable or disable tx loopback.\n\n"
 
@@ -370,12 +382,12 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "filtered for VF(s) from port_id.\n\n"
 
                        "tunnel_filter add (port_id) (outer_mac) (inner_mac) (ip_addr) "
-                       "(inner_vlan) (vxlan|nvgre|ipingre) (imac-ivlan|imac-ivlan-tenid|"
+                       "(inner_vlan) (vxlan|nvgre|ipingre|vxlan-gpe) (imac-ivlan|imac-ivlan-tenid|"
                        "imac-tenid|imac|omac-imac-tenid|oip|iip) (tenant_id) (queue_id)\n"
                        "   add a tunnel filter of a port.\n\n"
 
                        "tunnel_filter rm (port_id) (outer_mac) (inner_mac) (ip_addr) "
-                       "(inner_vlan) (vxlan|nvgre|ipingre) (imac-ivlan|imac-ivlan-tenid|"
+                       "(inner_vlan) (vxlan|nvgre|ipingre|vxlan-gpe) (imac-ivlan|imac-ivlan-tenid|"
                        "imac-tenid|imac|omac-imac-tenid|oip|iip) (tenant_id) (queue_id)\n"
                        "   remove a tunnel filter of a port.\n\n"
 
@@ -396,12 +408,13 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "    Disable hardware insertion of a VLAN header in"
                        " packets sent on a port.\n\n"
 
-                       "csum set (ip|udp|tcp|sctp|outer-ip) (hw|sw) (port_id)\n"
+                       "csum set (ip|udp|tcp|sctp|outer-ip|outer-udp) (hw|sw) (port_id)\n"
                        "    Select hardware or software calculation of the"
                        " checksum when transmitting a packet using the"
                        " csum forward engine.\n"
                        "    ip|udp|tcp|sctp always concern the inner layer.\n"
                        "    outer-ip concerns the outer IP layer in"
+                       "    outer-udp concerns the outer UDP layer in"
                        " case the packet is recognized as a tunnel packet by"
                        " the forward engine (vxlan, gre and ipip are supported)\n"
                        "    Please check the NIC datasheet for HW limits.\n\n"
@@ -640,11 +653,6 @@ 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"
 
@@ -725,54 +733,32 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "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"
+                       "vxlan ip-version (ipv4|ipv6) vni (vni) udp-src"
+                       " (udp-src) udp-dst (udp-dst) ip-src (ip-src) ip-dst"
+                       " (ip-dst) eth-src (eth-src) eth-dst (eth-dst)\n"
+                       "       Configure the VXLAN encapsulation for flows.\n\n"
+
+                       "vxlan-with-vlan ip-version (ipv4|ipv6) vni (vni)"
+                       " udp-src (udp-src) udp-dst (udp-dst) ip-src (ip-src)"
+                       " ip-dst (ip-dst) vlan-tci (vlan-tci) eth-src (eth-src)"
+                       " eth-dst (eth-dst)\n"
+                       "       Configure the VXLAN encapsulation for flows.\n\n"
+
+                       "vxlan-tos-ttl ip-version (ipv4|ipv6) vni (vni) udp-src"
+                       " (udp-src) udp-dst (udp-dst) ip-tos (ip-tos) ip-ttl (ip-ttl)"
+                       " ip-src (ip-src) ip-dst (ip-dst) eth-src (eth-src)"
+                       " eth-dst (eth-dst)\n"
+                       "       Configure the VXLAN encapsulation for flows.\n\n"
+
+                       "nvgre ip-version (ipv4|ipv6) tni (tni) ip-src"
+                       " (ip-src) ip-dst (ip-dst) eth-src (eth-src) eth-dst"
+                       " (eth-dst)\n"
+                       "       Configure the NVGRE encapsulation for flows.\n\n"
+
+                       "nvgre-with-vlan ip-version (ipv4|ipv6) tni (tni)"
+                       " ip-src (ip-src) ip-dst (ip-dst) vlan-tci (vlan-tci)"
+                       " eth-src (eth-src) eth-dst (eth-dst)\n"
+                       "       Configure the NVGRE encapsulation for flows.\n\n"
 
                        , list_pkt_forwarding_modes()
                );
@@ -822,7 +808,7 @@ static void cmd_help_long_parsed(void *parsed_result,
                        " for ports.\n\n"
 
                        "port config all rss (all|default|ip|tcp|udp|sctp|"
-                       "ether|port|vxlan|geneve|nvgre|none|<flowtype_id>)\n"
+                       "ether|port|vxlan|geneve|nvgre|vxlan-gpe|none|<flowtype_id>)\n"
                        "    Set the RSS mode.\n\n"
 
                        "port config port-id rss reta (hash,queue)[,(hash,queue)]\n"
@@ -846,10 +832,19 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "port config mtu X value\n"
                        "    Set the MTU of port X to a given value\n\n"
 
+                       "port config (port_id) (rxq|txq) (queue_id) ring_size (value)\n"
+                       "    Set a rx/tx queue's ring size configuration, the new"
+                       " value will take effect after command that (re-)start the port"
+                       " or command that setup the specific queue\n\n"
+
                        "port (port_id) (rxq|txq) (queue_id) (start|stop)\n"
                        "    Start/stop a rx/tx queue of port X. Only take effect"
                        " when port X is started\n\n"
 
+                       "port (port_id) (rxq|txq) (queue_id) deferred_start (on|off)\n"
+                       "    Switch on/off a deferred start of port X rx/tx queue. Only"
+                       " take effect when port X is stopped.\n\n"
+
                        "port (port_id) (rxq|txq) (queue_id) setup\n"
                        "    Setup a rx/tx queue of port X.\n\n"
 
@@ -876,6 +871,55 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "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"
+
+                       "port config (port_id) udp_tunnel_port add|rm vxlan|geneve (udp_port)\n\n"
+                       "    Add/remove UDP tunnel port for tunneling offload\n\n"
+
+                       "port config <port_id> rx_offload vlan_strip|"
+                       "ipv4_cksum|udp_cksum|tcp_cksum|tcp_lro|qinq_strip|"
+                       "outer_ipv4_cksum|macsec_strip|header_split|"
+                       "vlan_filter|vlan_extend|jumbo_frame|crc_strip|"
+                       "scatter|timestamp|security|keep_crc on|off\n"
+                       "     Enable or disable a per port Rx offloading"
+                       " on all Rx queues of a port\n\n"
+
+                       "port (port_id) rxq (queue_id) rx_offload vlan_strip|"
+                       "ipv4_cksum|udp_cksum|tcp_cksum|tcp_lro|qinq_strip|"
+                       "outer_ipv4_cksum|macsec_strip|header_split|"
+                       "vlan_filter|vlan_extend|jumbo_frame|crc_strip|"
+                       "scatter|timestamp|security|keep_crc on|off\n"
+                       "    Enable or disable a per queue Rx offloading"
+                       " only on a specific Rx queue\n\n"
+
+                       "port config (port_id) tx_offload vlan_insert|"
+                       "ipv4_cksum|udp_cksum|tcp_cksum|sctp_cksum|tcp_tso|"
+                       "udp_tso|outer_ipv4_cksum|qinq_insert|vxlan_tnl_tso|"
+                       "gre_tnl_tso|ipip_tnl_tso|geneve_tnl_tso|"
+                       "macsec_insert|mt_lockfree|multi_segs|mbuf_fast_free|"
+                       "security|match_metadata on|off\n"
+                       "    Enable or disable a per port Tx offloading"
+                       " on all Tx queues of a port\n\n"
+
+                       "port (port_id) txq (queue_id) tx_offload vlan_insert|"
+                       "ipv4_cksum|udp_cksum|tcp_cksum|sctp_cksum|tcp_tso|"
+                       "udp_tso|outer_ipv4_cksum|qinq_insert|vxlan_tnl_tso|"
+                       "gre_tnl_tso|ipip_tnl_tso|geneve_tnl_tso|macsec_insert"
+                       "|mt_lockfree|multi_segs|mbuf_fast_free|security"
+                       " on|off\n"
+                       "    Enable or disable a per queue Tx offloading"
+                       " only on a specific Tx queue\n\n"
+
+                       "bpf-load rx|tx (port) (queue) (J|M|B) (file_name)\n"
+                       "    Load an eBPF program as a callback"
+                       " for particular RX/TX queue\n\n"
+
+                       "bpf-unload rx|tx (port) (queue)\n"
+                       "    Unload previously loaded eBPF program"
+                       " for particular RX/TX queue\n\n"
+
+                       "port config (port_id) tx_metadata (value)\n"
+                       "    Set Tx metadata value per port. Testpmd will add this value"
+                       " to any Tx packet sent from this port\n\n"
                );
        }
 
@@ -1095,6 +1139,107 @@ static void cmd_help_long_parsed(void *parsed_result,
                        " flow rules\n\n"
                );
        }
+
+       if (show_all || !strcmp(res->section, "traffic_management")) {
+               cmdline_printf(
+                       cl,
+                       "\n"
+                       "Traffic Management:\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"
+
+#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
+
+                       "add port tm node shaper profile (port_id) (shaper_profile_id)"
+                       " (cmit_tb_rate) (cmit_tb_size) (peak_tb_rate) (peak_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"
+
+                       "suspend port tm node (port_id) (node_id)"
+                       "       Suspend tm node.\n\n"
+
+                       "resume port tm node (port_id) (node_id)"
+                       "       Resume tm node.\n\n"
+
+                       "port tm hierarchy commit (port_id) (clean_on_fail)\n"
+                       "       Commit tm hierarchy.\n\n"
+
+                       "set port tm mark ip_ecn (port) (green) (yellow)"
+                       " (red)\n"
+                       "    Enables/Disables the traffic management marking"
+                       " for IP ECN (Explicit Congestion Notification)"
+                       " packets on a given port\n\n"
+
+                       "set port tm mark ip_dscp (port) (green) (yellow)"
+                       " (red)\n"
+                       "    Enables/Disables the traffic management marking"
+                       " on the port for IP dscp packets\n\n"
+
+                       "set port tm mark vlan_dei (port) (green) (yellow)"
+                       " (red)\n"
+                       "    Enables/Disables the traffic management marking"
+                       " on the port for VLAN packets with DEI enabled\n\n"
+               );
+       }
+
 }
 
 cmdline_parse_token_string_t cmd_help_long_help =
@@ -1103,12 +1248,13 @@ cmdline_parse_token_string_t cmd_help_long_help =
 cmdline_parse_token_string_t cmd_help_long_section =
        TOKEN_STRING_INITIALIZER(struct cmd_help_long_result, section,
                        "all#control#display#config#"
-                       "ports#registers#filters");
+                       "ports#registers#filters#traffic_management");
 
 cmdline_parse_inst_t cmd_help_long = {
        .f = cmd_help_long_parsed,
        .data = NULL,
-       .help_str = "help all|control|display|config|ports|register|filters: "
+       .help_str = "help all|control|display|config|ports|register|"
+               "filters|traffic_management: "
                "Show help",
        .tokens = {
                (void *)&cmd_help_long_help,
@@ -1211,6 +1357,59 @@ cmdline_parse_inst_t cmd_operate_specific_port = {
        },
 };
 
+/* *** enable port setup (after attach) via iterator or event *** */
+struct cmd_set_port_setup_on_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t port;
+       cmdline_fixed_string_t setup;
+       cmdline_fixed_string_t on;
+       cmdline_fixed_string_t mode;
+};
+
+static void cmd_set_port_setup_on_parsed(void *parsed_result,
+                               __attribute__((unused)) struct cmdline *cl,
+                               __attribute__((unused)) void *data)
+{
+       struct cmd_set_port_setup_on_result *res = parsed_result;
+
+       if (strcmp(res->mode, "event") == 0)
+               setup_on_probe_event = true;
+       else if (strcmp(res->mode, "iterator") == 0)
+               setup_on_probe_event = false;
+       else
+               printf("Unknown mode\n");
+}
+
+cmdline_parse_token_string_t cmd_set_port_setup_on_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_port_setup_on_result,
+                       set, "set");
+cmdline_parse_token_string_t cmd_set_port_setup_on_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_port_setup_on_result,
+                       port, "port");
+cmdline_parse_token_string_t cmd_set_port_setup_on_setup =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_port_setup_on_result,
+                       setup, "setup");
+cmdline_parse_token_string_t cmd_set_port_setup_on_on =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_port_setup_on_result,
+                       on, "on");
+cmdline_parse_token_string_t cmd_set_port_setup_on_mode =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_port_setup_on_result,
+                       mode, "iterator#event");
+
+cmdline_parse_inst_t cmd_set_port_setup_on = {
+       .f = cmd_set_port_setup_on_parsed,
+       .data = NULL,
+       .help_str = "set port setup on iterator|event",
+       .tokens = {
+               (void *)&cmd_set_port_setup_on_set,
+               (void *)&cmd_set_port_setup_on_port,
+               (void *)&cmd_set_port_setup_on_setup,
+               (void *)&cmd_set_port_setup_on_on,
+               (void *)&cmd_set_port_setup_on_mode,
+               NULL,
+       },
+};
+
 /* *** attach a specified port *** */
 struct cmd_operate_attach_port_result {
        cmdline_fixed_string_t port;
@@ -1267,7 +1466,7 @@ static void cmd_operate_detach_port_parsed(void *parsed_result,
        struct cmd_operate_detach_port_result *res = parsed_result;
 
        if (!strcmp(res->keyword, "detach"))
-               detach_port(res->port_id);
+               detach_port_device(res->port_id);
        else
                printf("Unknown parameter\n");
 }
@@ -1861,11 +2060,11 @@ cmd_config_rx_mode_flag_parsed(void *parsed_result,
                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 {
+                       if (!strcmp(res->value, "on")) {
+                               rx_offloads &= ~DEV_RX_OFFLOAD_KEEP_CRC;
+                       } else if (!strcmp(res->value, "off")) {
+                               rx_offloads |= DEV_RX_OFFLOAD_KEEP_CRC;
+                       else {
                                printf("Unknown parameter\n");
                                return;
                        }
@@ -2002,6 +2201,8 @@ cmd_config_rss_parsed(void *parsed_result,
        struct cmd_config_rss *res = parsed_result;
        struct rte_eth_rss_conf rss_conf = { .rss_key_len = 0, };
        struct rte_eth_dev_info dev_info = { .flow_type_rss_offloads = 0, };
+       int use_default = 0;
+       int all_updated = 1;
        int diag;
        uint16_t i;
 
@@ -2027,8 +2228,10 @@ cmd_config_rss_parsed(void *parsed_result,
                rss_conf.rss_hf = ETH_RSS_GENEVE;
        else if (!strcmp(res->value, "nvgre"))
                rss_conf.rss_hf = ETH_RSS_NVGRE;
-       else if (!strcmp(res->value, "none") || !strcmp(res->value, "default"))
+       else if (!strcmp(res->value, "none"))
                rss_conf.rss_hf = 0;
+       else if (!strcmp(res->value, "default"))
+               use_default = 1;
        else if (isdigit(res->value[0]) && atoi(res->value) > 0 &&
                                                atoi(res->value) < 64)
                rss_conf.rss_hf = 1ULL << atoi(res->value);
@@ -2038,18 +2241,31 @@ cmd_config_rss_parsed(void *parsed_result,
        }
        rss_conf.rss_key = NULL;
        /* Update global configuration for RSS types. */
-       rss_hf = rss_conf.rss_hf;
        RTE_ETH_FOREACH_DEV(i) {
-               if (!strcmp(res->value, "default")) {
-                       rte_eth_dev_info_get(i, &dev_info);
+               struct rte_eth_rss_conf local_rss_conf;
+
+               rte_eth_dev_info_get(i, &dev_info);
+               if (use_default)
                        rss_conf.rss_hf = dev_info.flow_type_rss_offloads;
+
+               local_rss_conf = rss_conf;
+               local_rss_conf.rss_hf = rss_conf.rss_hf &
+                       dev_info.flow_type_rss_offloads;
+               if (local_rss_conf.rss_hf != rss_conf.rss_hf) {
+                       printf("Port %u modified RSS hash function based on hardware support,"
+                               "requested:%#"PRIx64" configured:%#"PRIx64"\n",
+                               i, rss_conf.rss_hf, local_rss_conf.rss_hf);
                }
-               diag = rte_eth_dev_rss_hash_update(i, &rss_conf);
-               if (diag < 0)
+               diag = rte_eth_dev_rss_hash_update(i, &local_rss_conf);
+               if (diag < 0) {
+                       all_updated = 0;
                        printf("Configuration of RSS hash at ethernet port %d "
                                "failed with error (%d): %s.\n",
                                i, -diag, strerror(-diag));
+               }
        }
+       if (all_updated && !use_default)
+               rss_hf = rss_conf.rss_hf;
 }
 
 cmdline_parse_token_string_t cmd_config_rss_port =
@@ -2067,7 +2283,7 @@ cmdline_parse_inst_t cmd_config_rss = {
        .f = cmd_config_rss_parsed,
        .data = NULL,
        .help_str = "port config all rss "
-               "all|default|ip|tcp|udp|sctp|ether|port|vxlan|geneve|nvgre|none|<flowtype_id>",
+               "all|default|ip|tcp|udp|sctp|ether|port|vxlan|geneve|nvgre|vxlan-gpe|none|<flowtype_id>",
        .tokens = {
                (void *)&cmd_config_rss_port,
                (void *)&cmd_config_rss_keyword,
@@ -2196,6 +2412,102 @@ cmdline_parse_inst_t cmd_config_rss_hash_key = {
        },
 };
 
+/* *** configure port rxq/txq ring size *** */
+struct cmd_config_rxtx_ring_size {
+       cmdline_fixed_string_t port;
+       cmdline_fixed_string_t config;
+       portid_t portid;
+       cmdline_fixed_string_t rxtxq;
+       uint16_t qid;
+       cmdline_fixed_string_t rsize;
+       uint16_t size;
+};
+
+static void
+cmd_config_rxtx_ring_size_parsed(void *parsed_result,
+                                __attribute__((unused)) struct cmdline *cl,
+                                __attribute__((unused)) void *data)
+{
+       struct cmd_config_rxtx_ring_size *res = parsed_result;
+       struct rte_port *port;
+       uint8_t isrx;
+
+       if (port_id_is_invalid(res->portid, ENABLED_WARN))
+               return;
+
+       if (res->portid == (portid_t)RTE_PORT_ALL) {
+               printf("Invalid port id\n");
+               return;
+       }
+
+       port = &ports[res->portid];
+
+       if (!strcmp(res->rxtxq, "rxq"))
+               isrx = 1;
+       else if (!strcmp(res->rxtxq, "txq"))
+               isrx = 0;
+       else {
+               printf("Unknown parameter\n");
+               return;
+       }
+
+       if (isrx && rx_queue_id_is_invalid(res->qid))
+               return;
+       else if (!isrx && tx_queue_id_is_invalid(res->qid))
+               return;
+
+       if (isrx && res->size != 0 && res->size <= rx_free_thresh) {
+               printf("Invalid rx ring_size, must > rx_free_thresh: %d\n",
+                      rx_free_thresh);
+               return;
+       }
+
+       if (isrx)
+               port->nb_rx_desc[res->qid] = res->size;
+       else
+               port->nb_tx_desc[res->qid] = res->size;
+
+       cmd_reconfig_device_queue(res->portid, 0, 1);
+}
+
+cmdline_parse_token_string_t cmd_config_rxtx_ring_size_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_ring_size,
+                                port, "port");
+cmdline_parse_token_string_t cmd_config_rxtx_ring_size_config =
+       TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_ring_size,
+                                config, "config");
+cmdline_parse_token_num_t cmd_config_rxtx_ring_size_portid =
+       TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_ring_size,
+                                portid, UINT16);
+cmdline_parse_token_string_t cmd_config_rxtx_ring_size_rxtxq =
+       TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_ring_size,
+                                rxtxq, "rxq#txq");
+cmdline_parse_token_num_t cmd_config_rxtx_ring_size_qid =
+       TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_ring_size,
+                             qid, UINT16);
+cmdline_parse_token_string_t cmd_config_rxtx_ring_size_rsize =
+       TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_ring_size,
+                                rsize, "ring_size");
+cmdline_parse_token_num_t cmd_config_rxtx_ring_size_size =
+       TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_ring_size,
+                             size, UINT16);
+
+cmdline_parse_inst_t cmd_config_rxtx_ring_size = {
+       .f = cmd_config_rxtx_ring_size_parsed,
+       .data = NULL,
+       .help_str = "port config <port_id> rxq|txq <queue_id> ring_size <value>",
+       .tokens = {
+               (void *)&cmd_config_rxtx_ring_size_port,
+               (void *)&cmd_config_rxtx_ring_size_config,
+               (void *)&cmd_config_rxtx_ring_size_portid,
+               (void *)&cmd_config_rxtx_ring_size_rxtxq,
+               (void *)&cmd_config_rxtx_ring_size_qid,
+               (void *)&cmd_config_rxtx_ring_size_rsize,
+               (void *)&cmd_config_rxtx_ring_size_size,
+               NULL,
+       },
+};
+
 /* *** configure port rxq/txq start/stop *** */
 struct cmd_config_rxtx_queue {
        cmdline_fixed_string_t port;
@@ -2290,6 +2602,92 @@ cmdline_parse_inst_t cmd_config_rxtx_queue = {
        },
 };
 
+/* *** configure port rxq/txq deferred start on/off *** */
+struct cmd_config_deferred_start_rxtx_queue {
+       cmdline_fixed_string_t port;
+       portid_t port_id;
+       cmdline_fixed_string_t rxtxq;
+       uint16_t qid;
+       cmdline_fixed_string_t opname;
+       cmdline_fixed_string_t state;
+};
+
+static void
+cmd_config_deferred_start_rxtx_queue_parsed(void *parsed_result,
+                       __attribute__((unused)) struct cmdline *cl,
+                       __attribute__((unused)) void *data)
+{
+       struct cmd_config_deferred_start_rxtx_queue *res = parsed_result;
+       struct rte_port *port;
+       uint8_t isrx;
+       uint8_t ison;
+       uint8_t needreconfig = 0;
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+       if (port_is_started(res->port_id) != 0) {
+               printf("Please stop port %u first\n", res->port_id);
+               return;
+       }
+
+       port = &ports[res->port_id];
+
+       isrx = !strcmp(res->rxtxq, "rxq");
+
+       if (isrx && rx_queue_id_is_invalid(res->qid))
+               return;
+       else if (!isrx && tx_queue_id_is_invalid(res->qid))
+               return;
+
+       ison = !strcmp(res->state, "on");
+
+       if (isrx && port->rx_conf[res->qid].rx_deferred_start != ison) {
+               port->rx_conf[res->qid].rx_deferred_start = ison;
+               needreconfig = 1;
+       } else if (!isrx && port->tx_conf[res->qid].tx_deferred_start != ison) {
+               port->tx_conf[res->qid].tx_deferred_start = ison;
+               needreconfig = 1;
+       }
+
+       if (needreconfig)
+               cmd_reconfig_device_queue(res->port_id, 0, 1);
+}
+
+cmdline_parse_token_string_t cmd_config_deferred_start_rxtx_queue_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue,
+                                               port, "port");
+cmdline_parse_token_num_t cmd_config_deferred_start_rxtx_queue_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue,
+                                               port_id, UINT16);
+cmdline_parse_token_string_t cmd_config_deferred_start_rxtx_queue_rxtxq =
+       TOKEN_STRING_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue,
+                                               rxtxq, "rxq#txq");
+cmdline_parse_token_num_t cmd_config_deferred_start_rxtx_queue_qid =
+       TOKEN_NUM_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue,
+                                               qid, UINT16);
+cmdline_parse_token_string_t cmd_config_deferred_start_rxtx_queue_opname =
+       TOKEN_STRING_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue,
+                                               opname, "deferred_start");
+cmdline_parse_token_string_t cmd_config_deferred_start_rxtx_queue_state =
+       TOKEN_STRING_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue,
+                                               state, "on#off");
+
+cmdline_parse_inst_t cmd_config_deferred_start_rxtx_queue = {
+       .f = cmd_config_deferred_start_rxtx_queue_parsed,
+       .data = NULL,
+       .help_str = "port <port_id> rxq|txq <queue_id> deferred_start on|off",
+       .tokens = {
+               (void *)&cmd_config_deferred_start_rxtx_queue_port,
+               (void *)&cmd_config_deferred_start_rxtx_queue_port_id,
+               (void *)&cmd_config_deferred_start_rxtx_queue_rxtxq,
+               (void *)&cmd_config_deferred_start_rxtx_queue_qid,
+               (void *)&cmd_config_deferred_start_rxtx_queue_opname,
+               (void *)&cmd_config_deferred_start_rxtx_queue_state,
+               NULL,
+       },
+};
+
 /* *** configure port rxq/txq setup *** */
 struct cmd_setup_rxtx_queue {
        cmdline_fixed_string_t port;
@@ -2665,8 +3063,7 @@ static void cmd_showport_rss_hash_parsed(void *parsed_result,
 {
        struct cmd_showport_rss_hash *res = parsed_result;
 
-       port_rss_hash_conf_show(res->port_id, res->rss_type,
-                               show_rss_key != NULL);
+       port_rss_hash_conf_show(res->port_id, show_rss_key != NULL);
 }
 
 cmdline_parse_token_string_t cmd_showport_rss_hash_show =
@@ -2678,28 +3075,18 @@ cmdline_parse_token_num_t cmd_showport_rss_hash_port_id =
 cmdline_parse_token_string_t cmd_showport_rss_hash_rss_hash =
        TOKEN_STRING_INITIALIZER(struct cmd_showport_rss_hash, rss_hash,
                                 "rss-hash");
-cmdline_parse_token_string_t cmd_showport_rss_hash_rss_hash_info =
-       TOKEN_STRING_INITIALIZER(struct cmd_showport_rss_hash, rss_type,
-                                "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");
 cmdline_parse_token_string_t cmd_showport_rss_hash_rss_key =
        TOKEN_STRING_INITIALIZER(struct cmd_showport_rss_hash, key, "key");
 
 cmdline_parse_inst_t cmd_showport_rss_hash = {
        .f = cmd_showport_rss_hash_parsed,
        .data = NULL,
-       .help_str = "show port <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",
+       .help_str = "show port <port_id> rss-hash",
        .tokens = {
                (void *)&cmd_showport_rss_hash_show,
                (void *)&cmd_showport_rss_hash_port,
                (void *)&cmd_showport_rss_hash_port_id,
                (void *)&cmd_showport_rss_hash_rss_hash,
-               (void *)&cmd_showport_rss_hash_rss_hash_info,
                NULL,
        },
 };
@@ -2707,16 +3094,12 @@ 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 <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",
+       .help_str = "show port <port_id> rss-hash key",
        .tokens = {
                (void *)&cmd_showport_rss_hash_show,
                (void *)&cmd_showport_rss_hash_port,
                (void *)&cmd_showport_rss_hash_port_id,
                (void *)&cmd_showport_rss_hash_rss_hash,
-               (void *)&cmd_showport_rss_hash_rss_hash_info,
                (void *)&cmd_showport_rss_hash_rss_key,
                NULL,
        },
@@ -3938,6 +4321,8 @@ csum_show(int port_id)
                (tx_offloads & DEV_TX_OFFLOAD_SCTP_CKSUM) ? "hw" : "sw");
        printf("Outer-Ip checksum offload is %s\n",
                (tx_offloads & DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM) ? "hw" : "sw");
+       printf("Outer-Udp checksum offload is %s\n",
+               (tx_offloads & DEV_TX_OFFLOAD_OUTER_UDP_CKSUM) ? "hw" : "sw");
 
        /* display warnings if configuration is not supported by the NIC */
        rte_eth_dev_info_get(port_id, &dev_info);
@@ -3966,6 +4351,12 @@ csum_show(int port_id)
                printf("Warning: hardware outer IP checksum enabled but not "
                        "supported by port %d\n", port_id);
        }
+       if ((tx_offloads & DEV_TX_OFFLOAD_OUTER_UDP_CKSUM) &&
+               (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_OUTER_UDP_CKSUM)
+                       == 0) {
+               printf("Warning: hardware outer UDP checksum enabled but not "
+                       "supported by port %d\n", port_id);
+       }
 }
 
 static void
@@ -4034,6 +4425,15 @@ cmd_csum_parsed(void *parsed_result,
                                printf("Outer IP checksum offload is not "
                                       "supported by port %u\n", res->port_id);
                        }
+               } else if (!strcmp(res->proto, "outer-udp")) {
+                       if (hw == 0 || (dev_info.tx_offload_capa &
+                                       DEV_TX_OFFLOAD_OUTER_UDP_CKSUM)) {
+                               csum_offloads |=
+                                               DEV_TX_OFFLOAD_OUTER_UDP_CKSUM;
+                       } else {
+                               printf("Outer UDP checksum offload is not "
+                                      "supported by port %u\n", res->port_id);
+                       }
                }
 
                if (hw) {
@@ -4057,7 +4457,7 @@ cmdline_parse_token_string_t cmd_csum_mode =
                                mode, "set");
 cmdline_parse_token_string_t cmd_csum_proto =
        TOKEN_STRING_INITIALIZER(struct cmd_csum_result,
-                               proto, "ip#tcp#udp#sctp#outer-ip");
+                               proto, "ip#tcp#udp#sctp#outer-ip#outer-udp");
 cmdline_parse_token_string_t cmd_csum_hwsw =
        TOKEN_STRING_INITIALIZER(struct cmd_csum_result,
                                hwsw, "hw#sw");
@@ -4068,7 +4468,7 @@ cmdline_parse_token_num_t cmd_csum_portid =
 cmdline_parse_inst_t cmd_csum_set = {
        .f = cmd_csum_parsed,
        .data = NULL,
-       .help_str = "csum set ip|tcp|udp|sctp|outer-ip hw|sw <port_id>: "
+       .help_str = "csum set ip|tcp|udp|sctp|outer-ip|outer-udp hw|sw <port_id>: "
                "Enable/Disable hardware calculation of L3/L4 checksum when "
                "using csum forward engine",
        .tokens = {
@@ -4128,7 +4528,7 @@ cmdline_parse_token_string_t cmd_csum_tunnel_csum =
                                csum, "csum");
 cmdline_parse_token_string_t cmd_csum_tunnel_parse =
        TOKEN_STRING_INITIALIZER(struct cmd_csum_tunnel_result,
-                               parse, "parse_tunnel");
+                               parse, "parse-tunnel");
 cmdline_parse_token_string_t cmd_csum_tunnel_onoff =
        TOKEN_STRING_INITIALIZER(struct cmd_csum_tunnel_result,
                                onoff, "on#off");
@@ -4139,7 +4539,7 @@ cmdline_parse_token_num_t cmd_csum_tunnel_portid =
 cmdline_parse_inst_t cmd_csum_tunnel = {
        .f = cmd_csum_tunnel_parsed,
        .data = NULL,
-       .help_str = "csum parse_tunnel on|off <port_id>: "
+       .help_str = "csum parse-tunnel on|off <port_id>: "
                "Enable/Disable parsing of tunnels for csum engine",
        .tokens = {
                (void *)&cmd_csum_tunnel_csum,
@@ -4674,8 +5074,9 @@ cmd_gso_show_parsed(void *parsed_result,
                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",
+                                       "UDP/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);
@@ -5680,6 +6081,8 @@ static void cmd_create_bonded_device_parsed(void *parsed_result,
                nb_ports = rte_eth_dev_count_avail();
                reconfig(port_id, res->socket);
                rte_eth_promiscuous_enable(port_id);
+               ports[port_id].need_setup = 0;
+               ports[port_id].port_status = RTE_PORT_STOPPED;
        }
 
 }
@@ -5721,7 +6124,7 @@ struct cmd_set_bond_mac_addr_result {
        cmdline_fixed_string_t bonding;
        cmdline_fixed_string_t mac_addr;
        uint16_t port_num;
-       struct ether_addr address;
+       struct rte_ether_addr address;
 };
 
 static void cmd_set_bond_mac_addr_parsed(void *parsed_result,
@@ -6921,6 +7324,11 @@ static void cmd_showportall_parsed(void *parsed_result,
        } else if (!strcmp(res->what, "info"))
                RTE_ETH_FOREACH_DEV(i)
                        port_infos_display(i);
+       else if (!strcmp(res->what, "summary")) {
+               port_summary_header_display();
+               RTE_ETH_FOREACH_DEV(i)
+                       port_summary_display(i);
+       }
        else if (!strcmp(res->what, "stats"))
                RTE_ETH_FOREACH_DEV(i)
                        nic_stats_display(i);
@@ -6948,14 +7356,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#cap");
+                                "info#summary#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|cap all",
+               "info|summary|stats|xstats|fdir|stat_qmap|dcb_tc|cap all",
        .tokens = {
                (void *)&cmd_showportall_show,
                (void *)&cmd_showportall_port,
@@ -6985,6 +7393,10 @@ static void cmd_showport_parsed(void *parsed_result,
                        nic_xstats_clear(res->portnum);
        } else if (!strcmp(res->what, "info"))
                port_infos_display(res->portnum);
+       else if (!strcmp(res->what, "summary")) {
+               port_summary_header_display();
+               port_summary_display(res->portnum);
+       }
        else if (!strcmp(res->what, "stats"))
                nic_stats_display(res->portnum);
        else if (!strcmp(res->what, "xstats"))
@@ -7006,7 +7418,7 @@ 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#cap");
+                                "info#summary#stats#xstats#fdir#stat_qmap#dcb_tc#cap");
 cmdline_parse_token_num_t cmd_showport_portnum =
        TOKEN_NUM_INITIALIZER(struct cmd_showport_result, portnum, UINT16);
 
@@ -7014,7 +7426,7 @@ 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|cap "
+               "info|summary|stats|xstats|fdir|stat_qmap|dcb_tc|cap "
                "<port_id>",
        .tokens = {
                (void *)&cmd_showport_show,
@@ -7072,21 +7484,64 @@ cmdline_parse_inst_t cmd_showqueue = {
        },
 };
 
-/* *** READ PORT REGISTER *** */
-struct cmd_read_reg_result {
-       cmdline_fixed_string_t read;
-       cmdline_fixed_string_t reg;
-       portid_t port_id;
-       uint32_t reg_off;
+/* show/clear fwd engine statistics */
+struct fwd_result {
+       cmdline_fixed_string_t action;
+       cmdline_fixed_string_t fwd;
+       cmdline_fixed_string_t stats;
+       cmdline_fixed_string_t all;
 };
 
+cmdline_parse_token_string_t cmd_fwd_action =
+       TOKEN_STRING_INITIALIZER(struct fwd_result, action, "show#clear");
+cmdline_parse_token_string_t cmd_fwd_fwd =
+       TOKEN_STRING_INITIALIZER(struct fwd_result, fwd, "fwd");
+cmdline_parse_token_string_t cmd_fwd_stats =
+       TOKEN_STRING_INITIALIZER(struct fwd_result, stats, "stats");
+cmdline_parse_token_string_t cmd_fwd_all =
+       TOKEN_STRING_INITIALIZER(struct fwd_result, all, "all");
+
 static void
-cmd_read_reg_parsed(void *parsed_result,
-                   __attribute__((unused)) struct cmdline *cl,
-                   __attribute__((unused)) void *data)
+cmd_showfwdall_parsed(void *parsed_result,
+                     __rte_unused struct cmdline *cl,
+                     __rte_unused void *data)
 {
-       struct cmd_read_reg_result *res = parsed_result;
-       port_reg_display(res->port_id, res->reg_off);
+       struct fwd_result *res = parsed_result;
+
+       if (!strcmp(res->action, "show"))
+               fwd_stats_display();
+       else
+               fwd_stats_reset();
+}
+
+static cmdline_parse_inst_t cmd_showfwdall = {
+       .f = cmd_showfwdall_parsed,
+       .data = NULL,
+       .help_str = "show|clear fwd stats all",
+       .tokens = {
+               (void *)&cmd_fwd_action,
+               (void *)&cmd_fwd_fwd,
+               (void *)&cmd_fwd_stats,
+               (void *)&cmd_fwd_all,
+               NULL,
+       },
+};
+
+/* *** READ PORT REGISTER *** */
+struct cmd_read_reg_result {
+       cmdline_fixed_string_t read;
+       cmdline_fixed_string_t reg;
+       portid_t port_id;
+       uint32_t reg_off;
+};
+
+static void
+cmd_read_reg_parsed(void *parsed_result,
+                   __attribute__((unused)) struct cmdline *cl,
+                   __attribute__((unused)) void *data)
+{
+       struct cmd_read_reg_result *res = parsed_result;
+       port_reg_display(res->port_id, res->reg_off);
 }
 
 cmdline_parse_token_string_t cmd_read_reg_read =
@@ -7421,7 +7876,6 @@ static void cmd_quit_parsed(__attribute__((unused)) void *parsed_result,
                            struct cmdline *cl,
                            __attribute__((unused)) void *data)
 {
-       pmd_test_exit();
        cmdline_quit(cl);
 }
 
@@ -7443,7 +7897,7 @@ struct cmd_mac_addr_result {
        cmdline_fixed_string_t mac_addr_cmd;
        cmdline_fixed_string_t what;
        uint16_t port_num;
-       struct ether_addr address;
+       struct rte_ether_addr address;
 };
 
 static void cmd_mac_addr_parsed(void *parsed_result,
@@ -7642,7 +8096,7 @@ struct cmd_set_uc_hash_table {
        cmdline_fixed_string_t port;
        portid_t port_id;
        cmdline_fixed_string_t what;
-       struct ether_addr address;
+       struct rte_ether_addr address;
        cmdline_fixed_string_t mode;
 };
 
@@ -7766,7 +8220,7 @@ struct cmd_set_vf_macvlan_filter {
        portid_t port_id;
        cmdline_fixed_string_t vf;
        uint8_t vf_id;
-       struct ether_addr address;
+       struct rte_ether_addr address;
        cmdline_fixed_string_t filter_type;
        cmdline_fixed_string_t mode;
 };
@@ -8025,7 +8479,7 @@ struct cmd_vf_mac_addr_result {
        uint16_t port_num;
        cmdline_fixed_string_t vf;
        uint8_t vf_num;
-       struct ether_addr address;
+       struct rte_ether_addr address;
 };
 
 static void cmd_vf_mac_addr_parsed(void *parsed_result,
@@ -8338,8 +8792,8 @@ struct cmd_tunnel_filter_result {
        cmdline_fixed_string_t cmd;
        cmdline_fixed_string_t what;
        portid_t port_id;
-       struct ether_addr outer_mac;
-       struct ether_addr inner_mac;
+       struct rte_ether_addr outer_mac;
+       struct rte_ether_addr inner_mac;
        cmdline_ipaddr_t ip_value;
        uint16_t inner_vlan;
        cmdline_fixed_string_t tunnel_type;
@@ -8397,6 +8851,8 @@ cmd_tunnel_filter_parsed(void *parsed_result,
 
        if (!strcmp(res->tunnel_type, "vxlan"))
                tunnel_filter_conf.tunnel_type = RTE_TUNNEL_TYPE_VXLAN;
+       else if (!strcmp(res->tunnel_type, "vxlan-gpe"))
+               tunnel_filter_conf.tunnel_type = RTE_TUNNEL_TYPE_VXLAN_GPE;
        else if (!strcmp(res->tunnel_type, "nvgre"))
                tunnel_filter_conf.tunnel_type = RTE_TUNNEL_TYPE_NVGRE;
        else if (!strcmp(res->tunnel_type, "ipingre"))
@@ -8446,7 +8902,7 @@ cmdline_parse_token_ipaddr_t cmd_tunnel_filter_ip_value =
        ip_value);
 cmdline_parse_token_string_t cmd_tunnel_filter_tunnel_type =
        TOKEN_STRING_INITIALIZER(struct cmd_tunnel_filter_result,
-       tunnel_type, "vxlan#nvgre#ipingre");
+       tunnel_type, "vxlan#nvgre#ipingre#vxlan-gpe");
 
 cmdline_parse_token_string_t cmd_tunnel_filter_filter_type =
        TOKEN_STRING_INITIALIZER(struct cmd_tunnel_filter_result,
@@ -8542,6 +8998,91 @@ cmdline_parse_inst_t cmd_tunnel_udp_config = {
        },
 };
 
+struct cmd_config_tunnel_udp_port {
+       cmdline_fixed_string_t port;
+       cmdline_fixed_string_t config;
+       portid_t port_id;
+       cmdline_fixed_string_t udp_tunnel_port;
+       cmdline_fixed_string_t action;
+       cmdline_fixed_string_t tunnel_type;
+       uint16_t udp_port;
+};
+
+static void
+cmd_cfg_tunnel_udp_port_parsed(void *parsed_result,
+                              __attribute__((unused)) struct cmdline *cl,
+                              __attribute__((unused)) void *data)
+{
+       struct cmd_config_tunnel_udp_port *res = parsed_result;
+       struct rte_eth_udp_tunnel tunnel_udp;
+       int ret = 0;
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+       tunnel_udp.udp_port = res->udp_port;
+
+       if (!strcmp(res->tunnel_type, "vxlan")) {
+               tunnel_udp.prot_type = RTE_TUNNEL_TYPE_VXLAN;
+       } else if (!strcmp(res->tunnel_type, "geneve")) {
+               tunnel_udp.prot_type = RTE_TUNNEL_TYPE_GENEVE;
+       } else if (!strcmp(res->tunnel_type, "vxlan-gpe")) {
+               tunnel_udp.prot_type = RTE_TUNNEL_TYPE_VXLAN_GPE;
+       } else {
+               printf("Invalid tunnel type\n");
+               return;
+       }
+
+       if (!strcmp(res->action, "add"))
+               ret = rte_eth_dev_udp_tunnel_port_add(res->port_id,
+                                                     &tunnel_udp);
+       else
+               ret = rte_eth_dev_udp_tunnel_port_delete(res->port_id,
+                                                        &tunnel_udp);
+
+       if (ret < 0)
+               printf("udp tunneling port add error: (%s)\n", strerror(-ret));
+}
+
+cmdline_parse_token_string_t cmd_config_tunnel_udp_port_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_config_tunnel_udp_port, port,
+                                "port");
+cmdline_parse_token_string_t cmd_config_tunnel_udp_port_config =
+       TOKEN_STRING_INITIALIZER(struct cmd_config_tunnel_udp_port, config,
+                                "config");
+cmdline_parse_token_num_t cmd_config_tunnel_udp_port_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_config_tunnel_udp_port, port_id,
+                             UINT16);
+cmdline_parse_token_string_t cmd_config_tunnel_udp_port_tunnel_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_config_tunnel_udp_port,
+                                udp_tunnel_port,
+                                "udp_tunnel_port");
+cmdline_parse_token_string_t cmd_config_tunnel_udp_port_action =
+       TOKEN_STRING_INITIALIZER(struct cmd_config_tunnel_udp_port, action,
+                                "add#rm");
+cmdline_parse_token_string_t cmd_config_tunnel_udp_port_tunnel_type =
+       TOKEN_STRING_INITIALIZER(struct cmd_config_tunnel_udp_port, tunnel_type,
+                                "vxlan#geneve#vxlan-gpe");
+cmdline_parse_token_num_t cmd_config_tunnel_udp_port_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_config_tunnel_udp_port, udp_port,
+                             UINT16);
+
+cmdline_parse_inst_t cmd_cfg_tunnel_udp_port = {
+       .f = cmd_cfg_tunnel_udp_port_parsed,
+       .data = NULL,
+       .help_str = "port config <port_id> udp_tunnel_port add|rm vxlan|geneve|vxlan-gpe <udp_port>",
+       .tokens = {
+               (void *)&cmd_config_tunnel_udp_port_port,
+               (void *)&cmd_config_tunnel_udp_port_config,
+               (void *)&cmd_config_tunnel_udp_port_port_id,
+               (void *)&cmd_config_tunnel_udp_port_tunnel_port,
+               (void *)&cmd_config_tunnel_udp_port_action,
+               (void *)&cmd_config_tunnel_udp_port_tunnel_type,
+               (void *)&cmd_config_tunnel_udp_port_value,
+               NULL,
+       },
+};
+
 /* *** GLOBAL CONFIG *** */
 struct cmd_global_config_result {
        cmdline_fixed_string_t cmd;
@@ -10042,7 +10583,7 @@ struct cmd_ethertype_filter_result {
        portid_t port_id;
        cmdline_fixed_string_t ops;
        cmdline_fixed_string_t mac;
-       struct ether_addr mac_addr;
+       struct rte_ether_addr mac_addr;
        cmdline_fixed_string_t ethertype;
        uint16_t ethertype_value;
        cmdline_fixed_string_t drop;
@@ -10102,7 +10643,7 @@ cmd_ethertype_filter_parsed(void *parsed_result,
        if (!strcmp(res->mac, "mac_addr")) {
                filter.flags |= RTE_ETHTYPE_FLAGS_MAC;
                rte_memcpy(&filter.mac_addr, &res->mac_addr,
-                       sizeof(struct ether_addr));
+                       sizeof(struct rte_ether_addr));
        }
        if (!strcmp(res->drop, "drop"))
                filter.flags |= RTE_ETHTYPE_FLAGS_DROP;
@@ -10181,7 +10722,7 @@ struct cmd_flow_director_result {
        cmdline_fixed_string_t fd_id;
        uint32_t  fd_id_value;
        cmdline_fixed_string_t mac;
-       struct ether_addr mac_addr;
+       struct rte_ether_addr mac_addr;
        cmdline_fixed_string_t tunnel;
        cmdline_fixed_string_t tunnel_type;
        cmdline_fixed_string_t tunnel_id;
@@ -10484,12 +11025,12 @@ cmd_flow_director_filter_parsed(void *parsed_result,
        if (fdir_conf.mode ==  RTE_FDIR_MODE_PERFECT_MAC_VLAN)
                rte_memcpy(&entry.input.flow.mac_vlan_flow.mac_addr,
                                 &res->mac_addr,
-                                sizeof(struct ether_addr));
+                                sizeof(struct rte_ether_addr));
 
        if (fdir_conf.mode ==  RTE_FDIR_MODE_PERFECT_TUNNEL) {
                rte_memcpy(&entry.input.flow.tunnel_flow.mac_addr,
                                 &res->mac_addr,
-                                sizeof(struct ether_addr));
+                                sizeof(struct rte_ether_addr));
                entry.input.flow.tunnel_flow.tunnel_type =
                        str2fdir_tunneltype(res->tunnel_type);
                entry.input.flow.tunnel_flow.tunnel_id =
@@ -11543,6 +12084,7 @@ flowtype_to_str(uint16_t ftype)
                {"vxlan", RTE_ETH_FLOW_VXLAN},
                {"geneve", RTE_ETH_FLOW_GENEVE},
                {"nvgre", RTE_ETH_FLOW_NVGRE},
+               {"vxlan-gpe", RTE_ETH_FLOW_VXLAN_GPE},
        };
 
        for (i = 0; i < RTE_DIM(ftype_table); i++) {
@@ -11680,7 +12222,7 @@ cmd_set_hash_global_config_parsed(void *parsed_result,
                                                        res->port_id);
        else
                printf("Global hash configurations have been set "
-                       "succcessfully by port %d\n", res->port_id);
+                       "successfully by port %d\n", res->port_id);
 }
 
 cmdline_parse_token_string_t cmd_set_hash_global_config_all =
@@ -11921,7 +12463,7 @@ struct cmd_mcast_addr_result {
        cmdline_fixed_string_t mcast_addr_cmd;
        cmdline_fixed_string_t what;
        uint16_t port_num;
-       struct ether_addr mc_addr;
+       struct rte_ether_addr mc_addr;
 };
 
 static void cmd_mcast_addr_parsed(void *parsed_result,
@@ -13340,7 +13882,7 @@ struct cmd_set_vf_mac_addr_result {
        cmdline_fixed_string_t addr;
        portid_t port_id;
        uint16_t vf_id;
-       struct ether_addr mac_addr;
+       struct rte_ether_addr mac_addr;
 
 };
 
@@ -13645,7 +14187,7 @@ struct cmd_macsec_sc_result {
        cmdline_fixed_string_t sc;
        cmdline_fixed_string_t tx_rx;
        portid_t port_id;
-       struct ether_addr mac;
+       struct rte_ether_addr mac;
        uint16_t pi;
 };
 
@@ -14605,20 +15147,14 @@ static void cmd_set_port_tm_hierarchy_default_parsed(void *parsed_result,
 
        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");
+       if (strcmp(cur_fwd_config.fwd_eng->fwd_mode_name, "softnic")) {
+               printf("  softnicfwd mode not enabled(error)\n");
                return;
        }
 
        /* Set the default tm hierarchy */
-       p->softport.tm.default_hierarchy_enable = 1;
+       p->softport.default_tm_hierarchy_enable = 1;
 }
 
 cmdline_parse_inst_t cmd_set_port_tm_hierarchy_default = {
@@ -14637,207 +15173,1206 @@ cmdline_parse_inst_t cmd_set_port_tm_hierarchy_default = {
 };
 #endif
 
-/* Strict link priority scheduling mode setting */
-static void
-cmd_strict_link_prio_parsed(
-       void *parsed_result,
+/** Set VXLAN encapsulation details */
+struct cmd_set_vxlan_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t vxlan;
+       cmdline_fixed_string_t pos_token;
+       cmdline_fixed_string_t ip_version;
+       uint32_t vlan_present:1;
+       uint32_t vni;
+       uint16_t udp_src;
+       uint16_t udp_dst;
+       cmdline_ipaddr_t ip_src;
+       cmdline_ipaddr_t ip_dst;
+       uint16_t tci;
+       uint8_t tos;
+       uint8_t ttl;
+       struct rte_ether_addr eth_src;
+       struct rte_ether_addr eth_dst;
+};
+
+cmdline_parse_token_string_t cmd_set_vxlan_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, set, "set");
+cmdline_parse_token_string_t cmd_set_vxlan_vxlan =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, vxlan, "vxlan");
+cmdline_parse_token_string_t cmd_set_vxlan_vxlan_tos_ttl =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, vxlan,
+                                "vxlan-tos-ttl");
+cmdline_parse_token_string_t cmd_set_vxlan_vxlan_with_vlan =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, vxlan,
+                                "vxlan-with-vlan");
+cmdline_parse_token_string_t cmd_set_vxlan_ip_version =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
+                                "ip-version");
+cmdline_parse_token_string_t cmd_set_vxlan_ip_version_value =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, ip_version,
+                                "ipv4#ipv6");
+cmdline_parse_token_string_t cmd_set_vxlan_vni =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
+                                "vni");
+cmdline_parse_token_num_t cmd_set_vxlan_vni_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, vni, UINT32);
+cmdline_parse_token_string_t cmd_set_vxlan_udp_src =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
+                                "udp-src");
+cmdline_parse_token_num_t cmd_set_vxlan_udp_src_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, udp_src, UINT16);
+cmdline_parse_token_string_t cmd_set_vxlan_udp_dst =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
+                                "udp-dst");
+cmdline_parse_token_num_t cmd_set_vxlan_udp_dst_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, udp_dst, UINT16);
+cmdline_parse_token_string_t cmd_set_vxlan_ip_tos =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
+                                "ip-tos");
+cmdline_parse_token_num_t cmd_set_vxlan_ip_tos_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, tos, UINT8);
+cmdline_parse_token_string_t cmd_set_vxlan_ip_ttl =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
+                                "ip-ttl");
+cmdline_parse_token_num_t cmd_set_vxlan_ip_ttl_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, ttl, UINT8);
+cmdline_parse_token_string_t cmd_set_vxlan_ip_src =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
+                                "ip-src");
+cmdline_parse_token_ipaddr_t cmd_set_vxlan_ip_src_value =
+       TOKEN_IPADDR_INITIALIZER(struct cmd_set_vxlan_result, ip_src);
+cmdline_parse_token_string_t cmd_set_vxlan_ip_dst =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
+                                "ip-dst");
+cmdline_parse_token_ipaddr_t cmd_set_vxlan_ip_dst_value =
+       TOKEN_IPADDR_INITIALIZER(struct cmd_set_vxlan_result, ip_dst);
+cmdline_parse_token_string_t cmd_set_vxlan_vlan =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
+                                "vlan-tci");
+cmdline_parse_token_num_t cmd_set_vxlan_vlan_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, tci, UINT16);
+cmdline_parse_token_string_t cmd_set_vxlan_eth_src =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
+                                "eth-src");
+cmdline_parse_token_etheraddr_t cmd_set_vxlan_eth_src_value =
+       TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_vxlan_result, eth_src);
+cmdline_parse_token_string_t cmd_set_vxlan_eth_dst =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
+                                "eth-dst");
+cmdline_parse_token_etheraddr_t cmd_set_vxlan_eth_dst_value =
+       TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_vxlan_result, eth_dst);
+
+static void cmd_set_vxlan_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;
+       struct cmd_set_vxlan_result *res = parsed_result;
+       union {
+               uint32_t vxlan_id;
+               uint8_t vni[4];
+       } id = {
+               .vxlan_id = rte_cpu_to_be_32(res->vni) & RTE_BE32(0x00ffffff),
+       };
 
-       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+       vxlan_encap_conf.select_tos_ttl = 0;
+       if (strcmp(res->vxlan, "vxlan") == 0)
+               vxlan_encap_conf.select_vlan = 0;
+       else if (strcmp(res->vxlan, "vxlan-with-vlan") == 0)
+               vxlan_encap_conf.select_vlan = 1;
+       else if (strcmp(res->vxlan, "vxlan-tos-ttl") == 0) {
+               vxlan_encap_conf.select_vlan = 0;
+               vxlan_encap_conf.select_tos_ttl = 1;
+       }
+       if (strcmp(res->ip_version, "ipv4") == 0)
+               vxlan_encap_conf.select_ipv4 = 1;
+       else if (strcmp(res->ip_version, "ipv6") == 0)
+               vxlan_encap_conf.select_ipv4 = 0;
+       else
                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));
+       rte_memcpy(vxlan_encap_conf.vni, &id.vni[1], 3);
+       vxlan_encap_conf.udp_src = rte_cpu_to_be_16(res->udp_src);
+       vxlan_encap_conf.udp_dst = rte_cpu_to_be_16(res->udp_dst);
+       vxlan_encap_conf.ip_tos = res->tos;
+       vxlan_encap_conf.ip_ttl = res->ttl;
+       if (vxlan_encap_conf.select_ipv4) {
+               IPV4_ADDR_TO_UINT(res->ip_src, vxlan_encap_conf.ipv4_src);
+               IPV4_ADDR_TO_UINT(res->ip_dst, vxlan_encap_conf.ipv4_dst);
+       } else {
+               IPV6_ADDR_TO_ARRAY(res->ip_src, vxlan_encap_conf.ipv6_src);
+               IPV6_ADDR_TO_ARRAY(res->ip_dst, vxlan_encap_conf.ipv6_dst);
        }
+       if (vxlan_encap_conf.select_vlan)
+               vxlan_encap_conf.vlan_tci = rte_cpu_to_be_16(res->tci);
+       rte_memcpy(vxlan_encap_conf.eth_src, res->eth_src.addr_bytes,
+                  ETHER_ADDR_LEN);
+       rte_memcpy(vxlan_encap_conf.eth_dst, res->eth_dst.addr_bytes,
+                  ETHER_ADDR_LEN);
 }
 
-cmdline_parse_inst_t cmd_strict_link_prio = {
-       .f = cmd_strict_link_prio_parsed,
+cmdline_parse_inst_t cmd_set_vxlan = {
+       .f = cmd_set_vxlan_parsed,
        .data = NULL,
-       .help_str = "set tx strict-link-priority <port_id> <tc_bitmap>",
+       .help_str = "set vxlan ip-version ipv4|ipv6 vni <vni> udp-src"
+               " <udp-src> udp-dst <udp-dst> ip-src <ip-src> ip-dst <ip-dst>"
+               " eth-src <eth-src> eth-dst <eth-dst>",
        .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,
+               (void *)&cmd_set_vxlan_set,
+               (void *)&cmd_set_vxlan_vxlan,
+               (void *)&cmd_set_vxlan_ip_version,
+               (void *)&cmd_set_vxlan_ip_version_value,
+               (void *)&cmd_set_vxlan_vni,
+               (void *)&cmd_set_vxlan_vni_value,
+               (void *)&cmd_set_vxlan_udp_src,
+               (void *)&cmd_set_vxlan_udp_src_value,
+               (void *)&cmd_set_vxlan_udp_dst,
+               (void *)&cmd_set_vxlan_udp_dst_value,
+               (void *)&cmd_set_vxlan_ip_src,
+               (void *)&cmd_set_vxlan_ip_src_value,
+               (void *)&cmd_set_vxlan_ip_dst,
+               (void *)&cmd_set_vxlan_ip_dst_value,
+               (void *)&cmd_set_vxlan_eth_src,
+               (void *)&cmd_set_vxlan_eth_src_value,
+               (void *)&cmd_set_vxlan_eth_dst,
+               (void *)&cmd_set_vxlan_eth_dst_value,
                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_inst_t cmd_set_vxlan_tos_ttl = {
+       .f = cmd_set_vxlan_parsed,
+       .data = NULL,
+       .help_str = "set vxlan-tos-ttl ip-version ipv4|ipv6 vni <vni> udp-src"
+               " <udp-src> udp-dst <udp-dst> ip-tos <ip-tos> ip-ttl <ip-ttl>"
+               " ip-src <ip-src> ip-dst <ip-dst> eth-src <eth-src>"
+               " eth-dst <eth-dst>",
+       .tokens = {
+               (void *)&cmd_set_vxlan_set,
+               (void *)&cmd_set_vxlan_vxlan_tos_ttl,
+               (void *)&cmd_set_vxlan_ip_version,
+               (void *)&cmd_set_vxlan_ip_version_value,
+               (void *)&cmd_set_vxlan_vni,
+               (void *)&cmd_set_vxlan_vni_value,
+               (void *)&cmd_set_vxlan_udp_src,
+               (void *)&cmd_set_vxlan_udp_src_value,
+               (void *)&cmd_set_vxlan_udp_dst,
+               (void *)&cmd_set_vxlan_udp_dst_value,
+               (void *)&cmd_set_vxlan_ip_tos,
+               (void *)&cmd_set_vxlan_ip_tos_value,
+               (void *)&cmd_set_vxlan_ip_ttl,
+               (void *)&cmd_set_vxlan_ip_ttl_value,
+               (void *)&cmd_set_vxlan_ip_src,
+               (void *)&cmd_set_vxlan_ip_src_value,
+               (void *)&cmd_set_vxlan_ip_dst,
+               (void *)&cmd_set_vxlan_ip_dst_value,
+               (void *)&cmd_set_vxlan_eth_src,
+               (void *)&cmd_set_vxlan_eth_src_value,
+               (void *)&cmd_set_vxlan_eth_dst,
+               (void *)&cmd_set_vxlan_eth_dst_value,
+               NULL,
+       },
 };
 
-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);
+cmdline_parse_inst_t cmd_set_vxlan_with_vlan = {
+       .f = cmd_set_vxlan_parsed,
+       .data = NULL,
+       .help_str = "set vxlan-with-vlan ip-version ipv4|ipv6 vni <vni>"
+               " udp-src <udp-src> udp-dst <udp-dst> ip-src <ip-src> ip-dst"
+               " <ip-dst> vlan-tci <vlan-tci> eth-src <eth-src> eth-dst"
+               " <eth-dst>",
+       .tokens = {
+               (void *)&cmd_set_vxlan_set,
+               (void *)&cmd_set_vxlan_vxlan_with_vlan,
+               (void *)&cmd_set_vxlan_ip_version,
+               (void *)&cmd_set_vxlan_ip_version_value,
+               (void *)&cmd_set_vxlan_vni,
+               (void *)&cmd_set_vxlan_vni_value,
+               (void *)&cmd_set_vxlan_udp_src,
+               (void *)&cmd_set_vxlan_udp_src_value,
+               (void *)&cmd_set_vxlan_udp_dst,
+               (void *)&cmd_set_vxlan_udp_dst_value,
+               (void *)&cmd_set_vxlan_ip_src,
+               (void *)&cmd_set_vxlan_ip_src_value,
+               (void *)&cmd_set_vxlan_ip_dst,
+               (void *)&cmd_set_vxlan_ip_dst_value,
+               (void *)&cmd_set_vxlan_vlan,
+               (void *)&cmd_set_vxlan_vlan_value,
+               (void *)&cmd_set_vxlan_eth_src,
+               (void *)&cmd_set_vxlan_eth_src_value,
+               (void *)&cmd_set_vxlan_eth_dst,
+               (void *)&cmd_set_vxlan_eth_dst_value,
+               NULL,
+       },
+};
 
-static void
-cmd_ddp_add_parsed(
-       void *parsed_result,
+/** Set NVGRE encapsulation details */
+struct cmd_set_nvgre_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t nvgre;
+       cmdline_fixed_string_t pos_token;
+       cmdline_fixed_string_t ip_version;
+       uint32_t tni;
+       cmdline_ipaddr_t ip_src;
+       cmdline_ipaddr_t ip_dst;
+       uint16_t tci;
+       struct rte_ether_addr eth_src;
+       struct rte_ether_addr eth_dst;
+};
+
+cmdline_parse_token_string_t cmd_set_nvgre_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, set, "set");
+cmdline_parse_token_string_t cmd_set_nvgre_nvgre =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, nvgre, "nvgre");
+cmdline_parse_token_string_t cmd_set_nvgre_nvgre_with_vlan =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, nvgre,
+                                "nvgre-with-vlan");
+cmdline_parse_token_string_t cmd_set_nvgre_ip_version =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token,
+                                "ip-version");
+cmdline_parse_token_string_t cmd_set_nvgre_ip_version_value =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, ip_version,
+                                "ipv4#ipv6");
+cmdline_parse_token_string_t cmd_set_nvgre_tni =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token,
+                                "tni");
+cmdline_parse_token_num_t cmd_set_nvgre_tni_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_nvgre_result, tni, UINT32);
+cmdline_parse_token_string_t cmd_set_nvgre_ip_src =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token,
+                                "ip-src");
+cmdline_parse_token_num_t cmd_set_nvgre_ip_src_value =
+       TOKEN_IPADDR_INITIALIZER(struct cmd_set_nvgre_result, ip_src);
+cmdline_parse_token_string_t cmd_set_nvgre_ip_dst =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token,
+                                "ip-dst");
+cmdline_parse_token_ipaddr_t cmd_set_nvgre_ip_dst_value =
+       TOKEN_IPADDR_INITIALIZER(struct cmd_set_nvgre_result, ip_dst);
+cmdline_parse_token_string_t cmd_set_nvgre_vlan =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token,
+                                "vlan-tci");
+cmdline_parse_token_num_t cmd_set_nvgre_vlan_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_nvgre_result, tci, UINT16);
+cmdline_parse_token_string_t cmd_set_nvgre_eth_src =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token,
+                                "eth-src");
+cmdline_parse_token_etheraddr_t cmd_set_nvgre_eth_src_value =
+       TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_nvgre_result, eth_src);
+cmdline_parse_token_string_t cmd_set_nvgre_eth_dst =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token,
+                                "eth-dst");
+cmdline_parse_token_etheraddr_t cmd_set_nvgre_eth_dst_value =
+       TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_nvgre_result, eth_dst);
+
+static void cmd_set_nvgre_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 (!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, ',');
+       struct cmd_set_nvgre_result *res = parsed_result;
+       union {
+               uint32_t nvgre_tni;
+               uint8_t tni[4];
+       } id = {
+               .nvgre_tni = rte_cpu_to_be_32(res->tni) & RTE_BE32(0x00ffffff),
+       };
 
-       buff = open_file(file_fld[0], &size);
-       if (!buff) {
-               free((void *)filepath);
+       if (strcmp(res->nvgre, "nvgre") == 0)
+               nvgre_encap_conf.select_vlan = 0;
+       else if (strcmp(res->nvgre, "nvgre-with-vlan") == 0)
+               nvgre_encap_conf.select_vlan = 1;
+       if (strcmp(res->ip_version, "ipv4") == 0)
+               nvgre_encap_conf.select_ipv4 = 1;
+       else if (strcmp(res->ip_version, "ipv6") == 0)
+               nvgre_encap_conf.select_ipv4 = 0;
+       else
                return;
+       rte_memcpy(nvgre_encap_conf.tni, &id.tni[1], 3);
+       if (nvgre_encap_conf.select_ipv4) {
+               IPV4_ADDR_TO_UINT(res->ip_src, nvgre_encap_conf.ipv4_src);
+               IPV4_ADDR_TO_UINT(res->ip_dst, nvgre_encap_conf.ipv4_dst);
+       } else {
+               IPV6_ADDR_TO_ARRAY(res->ip_src, nvgre_encap_conf.ipv6_src);
+               IPV6_ADDR_TO_ARRAY(res->ip_dst, nvgre_encap_conf.ipv6_dst);
        }
-
-#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);
+       if (nvgre_encap_conf.select_vlan)
+               nvgre_encap_conf.vlan_tci = rte_cpu_to_be_16(res->tci);
+       rte_memcpy(nvgre_encap_conf.eth_src, res->eth_src.addr_bytes,
+                  ETHER_ADDR_LEN);
+       rte_memcpy(nvgre_encap_conf.eth_dst, res->eth_dst.addr_bytes,
+                  ETHER_ADDR_LEN);
 }
 
-cmdline_parse_inst_t cmd_ddp_add = {
-       .f = cmd_ddp_add_parsed,
+cmdline_parse_inst_t cmd_set_nvgre = {
+       .f = cmd_set_nvgre_parsed,
        .data = NULL,
-       .help_str = "ddp add <port_id> <profile_path[,backup_profile_path]>",
+       .help_str = "set nvgre ip-version <ipv4|ipv6> tni <tni> ip-src"
+               " <ip-src> ip-dst <ip-dst> eth-src <eth-src>"
+               " eth-dst <eth-dst>",
        .tokens = {
-               (void *)&cmd_ddp_add_ddp,
-               (void *)&cmd_ddp_add_add,
-               (void *)&cmd_ddp_add_port_id,
-               (void *)&cmd_ddp_add_filepath,
+               (void *)&cmd_set_nvgre_set,
+               (void *)&cmd_set_nvgre_nvgre,
+               (void *)&cmd_set_nvgre_ip_version,
+               (void *)&cmd_set_nvgre_ip_version_value,
+               (void *)&cmd_set_nvgre_tni,
+               (void *)&cmd_set_nvgre_tni_value,
+               (void *)&cmd_set_nvgre_ip_src,
+               (void *)&cmd_set_nvgre_ip_src_value,
+               (void *)&cmd_set_nvgre_ip_dst,
+               (void *)&cmd_set_nvgre_ip_dst_value,
+               (void *)&cmd_set_nvgre_eth_src,
+               (void *)&cmd_set_nvgre_eth_src_value,
+               (void *)&cmd_set_nvgre_eth_dst,
+               (void *)&cmd_set_nvgre_eth_dst_value,
                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_inst_t cmd_set_nvgre_with_vlan = {
+       .f = cmd_set_nvgre_parsed,
+       .data = NULL,
+       .help_str = "set nvgre-with-vlan ip-version <ipv4|ipv6> tni <tni>"
+               " ip-src <ip-src> ip-dst <ip-dst> vlan-tci <vlan-tci>"
+               " eth-src <eth-src> eth-dst <eth-dst>",
+       .tokens = {
+               (void *)&cmd_set_nvgre_set,
+               (void *)&cmd_set_nvgre_nvgre_with_vlan,
+               (void *)&cmd_set_nvgre_ip_version,
+               (void *)&cmd_set_nvgre_ip_version_value,
+               (void *)&cmd_set_nvgre_tni,
+               (void *)&cmd_set_nvgre_tni_value,
+               (void *)&cmd_set_nvgre_ip_src,
+               (void *)&cmd_set_nvgre_ip_src_value,
+               (void *)&cmd_set_nvgre_ip_dst,
+               (void *)&cmd_set_nvgre_ip_dst_value,
+               (void *)&cmd_set_nvgre_vlan,
+               (void *)&cmd_set_nvgre_vlan_value,
+               (void *)&cmd_set_nvgre_eth_src,
+               (void *)&cmd_set_nvgre_eth_src_value,
+               (void *)&cmd_set_nvgre_eth_dst,
+               (void *)&cmd_set_nvgre_eth_dst_value,
+               NULL,
+       },
 };
 
-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,
+/** Set L2 encapsulation details */
+struct cmd_set_l2_encap_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t l2_encap;
+       cmdline_fixed_string_t pos_token;
+       cmdline_fixed_string_t ip_version;
+       uint32_t vlan_present:1;
+       uint16_t tci;
+       struct rte_ether_addr eth_src;
+       struct rte_ether_addr eth_dst;
+};
+
+cmdline_parse_token_string_t cmd_set_l2_encap_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_l2_encap_result, set, "set");
+cmdline_parse_token_string_t cmd_set_l2_encap_l2_encap =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_l2_encap_result, l2_encap, "l2_encap");
+cmdline_parse_token_string_t cmd_set_l2_encap_l2_encap_with_vlan =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_l2_encap_result, l2_encap,
+                                "l2_encap-with-vlan");
+cmdline_parse_token_string_t cmd_set_l2_encap_ip_version =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_l2_encap_result, pos_token,
+                                "ip-version");
+cmdline_parse_token_string_t cmd_set_l2_encap_ip_version_value =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_l2_encap_result, ip_version,
+                                "ipv4#ipv6");
+cmdline_parse_token_string_t cmd_set_l2_encap_vlan =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_l2_encap_result, pos_token,
+                                "vlan-tci");
+cmdline_parse_token_num_t cmd_set_l2_encap_vlan_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_l2_encap_result, tci, UINT16);
+cmdline_parse_token_string_t cmd_set_l2_encap_eth_src =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_l2_encap_result, pos_token,
+                                "eth-src");
+cmdline_parse_token_etheraddr_t cmd_set_l2_encap_eth_src_value =
+       TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_l2_encap_result, eth_src);
+cmdline_parse_token_string_t cmd_set_l2_encap_eth_dst =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_l2_encap_result, pos_token,
+                                "eth-dst");
+cmdline_parse_token_etheraddr_t cmd_set_l2_encap_eth_dst_value =
+       TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_l2_encap_result, eth_dst);
+
+static void cmd_set_l2_encap_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 (!all_ports_stopped()) {
-               printf("Please stop all ports first\n");
-               return;
-       }
-
-       buff = open_file(res->filepath, &size);
-       if (!buff)
+       struct cmd_set_l2_encap_result *res = parsed_result;
+
+       if (strcmp(res->l2_encap, "l2_encap") == 0)
+               l2_encap_conf.select_vlan = 0;
+       else if (strcmp(res->l2_encap, "l2_encap-with-vlan") == 0)
+               l2_encap_conf.select_vlan = 1;
+       if (strcmp(res->ip_version, "ipv4") == 0)
+               l2_encap_conf.select_ipv4 = 1;
+       else if (strcmp(res->ip_version, "ipv6") == 0)
+               l2_encap_conf.select_ipv4 = 0;
+       else
                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);
+       if (l2_encap_conf.select_vlan)
+               l2_encap_conf.vlan_tci = rte_cpu_to_be_16(res->tci);
+       rte_memcpy(l2_encap_conf.eth_src, res->eth_src.addr_bytes,
+                  ETHER_ADDR_LEN);
+       rte_memcpy(l2_encap_conf.eth_dst, res->eth_dst.addr_bytes,
+                  ETHER_ADDR_LEN);
 }
 
-cmdline_parse_inst_t cmd_ddp_del = {
-       .f = cmd_ddp_del_parsed,
+cmdline_parse_inst_t cmd_set_l2_encap = {
+       .f = cmd_set_l2_encap_parsed,
        .data = NULL,
-       .help_str = "ddp del <port_id> <backup_profile_path>",
+       .help_str = "set l2_encap ip-version ipv4|ipv6"
+               " eth-src <eth-src> eth-dst <eth-dst>",
        .tokens = {
-               (void *)&cmd_ddp_del_ddp,
-               (void *)&cmd_ddp_del_del,
-               (void *)&cmd_ddp_del_port_id,
-               (void *)&cmd_ddp_del_filepath,
+               (void *)&cmd_set_l2_encap_set,
+               (void *)&cmd_set_l2_encap_l2_encap,
+               (void *)&cmd_set_l2_encap_ip_version,
+               (void *)&cmd_set_l2_encap_ip_version_value,
+               (void *)&cmd_set_l2_encap_eth_src,
+               (void *)&cmd_set_l2_encap_eth_src_value,
+               (void *)&cmd_set_l2_encap_eth_dst,
+               (void *)&cmd_set_l2_encap_eth_dst_value,
                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_inst_t cmd_set_l2_encap_with_vlan = {
+       .f = cmd_set_l2_encap_parsed,
+       .data = NULL,
+       .help_str = "set l2_encap-with-vlan ip-version ipv4|ipv6"
+               " vlan-tci <vlan-tci> eth-src <eth-src> eth-dst <eth-dst>",
+       .tokens = {
+               (void *)&cmd_set_l2_encap_set,
+               (void *)&cmd_set_l2_encap_l2_encap_with_vlan,
+               (void *)&cmd_set_l2_encap_ip_version,
+               (void *)&cmd_set_l2_encap_ip_version_value,
+               (void *)&cmd_set_l2_encap_vlan,
+               (void *)&cmd_set_l2_encap_vlan_value,
+               (void *)&cmd_set_l2_encap_eth_src,
+               (void *)&cmd_set_l2_encap_eth_src_value,
+               (void *)&cmd_set_l2_encap_eth_dst,
+               (void *)&cmd_set_l2_encap_eth_dst_value,
+               NULL,
+       },
+};
+
+/** Set L2 decapsulation details */
+struct cmd_set_l2_decap_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t l2_decap;
+       cmdline_fixed_string_t pos_token;
+       uint32_t vlan_present:1;
+};
+
+cmdline_parse_token_string_t cmd_set_l2_decap_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_l2_decap_result, set, "set");
+cmdline_parse_token_string_t cmd_set_l2_decap_l2_decap =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_l2_decap_result, l2_decap,
+                                "l2_decap");
+cmdline_parse_token_string_t cmd_set_l2_decap_l2_decap_with_vlan =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_l2_decap_result, l2_decap,
+                                "l2_decap-with-vlan");
+
+static void cmd_set_l2_decap_parsed(void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_set_l2_decap_result *res = parsed_result;
+
+       if (strcmp(res->l2_decap, "l2_decap") == 0)
+               l2_decap_conf.select_vlan = 0;
+       else if (strcmp(res->l2_decap, "l2_decap-with-vlan") == 0)
+               l2_decap_conf.select_vlan = 1;
+}
+
+cmdline_parse_inst_t cmd_set_l2_decap = {
+       .f = cmd_set_l2_decap_parsed,
+       .data = NULL,
+       .help_str = "set l2_decap",
+       .tokens = {
+               (void *)&cmd_set_l2_decap_set,
+               (void *)&cmd_set_l2_decap_l2_decap,
+               NULL,
+       },
+};
+
+cmdline_parse_inst_t cmd_set_l2_decap_with_vlan = {
+       .f = cmd_set_l2_decap_parsed,
+       .data = NULL,
+       .help_str = "set l2_decap-with-vlan",
+       .tokens = {
+               (void *)&cmd_set_l2_decap_set,
+               (void *)&cmd_set_l2_decap_l2_decap_with_vlan,
+               NULL,
+       },
+};
+
+/** Set MPLSoGRE encapsulation details */
+struct cmd_set_mplsogre_encap_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t mplsogre;
+       cmdline_fixed_string_t pos_token;
+       cmdline_fixed_string_t ip_version;
+       uint32_t vlan_present:1;
+       uint32_t label;
+       cmdline_ipaddr_t ip_src;
+       cmdline_ipaddr_t ip_dst;
+       uint16_t tci;
+       struct rte_ether_addr eth_src;
+       struct rte_ether_addr eth_dst;
+};
+
+cmdline_parse_token_string_t cmd_set_mplsogre_encap_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_encap_result, set,
+                                "set");
+cmdline_parse_token_string_t cmd_set_mplsogre_encap_mplsogre_encap =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_encap_result, mplsogre,
+                                "mplsogre_encap");
+cmdline_parse_token_string_t cmd_set_mplsogre_encap_mplsogre_encap_with_vlan =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_encap_result,
+                                mplsogre, "mplsogre_encap-with-vlan");
+cmdline_parse_token_string_t cmd_set_mplsogre_encap_ip_version =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_encap_result,
+                                pos_token, "ip-version");
+cmdline_parse_token_string_t cmd_set_mplsogre_encap_ip_version_value =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_encap_result,
+                                ip_version, "ipv4#ipv6");
+cmdline_parse_token_string_t cmd_set_mplsogre_encap_label =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_encap_result,
+                                pos_token, "label");
+cmdline_parse_token_num_t cmd_set_mplsogre_encap_label_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_mplsogre_encap_result, label,
+                             UINT32);
+cmdline_parse_token_string_t cmd_set_mplsogre_encap_ip_src =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_encap_result,
+                                pos_token, "ip-src");
+cmdline_parse_token_ipaddr_t cmd_set_mplsogre_encap_ip_src_value =
+       TOKEN_IPADDR_INITIALIZER(struct cmd_set_mplsogre_encap_result, ip_src);
+cmdline_parse_token_string_t cmd_set_mplsogre_encap_ip_dst =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_encap_result,
+                                pos_token, "ip-dst");
+cmdline_parse_token_ipaddr_t cmd_set_mplsogre_encap_ip_dst_value =
+       TOKEN_IPADDR_INITIALIZER(struct cmd_set_mplsogre_encap_result, ip_dst);
+cmdline_parse_token_string_t cmd_set_mplsogre_encap_vlan =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_encap_result,
+                                pos_token, "vlan-tci");
+cmdline_parse_token_num_t cmd_set_mplsogre_encap_vlan_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_mplsogre_encap_result, tci,
+                             UINT16);
+cmdline_parse_token_string_t cmd_set_mplsogre_encap_eth_src =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_encap_result,
+                                pos_token, "eth-src");
+cmdline_parse_token_etheraddr_t cmd_set_mplsogre_encap_eth_src_value =
+       TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_mplsogre_encap_result,
+                                   eth_src);
+cmdline_parse_token_string_t cmd_set_mplsogre_encap_eth_dst =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_encap_result,
+                                pos_token, "eth-dst");
+cmdline_parse_token_etheraddr_t cmd_set_mplsogre_encap_eth_dst_value =
+       TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_mplsogre_encap_result,
+                                   eth_dst);
+
+static void cmd_set_mplsogre_encap_parsed(void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_set_mplsogre_encap_result *res = parsed_result;
+       union {
+               uint32_t mplsogre_label;
+               uint8_t label[4];
+       } id = {
+               .mplsogre_label = rte_cpu_to_be_32(res->label<<12),
+       };
+
+       if (strcmp(res->mplsogre, "mplsogre_encap") == 0)
+               mplsogre_encap_conf.select_vlan = 0;
+       else if (strcmp(res->mplsogre, "mplsogre_encap-with-vlan") == 0)
+               mplsogre_encap_conf.select_vlan = 1;
+       if (strcmp(res->ip_version, "ipv4") == 0)
+               mplsogre_encap_conf.select_ipv4 = 1;
+       else if (strcmp(res->ip_version, "ipv6") == 0)
+               mplsogre_encap_conf.select_ipv4 = 0;
+       else
+               return;
+       rte_memcpy(mplsogre_encap_conf.label, &id.label, 3);
+       if (mplsogre_encap_conf.select_ipv4) {
+               IPV4_ADDR_TO_UINT(res->ip_src, mplsogre_encap_conf.ipv4_src);
+               IPV4_ADDR_TO_UINT(res->ip_dst, mplsogre_encap_conf.ipv4_dst);
+       } else {
+               IPV6_ADDR_TO_ARRAY(res->ip_src, mplsogre_encap_conf.ipv6_src);
+               IPV6_ADDR_TO_ARRAY(res->ip_dst, mplsogre_encap_conf.ipv6_dst);
+       }
+       if (mplsogre_encap_conf.select_vlan)
+               mplsogre_encap_conf.vlan_tci = rte_cpu_to_be_16(res->tci);
+       rte_memcpy(mplsogre_encap_conf.eth_src, res->eth_src.addr_bytes,
+                  ETHER_ADDR_LEN);
+       rte_memcpy(mplsogre_encap_conf.eth_dst, res->eth_dst.addr_bytes,
+                  ETHER_ADDR_LEN);
+}
+
+cmdline_parse_inst_t cmd_set_mplsogre_encap = {
+       .f = cmd_set_mplsogre_encap_parsed,
+       .data = NULL,
+       .help_str = "set mplsogre_encap ip-version ipv4|ipv6 label <label>"
+               " ip-src <ip-src> ip-dst <ip-dst> eth-src <eth-src>"
+               " eth-dst <eth-dst>",
+       .tokens = {
+               (void *)&cmd_set_mplsogre_encap_set,
+               (void *)&cmd_set_mplsogre_encap_mplsogre_encap,
+               (void *)&cmd_set_mplsogre_encap_ip_version,
+               (void *)&cmd_set_mplsogre_encap_ip_version_value,
+               (void *)&cmd_set_mplsogre_encap_label,
+               (void *)&cmd_set_mplsogre_encap_label_value,
+               (void *)&cmd_set_mplsogre_encap_ip_src,
+               (void *)&cmd_set_mplsogre_encap_ip_src_value,
+               (void *)&cmd_set_mplsogre_encap_ip_dst,
+               (void *)&cmd_set_mplsogre_encap_ip_dst_value,
+               (void *)&cmd_set_mplsogre_encap_eth_src,
+               (void *)&cmd_set_mplsogre_encap_eth_src_value,
+               (void *)&cmd_set_mplsogre_encap_eth_dst,
+               (void *)&cmd_set_mplsogre_encap_eth_dst_value,
+               NULL,
+       },
+};
+
+cmdline_parse_inst_t cmd_set_mplsogre_encap_with_vlan = {
+       .f = cmd_set_mplsogre_encap_parsed,
+       .data = NULL,
+       .help_str = "set mplsogre_encap-with-vlan ip-version ipv4|ipv6"
+               " label <label> ip-src <ip-src> ip-dst <ip-dst>"
+               " vlan-tci <vlan-tci> eth-src <eth-src> eth-dst <eth-dst>",
+       .tokens = {
+               (void *)&cmd_set_mplsogre_encap_set,
+               (void *)&cmd_set_mplsogre_encap_mplsogre_encap_with_vlan,
+               (void *)&cmd_set_mplsogre_encap_ip_version,
+               (void *)&cmd_set_mplsogre_encap_ip_version_value,
+               (void *)&cmd_set_mplsogre_encap_label,
+               (void *)&cmd_set_mplsogre_encap_label_value,
+               (void *)&cmd_set_mplsogre_encap_ip_src,
+               (void *)&cmd_set_mplsogre_encap_ip_src_value,
+               (void *)&cmd_set_mplsogre_encap_ip_dst,
+               (void *)&cmd_set_mplsogre_encap_ip_dst_value,
+               (void *)&cmd_set_mplsogre_encap_vlan,
+               (void *)&cmd_set_mplsogre_encap_vlan_value,
+               (void *)&cmd_set_mplsogre_encap_eth_src,
+               (void *)&cmd_set_mplsogre_encap_eth_src_value,
+               (void *)&cmd_set_mplsogre_encap_eth_dst,
+               (void *)&cmd_set_mplsogre_encap_eth_dst_value,
+               NULL,
+       },
+};
+
+/** Set MPLSoGRE decapsulation details */
+struct cmd_set_mplsogre_decap_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t mplsogre;
+       cmdline_fixed_string_t pos_token;
+       cmdline_fixed_string_t ip_version;
+       uint32_t vlan_present:1;
+};
+
+cmdline_parse_token_string_t cmd_set_mplsogre_decap_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_decap_result, set,
+                                "set");
+cmdline_parse_token_string_t cmd_set_mplsogre_decap_mplsogre_decap =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_decap_result, mplsogre,
+                                "mplsogre_decap");
+cmdline_parse_token_string_t cmd_set_mplsogre_decap_mplsogre_decap_with_vlan =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_decap_result,
+                                mplsogre, "mplsogre_decap-with-vlan");
+cmdline_parse_token_string_t cmd_set_mplsogre_decap_ip_version =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_decap_result,
+                                pos_token, "ip-version");
+cmdline_parse_token_string_t cmd_set_mplsogre_decap_ip_version_value =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_decap_result,
+                                ip_version, "ipv4#ipv6");
+
+static void cmd_set_mplsogre_decap_parsed(void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_set_mplsogre_decap_result *res = parsed_result;
+
+       if (strcmp(res->mplsogre, "mplsogre_decap") == 0)
+               mplsogre_decap_conf.select_vlan = 0;
+       else if (strcmp(res->mplsogre, "mplsogre_decap-with-vlan") == 0)
+               mplsogre_decap_conf.select_vlan = 1;
+       if (strcmp(res->ip_version, "ipv4") == 0)
+               mplsogre_decap_conf.select_ipv4 = 1;
+       else if (strcmp(res->ip_version, "ipv6") == 0)
+               mplsogre_decap_conf.select_ipv4 = 0;
+}
+
+cmdline_parse_inst_t cmd_set_mplsogre_decap = {
+       .f = cmd_set_mplsogre_decap_parsed,
+       .data = NULL,
+       .help_str = "set mplsogre_decap ip-version ipv4|ipv6",
+       .tokens = {
+               (void *)&cmd_set_mplsogre_decap_set,
+               (void *)&cmd_set_mplsogre_decap_mplsogre_decap,
+               (void *)&cmd_set_mplsogre_decap_ip_version,
+               (void *)&cmd_set_mplsogre_decap_ip_version_value,
+               NULL,
+       },
+};
+
+cmdline_parse_inst_t cmd_set_mplsogre_decap_with_vlan = {
+       .f = cmd_set_mplsogre_decap_parsed,
+       .data = NULL,
+       .help_str = "set mplsogre_decap-with-vlan ip-version ipv4|ipv6",
+       .tokens = {
+               (void *)&cmd_set_mplsogre_decap_set,
+               (void *)&cmd_set_mplsogre_decap_mplsogre_decap_with_vlan,
+               (void *)&cmd_set_mplsogre_decap_ip_version,
+               (void *)&cmd_set_mplsogre_decap_ip_version_value,
+               NULL,
+       },
+};
+
+/** Set MPLSoUDP encapsulation details */
+struct cmd_set_mplsoudp_encap_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t mplsoudp;
+       cmdline_fixed_string_t pos_token;
+       cmdline_fixed_string_t ip_version;
+       uint32_t vlan_present:1;
+       uint32_t label;
+       uint16_t udp_src;
+       uint16_t udp_dst;
+       cmdline_ipaddr_t ip_src;
+       cmdline_ipaddr_t ip_dst;
+       uint16_t tci;
+       struct rte_ether_addr eth_src;
+       struct rte_ether_addr eth_dst;
+};
+
+cmdline_parse_token_string_t cmd_set_mplsoudp_encap_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result, set,
+                                "set");
+cmdline_parse_token_string_t cmd_set_mplsoudp_encap_mplsoudp_encap =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result, mplsoudp,
+                                "mplsoudp_encap");
+cmdline_parse_token_string_t cmd_set_mplsoudp_encap_mplsoudp_encap_with_vlan =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
+                                mplsoudp, "mplsoudp_encap-with-vlan");
+cmdline_parse_token_string_t cmd_set_mplsoudp_encap_ip_version =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
+                                pos_token, "ip-version");
+cmdline_parse_token_string_t cmd_set_mplsoudp_encap_ip_version_value =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
+                                ip_version, "ipv4#ipv6");
+cmdline_parse_token_string_t cmd_set_mplsoudp_encap_label =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
+                                pos_token, "label");
+cmdline_parse_token_num_t cmd_set_mplsoudp_encap_label_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_encap_result, label,
+                             UINT32);
+cmdline_parse_token_string_t cmd_set_mplsoudp_encap_udp_src =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
+                                pos_token, "udp-src");
+cmdline_parse_token_num_t cmd_set_mplsoudp_encap_udp_src_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_encap_result, udp_src,
+                             UINT16);
+cmdline_parse_token_string_t cmd_set_mplsoudp_encap_udp_dst =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
+                                pos_token, "udp-dst");
+cmdline_parse_token_num_t cmd_set_mplsoudp_encap_udp_dst_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_encap_result, udp_dst,
+                             UINT16);
+cmdline_parse_token_string_t cmd_set_mplsoudp_encap_ip_src =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
+                                pos_token, "ip-src");
+cmdline_parse_token_ipaddr_t cmd_set_mplsoudp_encap_ip_src_value =
+       TOKEN_IPADDR_INITIALIZER(struct cmd_set_mplsoudp_encap_result, ip_src);
+cmdline_parse_token_string_t cmd_set_mplsoudp_encap_ip_dst =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
+                                pos_token, "ip-dst");
+cmdline_parse_token_ipaddr_t cmd_set_mplsoudp_encap_ip_dst_value =
+       TOKEN_IPADDR_INITIALIZER(struct cmd_set_mplsoudp_encap_result, ip_dst);
+cmdline_parse_token_string_t cmd_set_mplsoudp_encap_vlan =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
+                                pos_token, "vlan-tci");
+cmdline_parse_token_num_t cmd_set_mplsoudp_encap_vlan_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_encap_result, tci,
+                             UINT16);
+cmdline_parse_token_string_t cmd_set_mplsoudp_encap_eth_src =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
+                                pos_token, "eth-src");
+cmdline_parse_token_etheraddr_t cmd_set_mplsoudp_encap_eth_src_value =
+       TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
+                                   eth_src);
+cmdline_parse_token_string_t cmd_set_mplsoudp_encap_eth_dst =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
+                                pos_token, "eth-dst");
+cmdline_parse_token_etheraddr_t cmd_set_mplsoudp_encap_eth_dst_value =
+       TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
+                                   eth_dst);
+
+static void cmd_set_mplsoudp_encap_parsed(void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_set_mplsoudp_encap_result *res = parsed_result;
+       union {
+               uint32_t mplsoudp_label;
+               uint8_t label[4];
+       } id = {
+               .mplsoudp_label = rte_cpu_to_be_32(res->label<<12),
+       };
+
+       if (strcmp(res->mplsoudp, "mplsoudp_encap") == 0)
+               mplsoudp_encap_conf.select_vlan = 0;
+       else if (strcmp(res->mplsoudp, "mplsoudp_encap-with-vlan") == 0)
+               mplsoudp_encap_conf.select_vlan = 1;
+       if (strcmp(res->ip_version, "ipv4") == 0)
+               mplsoudp_encap_conf.select_ipv4 = 1;
+       else if (strcmp(res->ip_version, "ipv6") == 0)
+               mplsoudp_encap_conf.select_ipv4 = 0;
+       else
+               return;
+       rte_memcpy(mplsoudp_encap_conf.label, &id.label, 3);
+       mplsoudp_encap_conf.udp_src = rte_cpu_to_be_16(res->udp_src);
+       mplsoudp_encap_conf.udp_dst = rte_cpu_to_be_16(res->udp_dst);
+       if (mplsoudp_encap_conf.select_ipv4) {
+               IPV4_ADDR_TO_UINT(res->ip_src, mplsoudp_encap_conf.ipv4_src);
+               IPV4_ADDR_TO_UINT(res->ip_dst, mplsoudp_encap_conf.ipv4_dst);
+       } else {
+               IPV6_ADDR_TO_ARRAY(res->ip_src, mplsoudp_encap_conf.ipv6_src);
+               IPV6_ADDR_TO_ARRAY(res->ip_dst, mplsoudp_encap_conf.ipv6_dst);
+       }
+       if (mplsoudp_encap_conf.select_vlan)
+               mplsoudp_encap_conf.vlan_tci = rte_cpu_to_be_16(res->tci);
+       rte_memcpy(mplsoudp_encap_conf.eth_src, res->eth_src.addr_bytes,
+                  ETHER_ADDR_LEN);
+       rte_memcpy(mplsoudp_encap_conf.eth_dst, res->eth_dst.addr_bytes,
+                  ETHER_ADDR_LEN);
+}
+
+cmdline_parse_inst_t cmd_set_mplsoudp_encap = {
+       .f = cmd_set_mplsoudp_encap_parsed,
+       .data = NULL,
+       .help_str = "set mplsoudp_encap ip-version ipv4|ipv6 label <label>"
+               " udp-src <udp-src> udp-dst <udp-dst> ip-src <ip-src>"
+               " ip-dst <ip-dst> eth-src <eth-src> eth-dst <eth-dst>",
+       .tokens = {
+               (void *)&cmd_set_mplsoudp_encap_set,
+               (void *)&cmd_set_mplsoudp_encap_mplsoudp_encap,
+               (void *)&cmd_set_mplsoudp_encap_ip_version,
+               (void *)&cmd_set_mplsoudp_encap_ip_version_value,
+               (void *)&cmd_set_mplsoudp_encap_label,
+               (void *)&cmd_set_mplsoudp_encap_label_value,
+               (void *)&cmd_set_mplsoudp_encap_udp_src,
+               (void *)&cmd_set_mplsoudp_encap_udp_src_value,
+               (void *)&cmd_set_mplsoudp_encap_udp_dst,
+               (void *)&cmd_set_mplsoudp_encap_udp_dst_value,
+               (void *)&cmd_set_mplsoudp_encap_ip_src,
+               (void *)&cmd_set_mplsoudp_encap_ip_src_value,
+               (void *)&cmd_set_mplsoudp_encap_ip_dst,
+               (void *)&cmd_set_mplsoudp_encap_ip_dst_value,
+               (void *)&cmd_set_mplsoudp_encap_eth_src,
+               (void *)&cmd_set_mplsoudp_encap_eth_src_value,
+               (void *)&cmd_set_mplsoudp_encap_eth_dst,
+               (void *)&cmd_set_mplsoudp_encap_eth_dst_value,
+               NULL,
+       },
+};
+
+cmdline_parse_inst_t cmd_set_mplsoudp_encap_with_vlan = {
+       .f = cmd_set_mplsoudp_encap_parsed,
+       .data = NULL,
+       .help_str = "set mplsoudp_encap-with-vlan ip-version ipv4|ipv6"
+               " label <label> udp-src <udp-src> udp-dst <udp-dst>"
+               " ip-src <ip-src> ip-dst <ip-dst> vlan-tci <vlan-tci>"
+               " eth-src <eth-src> eth-dst <eth-dst>",
+       .tokens = {
+               (void *)&cmd_set_mplsoudp_encap_set,
+               (void *)&cmd_set_mplsoudp_encap_mplsoudp_encap_with_vlan,
+               (void *)&cmd_set_mplsoudp_encap_ip_version,
+               (void *)&cmd_set_mplsoudp_encap_ip_version_value,
+               (void *)&cmd_set_mplsoudp_encap_label,
+               (void *)&cmd_set_mplsoudp_encap_label_value,
+               (void *)&cmd_set_mplsoudp_encap_udp_src,
+               (void *)&cmd_set_mplsoudp_encap_udp_src_value,
+               (void *)&cmd_set_mplsoudp_encap_udp_dst,
+               (void *)&cmd_set_mplsoudp_encap_udp_dst_value,
+               (void *)&cmd_set_mplsoudp_encap_ip_src,
+               (void *)&cmd_set_mplsoudp_encap_ip_src_value,
+               (void *)&cmd_set_mplsoudp_encap_ip_dst,
+               (void *)&cmd_set_mplsoudp_encap_ip_dst_value,
+               (void *)&cmd_set_mplsoudp_encap_vlan,
+               (void *)&cmd_set_mplsoudp_encap_vlan_value,
+               (void *)&cmd_set_mplsoudp_encap_eth_src,
+               (void *)&cmd_set_mplsoudp_encap_eth_src_value,
+               (void *)&cmd_set_mplsoudp_encap_eth_dst,
+               (void *)&cmd_set_mplsoudp_encap_eth_dst_value,
+               NULL,
+       },
+};
+
+/** Set MPLSoUDP decapsulation details */
+struct cmd_set_mplsoudp_decap_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t mplsoudp;
+       cmdline_fixed_string_t pos_token;
+       cmdline_fixed_string_t ip_version;
+       uint32_t vlan_present:1;
+};
+
+cmdline_parse_token_string_t cmd_set_mplsoudp_decap_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_decap_result, set,
+                                "set");
+cmdline_parse_token_string_t cmd_set_mplsoudp_decap_mplsoudp_decap =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_decap_result, mplsoudp,
+                                "mplsoudp_decap");
+cmdline_parse_token_string_t cmd_set_mplsoudp_decap_mplsoudp_decap_with_vlan =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_decap_result,
+                                mplsoudp, "mplsoudp_decap-with-vlan");
+cmdline_parse_token_string_t cmd_set_mplsoudp_decap_ip_version =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_decap_result,
+                                pos_token, "ip-version");
+cmdline_parse_token_string_t cmd_set_mplsoudp_decap_ip_version_value =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_decap_result,
+                                ip_version, "ipv4#ipv6");
+
+static void cmd_set_mplsoudp_decap_parsed(void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_set_mplsoudp_decap_result *res = parsed_result;
+
+       if (strcmp(res->mplsoudp, "mplsoudp_decap") == 0)
+               mplsoudp_decap_conf.select_vlan = 0;
+       else if (strcmp(res->mplsoudp, "mplsoudp_decap-with-vlan") == 0)
+               mplsoudp_decap_conf.select_vlan = 1;
+       if (strcmp(res->ip_version, "ipv4") == 0)
+               mplsoudp_decap_conf.select_ipv4 = 1;
+       else if (strcmp(res->ip_version, "ipv6") == 0)
+               mplsoudp_decap_conf.select_ipv4 = 0;
+}
+
+cmdline_parse_inst_t cmd_set_mplsoudp_decap = {
+       .f = cmd_set_mplsoudp_decap_parsed,
+       .data = NULL,
+       .help_str = "set mplsoudp_decap ip-version ipv4|ipv6",
+       .tokens = {
+               (void *)&cmd_set_mplsoudp_decap_set,
+               (void *)&cmd_set_mplsoudp_decap_mplsoudp_decap,
+               (void *)&cmd_set_mplsoudp_decap_ip_version,
+               (void *)&cmd_set_mplsoudp_decap_ip_version_value,
+               NULL,
+       },
+};
+
+cmdline_parse_inst_t cmd_set_mplsoudp_decap_with_vlan = {
+       .f = cmd_set_mplsoudp_decap_parsed,
+       .data = NULL,
+       .help_str = "set mplsoudp_decap-with-vlan ip-version ipv4|ipv6",
+       .tokens = {
+               (void *)&cmd_set_mplsoudp_decap_set,
+               (void *)&cmd_set_mplsoudp_decap_mplsoudp_decap_with_vlan,
+               (void *)&cmd_set_mplsoudp_decap_ip_version,
+               (void *)&cmd_set_mplsoudp_decap_ip_version_value,
+               NULL,
+       },
+};
+
+/* 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 (!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 (!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 =
@@ -14848,596 +16383,1351 @@ 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(
+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(
+       __attribute__((unused)) void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+#ifdef RTE_LIBRTE_I40E_PMD
+       struct cmd_ddp_get_list_result *res = parsed_result;
+       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;
+
+#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(
+       __attribute__((unused)) void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+#ifdef RTE_LIBRTE_I40E_PMD
+       struct cmd_cfg_input_set_result *res = parsed_result;
+       enum rte_pmd_i40e_inset_type inset_type = INSET_NONE;
+       struct rte_pmd_i40e_inset inset;
+#endif
+       int ret = -ENOTSUP;
+
+       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(
+       __attribute__((unused)) void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+#ifdef RTE_LIBRTE_I40E_PMD
+       struct cmd_clear_input_set_result *res = parsed_result;
+       enum rte_pmd_i40e_inset_type inset_type = INSET_NONE;
+       struct rte_pmd_i40e_inset inset;
+#endif
+       int ret = -ENOTSUP;
+
+       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_ddp_info_result *res = parsed_result;
-       uint8_t *pkg;
-       uint32_t pkg_size;
+       struct cmd_pctype_mapping_reset_result *res = parsed_result;
        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)
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
                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_flow_type_mapping_reset(res->port_id);
+#endif
 
-       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);
+       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));
        }
+}
 
-       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);
-               }
-       }
+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,
+       },
+};
 
-       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);
-               }
-       }
+/* show port pctype mapping */
 
-       /* 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;
+/* 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;
+};
 
-       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;
+/* 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");
 
-       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;
+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
 
-       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;
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
 
-       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;
+#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;
        }
 
-       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;
-                                       }
+#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);
                }
-               printf("\n");
        }
-       printf("\n");
-       free(pctype);
+#endif
+}
 
-no_print_pctypes:
+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,
+       },
+};
 
-       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;
+/* port config pctype mapping update */
 
-       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;
+/* 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;
+};
 
-       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");
+/* 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);
 
-       ret = 0;
-no_print_return:
-       if (proto)
-               free(proto);
+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 (ret == -ENOTSUP)
-               printf("Function not supported in PMD driver\n");
-       close_file(pkg);
+
+       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_ddp_get_info = {
-       .f = cmd_ddp_info_parsed,
+cmdline_parse_inst_t cmd_pctype_mapping_update = {
+       .f = cmd_pctype_mapping_update_parsed,
        .data = NULL,
-       .help_str = "ddp get info <profile_path>",
+       .help_str = "port config <port_id> pctype mapping update"
+       " <pctype_id_0,[pctype_id_1]*> <flowtype_id>",
        .tokens = {
-               (void *)&cmd_ddp_info_ddp,
-               (void *)&cmd_ddp_info_get,
-               (void *)&cmd_ddp_info_info,
-               (void *)&cmd_ddp_info_filepath,
+               (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,
        },
 };
 
-/* Get dynamic device personalization profile info list*/
-#define PROFILE_INFO_SIZE 48
-#define MAX_PROFILE_NUM 16
+/* ptype mapping get */
 
-struct cmd_ddp_get_list_result {
-       cmdline_fixed_string_t ddp;
+/* 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;
-       cmdline_fixed_string_t list;
        portid_t port_id;
+       uint8_t valid_only;
 };
 
-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);
+/* 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_ddp_get_list_parsed(
-       __attribute__((unused)) void *parsed_result,
+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
-       struct cmd_ddp_get_list_result *res = parsed_result;
-       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;
+       int max_ptype_num = 256;
+       struct rte_pmd_i40e_ptype_mapping mapping[max_ptype_num];
+       uint16_t count;
+       int i;
 #endif
-       int ret = -ENOTSUP;
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               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__);
+       ret = rte_pmd_i40e_ptype_mapping_get(res->port_id,
+                                       mapping,
+                                       max_ptype_num,
+                                       &count,
+                                       res->valid_only);
+#endif
 
-       if (ret == -ENOTSUP)
-               ret = rte_pmd_i40e_get_ddp_list(res->port_id,
-                                               (uint8_t *)p_list, size);
+       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) {
-               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);
-               }
+               for (i = 0; i < count; i++)
+                       printf("%3d\t0x%08x\n",
+                               mapping[i].hw_ptype, mapping[i].sw_ptype);
        }
-
-       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,
+cmdline_parse_inst_t cmd_ptype_mapping_get = {
+       .f = cmd_ptype_mapping_get_parsed,
        .data = NULL,
-       .help_str = "ddp get list <port_id>",
+       .help_str = "ptype mapping get <port_id> <valid_only>",
        .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,
+               (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,
        },
 };
 
-/* Configure input set */
-struct cmd_cfg_input_set_result {
-       cmdline_fixed_string_t port;
-       cmdline_fixed_string_t cfg;
+/* 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;
-       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;
+       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_cfg_input_set_parsed(
-       __attribute__((unused)) void *parsed_result,
+cmd_ptype_mapping_replace_parsed(
+       void *parsed_result,
        __attribute__((unused)) struct cmdline *cl,
        __attribute__((unused)) void *data)
 {
-#ifdef RTE_LIBRTE_I40E_PMD
-       struct cmd_cfg_input_set_result *res = parsed_result;
-       enum rte_pmd_i40e_inset_type inset_type = INSET_NONE;
-       struct rte_pmd_i40e_inset inset;
-#endif
+       struct cmd_ptype_mapping_replace_result *res = parsed_result;
        int ret = -ENOTSUP;
 
-       if (!all_ports_stopped()) {
-               printf("Please stop all ports first\n");
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
                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;
-       }
+       ret = rte_pmd_i40e_ptype_mapping_replace(res->port_id,
+                                       res->target,
+                                       res->mask,
+                                       res->pkt_type);
 #endif
 
-       if (ret == -ENOTSUP)
-               printf("Function not supported\n");
+       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_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,
+cmdline_parse_inst_t cmd_ptype_mapping_replace = {
+       .f = cmd_ptype_mapping_replace_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>",
+       .help_str =
+               "ptype mapping replace <port_id> <target> <mask> <pkt_type>",
        .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,
+               (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,
        },
 };
 
-/* Clear input set */
-struct cmd_clear_input_set_result {
-       cmdline_fixed_string_t port;
-       cmdline_fixed_string_t cfg;
+/* 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;
-       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;
 };
 
+/* 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_clear_input_set_parsed(
-       __attribute__((unused)) void *parsed_result,
+cmd_ptype_mapping_reset_parsed(
+       void *parsed_result,
        __attribute__((unused)) struct cmdline *cl,
        __attribute__((unused)) void *data)
 {
-#ifdef RTE_LIBRTE_I40E_PMD
-       struct cmd_clear_input_set_result *res = parsed_result;
-       enum rte_pmd_i40e_inset_type inset_type = INSET_NONE;
-       struct rte_pmd_i40e_inset inset;
-#endif
+       struct cmd_ptype_mapping_reset_result *res = parsed_result;
        int ret = -ENOTSUP;
 
-       if (!all_ports_stopped()) {
-               printf("Please stop all ports first\n");
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
                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;
-       }
-
+       ret = rte_pmd_i40e_ptype_mapping_reset(res->port_id);
 #endif
 
-       if (ret == -ENOTSUP)
-               printf("Function not supported\n");
+       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_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,
+cmdline_parse_inst_t cmd_ptype_mapping_reset = {
+       .f = cmd_ptype_mapping_reset_parsed,
        .data = NULL,
-       .help_str = "port config <port_id> pctype <pctype_id> hash_inset|"
-                   "fdir_inset|fdir_flx_inset clear all",
+       .help_str = "ptype mapping reset <port_id>",
        .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,
+               (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,
        },
 };
 
-/* show vf stats */
+/* ptype mapping update */
 
-/* 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;
+/* 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;
-       uint16_t vf_id;
+       uint8_t hw_ptype;
+       uint32_t sw_ptype;
 };
 
-/* Common CLI fields show vf stats*/
-cmdline_parse_token_string_t cmd_show_vf_stats_show =
+/* Common CLI fields for ptype mapping update*/
+cmdline_parse_token_string_t cmd_ptype_mapping_update_ptype =
        TOKEN_STRING_INITIALIZER
-               (struct cmd_show_vf_stats_result,
-                show, "show");
-cmdline_parse_token_string_t cmd_show_vf_stats_vf =
+               (struct cmd_ptype_mapping_update_result,
+                ptype, "ptype");
+cmdline_parse_token_string_t cmd_ptype_mapping_update_mapping =
        TOKEN_STRING_INITIALIZER
-               (struct cmd_show_vf_stats_result,
-                vf, "vf");
-cmdline_parse_token_string_t cmd_show_vf_stats_stats =
+               (struct cmd_ptype_mapping_update_result,
+                mapping, "mapping");
+cmdline_parse_token_string_t cmd_ptype_mapping_update_update =
        TOKEN_STRING_INITIALIZER
-               (struct cmd_show_vf_stats_result,
-                stats, "stats");
-cmdline_parse_token_num_t cmd_show_vf_stats_port_id =
+               (struct cmd_ptype_mapping_update_result,
+                reset, "update");
+cmdline_parse_token_num_t cmd_ptype_mapping_update_port_id =
        TOKEN_NUM_INITIALIZER
-               (struct cmd_show_vf_stats_result,
+               (struct cmd_ptype_mapping_update_result,
                 port_id, UINT16);
-cmdline_parse_token_num_t cmd_show_vf_stats_vf_id =
+cmdline_parse_token_num_t cmd_ptype_mapping_update_hw_ptype =
        TOKEN_NUM_INITIALIZER
-               (struct cmd_show_vf_stats_result,
-                vf_id, UINT16);
+               (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_show_vf_stats_parsed(
+cmd_ptype_mapping_update_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;
+       struct cmd_ptype_mapping_update_result *res = parsed_result;
        int ret = -ENOTSUP;
-       static const char *nic_stats_border = "########################";
-
+#ifdef RTE_LIBRTE_I40E_PMD
+       struct rte_pmd_i40e_ptype_mapping mapping;
+#endif
        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);
+       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 vf_id %d\n", res->vf_id);
+               printf("invalid ptype 0x%8x\n", res->sw_ptype);
                break;
        case -ENODEV:
                printf("invalid port_id %d\n", res->port_id);
@@ -15448,808 +17738,957 @@ cmd_show_vf_stats_parsed(
        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,
+cmdline_parse_inst_t cmd_ptype_mapping_update = {
+       .f = cmd_ptype_mapping_update_parsed,
        .data = NULL,
-       .help_str = "show vf stats <port_id> <vf_id>",
+       .help_str = "ptype mapping update <port_id> <hw_ptype> <sw_ptype>",
        .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,
+               (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,
        },
 };
 
-/* clear vf stats */
+/* Common result structure for file commands */
+struct cmd_cmdfile_result {
+       cmdline_fixed_string_t load;
+       cmdline_fixed_string_t filename;
+};
 
-/* 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 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,
+       },
 };
 
-/* 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 =
+/* Get Rx offloads capabilities */
+struct cmd_rx_offload_get_capa_result {
+       cmdline_fixed_string_t show;
+       cmdline_fixed_string_t port;
+       portid_t port_id;
+       cmdline_fixed_string_t rx_offload;
+       cmdline_fixed_string_t capabilities;
+};
+
+cmdline_parse_token_string_t cmd_rx_offload_get_capa_show =
        TOKEN_STRING_INITIALIZER
-               (struct cmd_clear_vf_stats_result,
-                vf, "vf");
-cmdline_parse_token_string_t cmd_clear_vf_stats_stats =
+               (struct cmd_rx_offload_get_capa_result,
+                show, "show");
+cmdline_parse_token_string_t cmd_rx_offload_get_capa_port =
        TOKEN_STRING_INITIALIZER
-               (struct cmd_clear_vf_stats_result,
-                stats, "stats");
-cmdline_parse_token_num_t cmd_clear_vf_stats_port_id =
+               (struct cmd_rx_offload_get_capa_result,
+                port, "port");
+cmdline_parse_token_num_t cmd_rx_offload_get_capa_port_id =
        TOKEN_NUM_INITIALIZER
-               (struct cmd_clear_vf_stats_result,
+               (struct cmd_rx_offload_get_capa_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);
+cmdline_parse_token_string_t cmd_rx_offload_get_capa_rx_offload =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_rx_offload_get_capa_result,
+                rx_offload, "rx_offload");
+cmdline_parse_token_string_t cmd_rx_offload_get_capa_capabilities =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_rx_offload_get_capa_result,
+                capabilities, "capabilities");
 
 static void
-cmd_clear_vf_stats_parsed(
+print_rx_offloads(uint64_t offloads)
+{
+       uint64_t single_offload;
+       int begin;
+       int end;
+       int bit;
+
+       if (offloads == 0)
+               return;
+
+       begin = __builtin_ctzll(offloads);
+       end = sizeof(offloads) * CHAR_BIT - __builtin_clzll(offloads);
+
+       single_offload = 1ULL << begin;
+       for (bit = begin; bit < end; bit++) {
+               if (offloads & single_offload)
+                       printf(" %s",
+                              rte_eth_dev_rx_offload_name(single_offload));
+               single_offload <<= 1;
+       }
+}
+
+static void
+cmd_rx_offload_get_capa_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;
+       struct cmd_rx_offload_get_capa_result *res = parsed_result;
+       struct rte_eth_dev_info dev_info;
+       portid_t port_id = res->port_id;
+       uint64_t queue_offloads;
+       uint64_t port_offloads;
 
-       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
-               return;
+       rte_eth_dev_info_get(port_id, &dev_info);
+       queue_offloads = dev_info.rx_queue_offload_capa;
+       port_offloads = dev_info.rx_offload_capa ^ queue_offloads;
 
-#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
+       printf("Rx Offloading Capabilities of port %d :\n", port_id);
+       printf("  Per Queue :");
+       print_rx_offloads(queue_offloads);
 
-       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");
+       printf("  Per Port  :");
+       print_rx_offloads(port_offloads);
+       printf("\n\n");
 }
 
-cmdline_parse_inst_t cmd_clear_vf_stats = {
-       .f = cmd_clear_vf_stats_parsed,
+cmdline_parse_inst_t cmd_rx_offload_get_capa = {
+       .f = cmd_rx_offload_get_capa_parsed,
        .data = NULL,
-       .help_str = "clear vf stats <port_id> <vf_id>",
+       .help_str = "show port <port_id> rx_offload capabilities",
        .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,
+               (void *)&cmd_rx_offload_get_capa_show,
+               (void *)&cmd_rx_offload_get_capa_port,
+               (void *)&cmd_rx_offload_get_capa_port_id,
+               (void *)&cmd_rx_offload_get_capa_rx_offload,
+               (void *)&cmd_rx_offload_get_capa_capabilities,
                NULL,
-       },
+       }
 };
 
-/* port config pctype mapping reset */
-
-/* Common result structure for port config pctype mapping reset */
-struct cmd_pctype_mapping_reset_result {
+/* Get Rx offloads configuration */
+struct cmd_rx_offload_get_configuration_result {
+       cmdline_fixed_string_t show;
        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;
+       cmdline_fixed_string_t rx_offload;
+       cmdline_fixed_string_t configuration;
 };
 
-/* Common CLI fields for port config pctype mapping reset*/
-cmdline_parse_token_string_t cmd_pctype_mapping_reset_port =
+cmdline_parse_token_string_t cmd_rx_offload_get_configuration_show =
        TOKEN_STRING_INITIALIZER
-               (struct cmd_pctype_mapping_reset_result,
-                port, "port");
-cmdline_parse_token_string_t cmd_pctype_mapping_reset_config =
+               (struct cmd_rx_offload_get_configuration_result,
+                show, "show");
+cmdline_parse_token_string_t cmd_rx_offload_get_configuration_port =
        TOKEN_STRING_INITIALIZER
-               (struct cmd_pctype_mapping_reset_result,
-                config, "config");
-cmdline_parse_token_num_t cmd_pctype_mapping_reset_port_id =
+               (struct cmd_rx_offload_get_configuration_result,
+                port, "port");
+cmdline_parse_token_num_t cmd_rx_offload_get_configuration_port_id =
        TOKEN_NUM_INITIALIZER
-               (struct cmd_pctype_mapping_reset_result,
+               (struct cmd_rx_offload_get_configuration_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 =
+cmdline_parse_token_string_t cmd_rx_offload_get_configuration_rx_offload =
        TOKEN_STRING_INITIALIZER
-               (struct cmd_pctype_mapping_reset_result,
-                mapping, "mapping");
-cmdline_parse_token_string_t cmd_pctype_mapping_reset_reset =
+               (struct cmd_rx_offload_get_configuration_result,
+                rx_offload, "rx_offload");
+cmdline_parse_token_string_t cmd_rx_offload_get_configuration_configuration =
        TOKEN_STRING_INITIALIZER
-               (struct cmd_pctype_mapping_reset_result,
-                reset, "reset");
+               (struct cmd_rx_offload_get_configuration_result,
+                configuration, "configuration");
 
 static void
-cmd_pctype_mapping_reset_parsed(
+cmd_rx_offload_get_configuration_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;
+       struct cmd_rx_offload_get_configuration_result *res = parsed_result;
+       struct rte_eth_dev_info dev_info;
+       portid_t port_id = res->port_id;
+       struct rte_port *port = &ports[port_id];
+       uint64_t port_offloads;
+       uint64_t queue_offloads;
+       uint16_t nb_rx_queues;
+       int q;
 
-       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
-               return;
+       printf("Rx Offloading Configuration of port %d :\n", port_id);
 
-#ifdef RTE_LIBRTE_I40E_PMD
-       ret = rte_pmd_i40e_flow_type_mapping_reset(res->port_id);
-#endif
+       port_offloads = port->dev_conf.rxmode.offloads;
+       printf("  Port :");
+       print_rx_offloads(port_offloads);
+       printf("\n");
 
-       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));
+       rte_eth_dev_info_get(port_id, &dev_info);
+       nb_rx_queues = dev_info.nb_rx_queues;
+       for (q = 0; q < nb_rx_queues; q++) {
+               queue_offloads = port->rx_conf[q].offloads;
+               printf("  Queue[%2d] :", q);
+               print_rx_offloads(queue_offloads);
+               printf("\n");
        }
+       printf("\n");
 }
 
-cmdline_parse_inst_t cmd_pctype_mapping_reset = {
-       .f = cmd_pctype_mapping_reset_parsed,
+cmdline_parse_inst_t cmd_rx_offload_get_configuration = {
+       .f = cmd_rx_offload_get_configuration_parsed,
        .data = NULL,
-       .help_str = "port config <port_id> pctype mapping reset",
+       .help_str = "show port <port_id> rx_offload configuration",
        .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,
+               (void *)&cmd_rx_offload_get_configuration_show,
+               (void *)&cmd_rx_offload_get_configuration_port,
+               (void *)&cmd_rx_offload_get_configuration_port_id,
+               (void *)&cmd_rx_offload_get_configuration_rx_offload,
+               (void *)&cmd_rx_offload_get_configuration_configuration,
                NULL,
-       },
+       }
 };
 
-/* show port pctype mapping */
-
-/* Common result structure for show port pctype mapping */
-struct cmd_pctype_mapping_get_result {
-       cmdline_fixed_string_t show;
+/* Enable/Disable a per port offloading */
+struct cmd_config_per_port_rx_offload_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 rx_offload;
+       cmdline_fixed_string_t offload;
+       cmdline_fixed_string_t on_off;
 };
 
-/* 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 =
+cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_port =
        TOKEN_STRING_INITIALIZER
-               (struct cmd_pctype_mapping_get_result,
+               (struct cmd_config_per_port_rx_offload_result,
                 port, "port");
-cmdline_parse_token_num_t cmd_pctype_mapping_get_port_id =
+cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_config =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_config_per_port_rx_offload_result,
+                config, "config");
+cmdline_parse_token_num_t cmd_config_per_port_rx_offload_result_port_id =
        TOKEN_NUM_INITIALIZER
-               (struct cmd_pctype_mapping_get_result,
+               (struct cmd_config_per_port_rx_offload_result,
                 port_id, UINT16);
-cmdline_parse_token_string_t cmd_pctype_mapping_get_pctype =
+cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_rx_offload =
        TOKEN_STRING_INITIALIZER
-               (struct cmd_pctype_mapping_get_result,
-                pctype, "pctype");
-cmdline_parse_token_string_t cmd_pctype_mapping_get_mapping =
+               (struct cmd_config_per_port_rx_offload_result,
+                rx_offload, "rx_offload");
+cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_offload =
        TOKEN_STRING_INITIALIZER
-               (struct cmd_pctype_mapping_get_result,
-                mapping, "mapping");
+               (struct cmd_config_per_port_rx_offload_result,
+                offload, "vlan_strip#ipv4_cksum#udp_cksum#tcp_cksum#tcp_lro#"
+                          "qinq_strip#outer_ipv4_cksum#macsec_strip#"
+                          "header_split#vlan_filter#vlan_extend#jumbo_frame#"
+                          "crc_strip#scatter#timestamp#security#keep_crc");
+cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_on_off =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_config_per_port_rx_offload_result,
+                on_off, "on#off");
 
-static void
-cmd_pctype_mapping_get_parsed(
-       void *parsed_result,
-       __attribute__((unused)) struct cmdline *cl,
-       __attribute__((unused)) void *data)
+static uint64_t
+search_rx_offload(const char *name)
 {
-       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
+       uint64_t single_offload;
+       const char *single_name;
+       int found = 0;
+       unsigned int bit;
+
+       single_offload = 1;
+       for (bit = 0; bit < sizeof(single_offload) * CHAR_BIT; bit++) {
+               single_name = rte_eth_dev_rx_offload_name(single_offload);
+               if (!strcasecmp(single_name, name)) {
+                       found = 1;
+                       break;
+               }
+               single_offload <<= 1;
+       }
 
-       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
-               return;
+       if (found)
+               return single_offload;
 
-#ifdef RTE_LIBRTE_I40E_PMD
-       ret = rte_pmd_i40e_flow_type_mapping_get(res->port_id, mapping);
-#endif
+       return 0;
+}
 
-       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));
+static void
+cmd_config_per_port_rx_offload_parsed(void *parsed_result,
+                               __attribute__((unused)) struct cmdline *cl,
+                               __attribute__((unused)) void *data)
+{
+       struct cmd_config_per_port_rx_offload_result *res = parsed_result;
+       portid_t port_id = res->port_id;
+       struct rte_eth_dev_info dev_info;
+       struct rte_port *port = &ports[port_id];
+       uint64_t single_offload;
+       uint16_t nb_rx_queues;
+       int q;
+
+       if (port->port_status != RTE_PORT_STOPPED) {
+               printf("Error: Can't config offload when Port %d "
+                      "is not stopped\n", port_id);
                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;
+       single_offload = search_rx_offload(res->offload);
+       if (single_offload == 0) {
+               printf("Unknown offload name: %s\n", res->offload);
+               return;
+       }
 
-                       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);
-               }
+       rte_eth_dev_info_get(port_id, &dev_info);
+       nb_rx_queues = dev_info.nb_rx_queues;
+       if (!strcmp(res->on_off, "on")) {
+               port->dev_conf.rxmode.offloads |= single_offload;
+               for (q = 0; q < nb_rx_queues; q++)
+                       port->rx_conf[q].offloads |= single_offload;
+       } else {
+               port->dev_conf.rxmode.offloads &= ~single_offload;
+               for (q = 0; q < nb_rx_queues; q++)
+                       port->rx_conf[q].offloads &= ~single_offload;
        }
-#endif
+
+       cmd_reconfig_device_queue(port_id, 1, 1);
 }
 
-cmdline_parse_inst_t cmd_pctype_mapping_get = {
-       .f = cmd_pctype_mapping_get_parsed,
+cmdline_parse_inst_t cmd_config_per_port_rx_offload = {
+       .f = cmd_config_per_port_rx_offload_parsed,
        .data = NULL,
-       .help_str = "show port <port_id> pctype mapping",
+       .help_str = "port config <port_id> rx_offload vlan_strip|ipv4_cksum|"
+                   "udp_cksum|tcp_cksum|tcp_lro|qinq_strip|outer_ipv4_cksum|"
+                   "macsec_strip|header_split|vlan_filter|vlan_extend|"
+                   "jumbo_frame|crc_strip|scatter|timestamp|security|keep_crc "
+                   "on|off",
        .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,
+               (void *)&cmd_config_per_port_rx_offload_result_port,
+               (void *)&cmd_config_per_port_rx_offload_result_config,
+               (void *)&cmd_config_per_port_rx_offload_result_port_id,
+               (void *)&cmd_config_per_port_rx_offload_result_rx_offload,
+               (void *)&cmd_config_per_port_rx_offload_result_offload,
+               (void *)&cmd_config_per_port_rx_offload_result_on_off,
                NULL,
-       },
+       }
 };
 
-/* port config pctype mapping update */
-
-/* Common result structure for port config pctype mapping update */
-struct cmd_pctype_mapping_update_result {
+/* Enable/Disable a per queue offloading */
+struct cmd_config_per_queue_rx_offload_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;
+       cmdline_fixed_string_t rxq;
+       uint16_t queue_id;
+       cmdline_fixed_string_t rx_offload;
+       cmdline_fixed_string_t offload;
+       cmdline_fixed_string_t on_off;
 };
-
-/* Common CLI fields for pctype mapping update*/
-cmdline_parse_token_string_t cmd_pctype_mapping_update_port =
+
+cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_port =
        TOKEN_STRING_INITIALIZER
-               (struct cmd_pctype_mapping_update_result,
+               (struct cmd_config_per_queue_rx_offload_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 =
+cmdline_parse_token_num_t cmd_config_per_queue_rx_offload_result_port_id =
        TOKEN_NUM_INITIALIZER
-               (struct cmd_pctype_mapping_update_result,
+               (struct cmd_config_per_queue_rx_offload_result,
                 port_id, UINT16);
-cmdline_parse_token_string_t cmd_pctype_mapping_update_pctype =
+cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_rxq =
        TOKEN_STRING_INITIALIZER
-               (struct cmd_pctype_mapping_update_result,
-                pctype, "pctype");
-cmdline_parse_token_string_t cmd_pctype_mapping_update_mapping =
+               (struct cmd_config_per_queue_rx_offload_result,
+                rxq, "rxq");
+cmdline_parse_token_num_t cmd_config_per_queue_rx_offload_result_queue_id =
+       TOKEN_NUM_INITIALIZER
+               (struct cmd_config_per_queue_rx_offload_result,
+                queue_id, UINT16);
+cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_rxoffload =
        TOKEN_STRING_INITIALIZER
-               (struct cmd_pctype_mapping_update_result,
-                mapping, "mapping");
-cmdline_parse_token_string_t cmd_pctype_mapping_update_update =
+               (struct cmd_config_per_queue_rx_offload_result,
+                rx_offload, "rx_offload");
+cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_offload =
        TOKEN_STRING_INITIALIZER
-               (struct cmd_pctype_mapping_update_result,
-                update, "update");
-cmdline_parse_token_string_t cmd_pctype_mapping_update_pc_type =
+               (struct cmd_config_per_queue_rx_offload_result,
+                offload, "vlan_strip#ipv4_cksum#udp_cksum#tcp_cksum#tcp_lro#"
+                          "qinq_strip#outer_ipv4_cksum#macsec_strip#"
+                          "header_split#vlan_filter#vlan_extend#jumbo_frame#"
+                          "crc_strip#scatter#timestamp#security#keep_crc");
+cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_on_off =
        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);
+               (struct cmd_config_per_queue_rx_offload_result,
+                on_off, "on#off");
 
 static void
-cmd_pctype_mapping_update_parsed(
-       void *parsed_result,
-       __attribute__((unused)) struct cmdline *cl,
-       __attribute__((unused)) void *data)
+cmd_config_per_queue_rx_offload_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
+       struct cmd_config_per_queue_rx_offload_result *res = parsed_result;
+       struct rte_eth_dev_info dev_info;
+       portid_t port_id = res->port_id;
+       uint16_t queue_id = res->queue_id;
+       struct rte_port *port = &ports[port_id];
+       uint64_t single_offload;
 
-       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+       if (port->port_status != RTE_PORT_STOPPED) {
+               printf("Error: Can't config offload when Port %d "
+                      "is not stopped\n", port_id);
                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
+       rte_eth_dev_info_get(port_id, &dev_info);
+       if (queue_id >= dev_info.nb_rx_queues) {
+               printf("Error: input queue_id should be 0 ... "
+                      "%d\n", dev_info.nb_rx_queues - 1);
+               return;
+       }
 
-       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));
+       single_offload = search_rx_offload(res->offload);
+       if (single_offload == 0) {
+               printf("Unknown offload name: %s\n", res->offload);
+               return;
        }
+
+       if (!strcmp(res->on_off, "on"))
+               port->rx_conf[queue_id].offloads |= single_offload;
+       else
+               port->rx_conf[queue_id].offloads &= ~single_offload;
+
+       cmd_reconfig_device_queue(port_id, 1, 1);
 }
 
-cmdline_parse_inst_t cmd_pctype_mapping_update = {
-       .f = cmd_pctype_mapping_update_parsed,
+cmdline_parse_inst_t cmd_config_per_queue_rx_offload = {
+       .f = cmd_config_per_queue_rx_offload_parsed,
        .data = NULL,
-       .help_str = "port config <port_id> pctype mapping update"
-       " <pctype_id_0,[pctype_id_1]*> <flowtype_id>",
+       .help_str = "port <port_id> rxq <queue_id> rx_offload "
+                   "vlan_strip|ipv4_cksum|"
+                   "udp_cksum|tcp_cksum|tcp_lro|qinq_strip|outer_ipv4_cksum|"
+                   "macsec_strip|header_split|vlan_filter|vlan_extend|"
+                   "jumbo_frame|crc_strip|scatter|timestamp|security|keep_crc "
+                   "on|off",
        .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,
+               (void *)&cmd_config_per_queue_rx_offload_result_port,
+               (void *)&cmd_config_per_queue_rx_offload_result_port_id,
+               (void *)&cmd_config_per_queue_rx_offload_result_rxq,
+               (void *)&cmd_config_per_queue_rx_offload_result_queue_id,
+               (void *)&cmd_config_per_queue_rx_offload_result_rxoffload,
+               (void *)&cmd_config_per_queue_rx_offload_result_offload,
+               (void *)&cmd_config_per_queue_rx_offload_result_on_off,
                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;
+/* Get Tx offloads capabilities */
+struct cmd_tx_offload_get_capa_result {
+       cmdline_fixed_string_t show;
+       cmdline_fixed_string_t port;
        portid_t port_id;
-       uint8_t valid_only;
+       cmdline_fixed_string_t tx_offload;
+       cmdline_fixed_string_t capabilities;
 };
 
-/* 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 =
+cmdline_parse_token_string_t cmd_tx_offload_get_capa_show =
        TOKEN_STRING_INITIALIZER
-               (struct cmd_ptype_mapping_get_result,
-                mapping, "mapping");
-cmdline_parse_token_string_t cmd_ptype_mapping_get_get =
+               (struct cmd_tx_offload_get_capa_result,
+                show, "show");
+cmdline_parse_token_string_t cmd_tx_offload_get_capa_port =
        TOKEN_STRING_INITIALIZER
-               (struct cmd_ptype_mapping_get_result,
-                get, "get");
-cmdline_parse_token_num_t cmd_ptype_mapping_get_port_id =
+               (struct cmd_tx_offload_get_capa_result,
+                port, "port");
+cmdline_parse_token_num_t cmd_tx_offload_get_capa_port_id =
        TOKEN_NUM_INITIALIZER
-               (struct cmd_ptype_mapping_get_result,
+               (struct cmd_tx_offload_get_capa_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);
+cmdline_parse_token_string_t cmd_tx_offload_get_capa_tx_offload =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_tx_offload_get_capa_result,
+                tx_offload, "tx_offload");
+cmdline_parse_token_string_t cmd_tx_offload_get_capa_capabilities =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_tx_offload_get_capa_result,
+                capabilities, "capabilities");
 
 static void
-cmd_ptype_mapping_get_parsed(
-       void *parsed_result,
-       __attribute__((unused)) struct cmdline *cl,
-       __attribute__((unused)) void *data)
+print_tx_offloads(uint64_t offloads)
 {
-       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
+       uint64_t single_offload;
+       int begin;
+       int end;
+       int bit;
 
-       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+       if (offloads == 0)
                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
+       begin = __builtin_ctzll(offloads);
+       end = sizeof(offloads) * CHAR_BIT - __builtin_clzll(offloads);
 
-       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));
+       single_offload = 1ULL << begin;
+       for (bit = begin; bit < end; bit++) {
+               if (offloads & single_offload)
+                       printf(" %s",
+                              rte_eth_dev_tx_offload_name(single_offload));
+               single_offload <<= 1;
        }
+}
 
-#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
+static void
+cmd_tx_offload_get_capa_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_tx_offload_get_capa_result *res = parsed_result;
+       struct rte_eth_dev_info dev_info;
+       portid_t port_id = res->port_id;
+       uint64_t queue_offloads;
+       uint64_t port_offloads;
+
+       rte_eth_dev_info_get(port_id, &dev_info);
+       queue_offloads = dev_info.tx_queue_offload_capa;
+       port_offloads = dev_info.tx_offload_capa ^ queue_offloads;
+
+       printf("Tx Offloading Capabilities of port %d :\n", port_id);
+       printf("  Per Queue :");
+       print_tx_offloads(queue_offloads);
+
+       printf("\n");
+       printf("  Per Port  :");
+       print_tx_offloads(port_offloads);
+       printf("\n\n");
 }
 
-cmdline_parse_inst_t cmd_ptype_mapping_get = {
-       .f = cmd_ptype_mapping_get_parsed,
+cmdline_parse_inst_t cmd_tx_offload_get_capa = {
+       .f = cmd_tx_offload_get_capa_parsed,
        .data = NULL,
-       .help_str = "ptype mapping get <port_id> <valid_only>",
+       .help_str = "show port <port_id> tx_offload capabilities",
        .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,
+               (void *)&cmd_tx_offload_get_capa_show,
+               (void *)&cmd_tx_offload_get_capa_port,
+               (void *)&cmd_tx_offload_get_capa_port_id,
+               (void *)&cmd_tx_offload_get_capa_tx_offload,
+               (void *)&cmd_tx_offload_get_capa_capabilities,
                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;
+/* Get Tx offloads configuration */
+struct cmd_tx_offload_get_configuration_result {
+       cmdline_fixed_string_t show;
+       cmdline_fixed_string_t port;
        portid_t port_id;
-       uint32_t target;
-       uint8_t mask;
-       uint32_t pkt_type;
+       cmdline_fixed_string_t tx_offload;
+       cmdline_fixed_string_t configuration;
 };
 
-/* 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 =
+cmdline_parse_token_string_t cmd_tx_offload_get_configuration_show =
        TOKEN_STRING_INITIALIZER
-               (struct cmd_ptype_mapping_replace_result,
-                mapping, "mapping");
-cmdline_parse_token_string_t cmd_ptype_mapping_replace_replace =
+               (struct cmd_tx_offload_get_configuration_result,
+                show, "show");
+cmdline_parse_token_string_t cmd_tx_offload_get_configuration_port =
        TOKEN_STRING_INITIALIZER
-               (struct cmd_ptype_mapping_replace_result,
-                replace, "replace");
-cmdline_parse_token_num_t cmd_ptype_mapping_replace_port_id =
+               (struct cmd_tx_offload_get_configuration_result,
+                port, "port");
+cmdline_parse_token_num_t cmd_tx_offload_get_configuration_port_id =
        TOKEN_NUM_INITIALIZER
-               (struct cmd_ptype_mapping_replace_result,
+               (struct cmd_tx_offload_get_configuration_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);
+cmdline_parse_token_string_t cmd_tx_offload_get_configuration_tx_offload =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_tx_offload_get_configuration_result,
+                tx_offload, "tx_offload");
+cmdline_parse_token_string_t cmd_tx_offload_get_configuration_configuration =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_tx_offload_get_configuration_result,
+                configuration, "configuration");
 
 static void
-cmd_ptype_mapping_replace_parsed(
+cmd_tx_offload_get_configuration_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;
+       struct cmd_tx_offload_get_configuration_result *res = parsed_result;
+       struct rte_eth_dev_info dev_info;
+       portid_t port_id = res->port_id;
+       struct rte_port *port = &ports[port_id];
+       uint64_t port_offloads;
+       uint64_t queue_offloads;
+       uint16_t nb_tx_queues;
+       int q;
 
-       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
-               return;
+       printf("Tx Offloading Configuration of port %d :\n", port_id);
 
-#ifdef RTE_LIBRTE_I40E_PMD
-       ret = rte_pmd_i40e_ptype_mapping_replace(res->port_id,
-                                       res->target,
-                                       res->mask,
-                                       res->pkt_type);
-#endif
+       port_offloads = port->dev_conf.txmode.offloads;
+       printf("  Port :");
+       print_tx_offloads(port_offloads);
+       printf("\n");
 
-       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));
+       rte_eth_dev_info_get(port_id, &dev_info);
+       nb_tx_queues = dev_info.nb_tx_queues;
+       for (q = 0; q < nb_tx_queues; q++) {
+               queue_offloads = port->tx_conf[q].offloads;
+               printf("  Queue[%2d] :", q);
+               print_tx_offloads(queue_offloads);
+               printf("\n");
        }
+       printf("\n");
 }
 
-cmdline_parse_inst_t cmd_ptype_mapping_replace = {
-       .f = cmd_ptype_mapping_replace_parsed,
+cmdline_parse_inst_t cmd_tx_offload_get_configuration = {
+       .f = cmd_tx_offload_get_configuration_parsed,
        .data = NULL,
-       .help_str =
-               "ptype mapping replace <port_id> <target> <mask> <pkt_type>",
+       .help_str = "show port <port_id> tx_offload configuration",
        .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,
+               (void *)&cmd_tx_offload_get_configuration_show,
+               (void *)&cmd_tx_offload_get_configuration_port,
+               (void *)&cmd_tx_offload_get_configuration_port_id,
+               (void *)&cmd_tx_offload_get_configuration_tx_offload,
+               (void *)&cmd_tx_offload_get_configuration_configuration,
                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;
+/* Enable/Disable a per port offloading */
+struct cmd_config_per_port_tx_offload_result {
+       cmdline_fixed_string_t port;
+       cmdline_fixed_string_t config;
        portid_t port_id;
+       cmdline_fixed_string_t tx_offload;
+       cmdline_fixed_string_t offload;
+       cmdline_fixed_string_t on_off;
 };
 
-/* 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 =
+cmdline_parse_token_string_t cmd_config_per_port_tx_offload_result_port =
        TOKEN_STRING_INITIALIZER
-               (struct cmd_ptype_mapping_reset_result,
-                mapping, "mapping");
-cmdline_parse_token_string_t cmd_ptype_mapping_reset_reset =
+               (struct cmd_config_per_port_tx_offload_result,
+                port, "port");
+cmdline_parse_token_string_t cmd_config_per_port_tx_offload_result_config =
        TOKEN_STRING_INITIALIZER
-               (struct cmd_ptype_mapping_reset_result,
-                reset, "reset");
-cmdline_parse_token_num_t cmd_ptype_mapping_reset_port_id =
+               (struct cmd_config_per_port_tx_offload_result,
+                config, "config");
+cmdline_parse_token_num_t cmd_config_per_port_tx_offload_result_port_id =
        TOKEN_NUM_INITIALIZER
-               (struct cmd_ptype_mapping_reset_result,
+               (struct cmd_config_per_port_tx_offload_result,
                 port_id, UINT16);
+cmdline_parse_token_string_t cmd_config_per_port_tx_offload_result_tx_offload =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_config_per_port_tx_offload_result,
+                tx_offload, "tx_offload");
+cmdline_parse_token_string_t cmd_config_per_port_tx_offload_result_offload =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_config_per_port_tx_offload_result,
+                offload, "vlan_insert#ipv4_cksum#udp_cksum#tcp_cksum#"
+                         "sctp_cksum#tcp_tso#udp_tso#outer_ipv4_cksum#"
+                         "qinq_insert#vxlan_tnl_tso#gre_tnl_tso#"
+                         "ipip_tnl_tso#geneve_tnl_tso#macsec_insert#"
+                         "mt_lockfree#multi_segs#mbuf_fast_free#security#"
+                         "match_metadata");
+cmdline_parse_token_string_t cmd_config_per_port_tx_offload_result_on_off =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_config_per_port_tx_offload_result,
+                on_off, "on#off");
+
+static uint64_t
+search_tx_offload(const char *name)
+{
+       uint64_t single_offload;
+       const char *single_name;
+       int found = 0;
+       unsigned int bit;
+
+       single_offload = 1;
+       for (bit = 0; bit < sizeof(single_offload) * CHAR_BIT; bit++) {
+               single_name = rte_eth_dev_tx_offload_name(single_offload);
+               if (single_name == NULL)
+                       break;
+               if (!strcasecmp(single_name, name)) {
+                       found = 1;
+                       break;
+               } else if (!strcasecmp(single_name, "UNKNOWN"))
+                       break;
+               single_offload <<= 1;
+       }
+
+       if (found)
+               return single_offload;
+
+       return 0;
+}
 
 static void
-cmd_ptype_mapping_reset_parsed(
-       void *parsed_result,
-       __attribute__((unused)) struct cmdline *cl,
-       __attribute__((unused)) void *data)
+cmd_config_per_port_tx_offload_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;
+       struct cmd_config_per_port_tx_offload_result *res = parsed_result;
+       portid_t port_id = res->port_id;
+       struct rte_eth_dev_info dev_info;
+       struct rte_port *port = &ports[port_id];
+       uint64_t single_offload;
+       uint16_t nb_tx_queues;
+       int q;
 
-       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+       if (port->port_status != RTE_PORT_STOPPED) {
+               printf("Error: Can't config offload when Port %d "
+                      "is not stopped\n", port_id);
                return;
+       }
 
-#ifdef RTE_LIBRTE_I40E_PMD
-       ret = rte_pmd_i40e_ptype_mapping_reset(res->port_id);
-#endif
+       single_offload = search_tx_offload(res->offload);
+       if (single_offload == 0) {
+               printf("Unknown offload name: %s\n", res->offload);
+               return;
+       }
 
-       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));
+       rte_eth_dev_info_get(port_id, &dev_info);
+       nb_tx_queues = dev_info.nb_tx_queues;
+       if (!strcmp(res->on_off, "on")) {
+               port->dev_conf.txmode.offloads |= single_offload;
+               for (q = 0; q < nb_tx_queues; q++)
+                       port->tx_conf[q].offloads |= single_offload;
+       } else {
+               port->dev_conf.txmode.offloads &= ~single_offload;
+               for (q = 0; q < nb_tx_queues; q++)
+                       port->tx_conf[q].offloads &= ~single_offload;
        }
+
+       cmd_reconfig_device_queue(port_id, 1, 1);
 }
 
-cmdline_parse_inst_t cmd_ptype_mapping_reset = {
-       .f = cmd_ptype_mapping_reset_parsed,
+cmdline_parse_inst_t cmd_config_per_port_tx_offload = {
+       .f = cmd_config_per_port_tx_offload_parsed,
        .data = NULL,
-       .help_str = "ptype mapping reset <port_id>",
+       .help_str = "port config <port_id> tx_offload "
+                   "vlan_insert|ipv4_cksum|udp_cksum|tcp_cksum|"
+                   "sctp_cksum|tcp_tso|udp_tso|outer_ipv4_cksum|"
+                   "qinq_insert|vxlan_tnl_tso|gre_tnl_tso|"
+                   "ipip_tnl_tso|geneve_tnl_tso|macsec_insert|"
+                   "mt_lockfree|multi_segs|mbuf_fast_free|security|"
+                   "match_metadata on|off",
        .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,
+               (void *)&cmd_config_per_port_tx_offload_result_port,
+               (void *)&cmd_config_per_port_tx_offload_result_config,
+               (void *)&cmd_config_per_port_tx_offload_result_port_id,
+               (void *)&cmd_config_per_port_tx_offload_result_tx_offload,
+               (void *)&cmd_config_per_port_tx_offload_result_offload,
+               (void *)&cmd_config_per_port_tx_offload_result_on_off,
                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;
+/* Enable/Disable a per queue offloading */
+struct cmd_config_per_queue_tx_offload_result {
+       cmdline_fixed_string_t port;
        portid_t port_id;
-       uint8_t hw_ptype;
-       uint32_t sw_ptype;
+       cmdline_fixed_string_t txq;
+       uint16_t queue_id;
+       cmdline_fixed_string_t tx_offload;
+       cmdline_fixed_string_t offload;
+       cmdline_fixed_string_t on_off;
 };
 
-/* Common CLI fields for ptype mapping update*/
-cmdline_parse_token_string_t cmd_ptype_mapping_update_ptype =
+cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_port =
        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 =
+               (struct cmd_config_per_queue_tx_offload_result,
+                port, "port");
+cmdline_parse_token_num_t cmd_config_per_queue_tx_offload_result_port_id =
        TOKEN_NUM_INITIALIZER
-               (struct cmd_ptype_mapping_update_result,
+               (struct cmd_config_per_queue_tx_offload_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 =
+cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_txq =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_config_per_queue_tx_offload_result,
+                txq, "txq");
+cmdline_parse_token_num_t cmd_config_per_queue_tx_offload_result_queue_id =
        TOKEN_NUM_INITIALIZER
-               (struct cmd_ptype_mapping_update_result,
-                sw_ptype, UINT32);
+               (struct cmd_config_per_queue_tx_offload_result,
+                queue_id, UINT16);
+cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_txoffload =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_config_per_queue_tx_offload_result,
+                tx_offload, "tx_offload");
+cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_offload =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_config_per_queue_tx_offload_result,
+                offload, "vlan_insert#ipv4_cksum#udp_cksum#tcp_cksum#"
+                         "sctp_cksum#tcp_tso#udp_tso#outer_ipv4_cksum#"
+                         "qinq_insert#vxlan_tnl_tso#gre_tnl_tso#"
+                         "ipip_tnl_tso#geneve_tnl_tso#macsec_insert#"
+                         "mt_lockfree#multi_segs#mbuf_fast_free#security");
+cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_on_off =
+       TOKEN_STRING_INITIALIZER
+               (struct cmd_config_per_queue_tx_offload_result,
+                on_off, "on#off");
 
 static void
-cmd_ptype_mapping_update_parsed(
-       void *parsed_result,
-       __attribute__((unused)) struct cmdline *cl,
-       __attribute__((unused)) void *data)
+cmd_config_per_queue_tx_offload_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))
+       struct cmd_config_per_queue_tx_offload_result *res = parsed_result;
+       struct rte_eth_dev_info dev_info;
+       portid_t port_id = res->port_id;
+       uint16_t queue_id = res->queue_id;
+       struct rte_port *port = &ports[port_id];
+       uint64_t single_offload;
+
+       if (port->port_status != RTE_PORT_STOPPED) {
+               printf("Error: Can't config offload when Port %d "
+                      "is not stopped\n", port_id);
                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
+       rte_eth_dev_info_get(port_id, &dev_info);
+       if (queue_id >= dev_info.nb_tx_queues) {
+               printf("Error: input queue_id should be 0 ... "
+                      "%d\n", dev_info.nb_tx_queues - 1);
+               return;
+       }
 
-       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));
+       single_offload = search_tx_offload(res->offload);
+       if (single_offload == 0) {
+               printf("Unknown offload name: %s\n", res->offload);
+               return;
        }
+
+       if (!strcmp(res->on_off, "on"))
+               port->tx_conf[queue_id].offloads |= single_offload;
+       else
+               port->tx_conf[queue_id].offloads &= ~single_offload;
+
+       cmd_reconfig_device_queue(port_id, 1, 1);
 }
 
-cmdline_parse_inst_t cmd_ptype_mapping_update = {
-       .f = cmd_ptype_mapping_update_parsed,
+cmdline_parse_inst_t cmd_config_per_queue_tx_offload = {
+       .f = cmd_config_per_queue_tx_offload_parsed,
        .data = NULL,
-       .help_str = "ptype mapping update <port_id> <hw_ptype> <sw_ptype>",
+       .help_str = "port <port_id> txq <queue_id> tx_offload "
+                   "vlan_insert|ipv4_cksum|udp_cksum|tcp_cksum|"
+                   "sctp_cksum|tcp_tso|udp_tso|outer_ipv4_cksum|"
+                   "qinq_insert|vxlan_tnl_tso|gre_tnl_tso|"
+                   "ipip_tnl_tso|geneve_tnl_tso|macsec_insert|"
+                   "mt_lockfree|multi_segs|mbuf_fast_free|security "
+                   "on|off",
        .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,
+               (void *)&cmd_config_per_queue_tx_offload_result_port,
+               (void *)&cmd_config_per_queue_tx_offload_result_port_id,
+               (void *)&cmd_config_per_queue_tx_offload_result_txq,
+               (void *)&cmd_config_per_queue_tx_offload_result_queue_id,
+               (void *)&cmd_config_per_queue_tx_offload_result_txoffload,
+               (void *)&cmd_config_per_queue_tx_offload_result_offload,
+               (void *)&cmd_config_per_queue_tx_offload_result_on_off,
                NULL,
-       },
+       }
 };
 
-/* Common result structure for file commands */
-struct cmd_cmdfile_result {
-       cmdline_fixed_string_t load;
-       cmdline_fixed_string_t filename;
+/* *** configure tx_metadata for specific port *** */
+struct cmd_config_tx_metadata_specific_result {
+       cmdline_fixed_string_t port;
+       cmdline_fixed_string_t keyword;
+       uint16_t port_id;
+       cmdline_fixed_string_t item;
+       uint32_t value;
 };
 
-/* 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_config_tx_metadata_specific_parsed(void *parsed_result,
+                               __attribute__((unused)) struct cmdline *cl,
+                               __attribute__((unused)) void *data)
+{
+       struct cmd_config_tx_metadata_specific_result *res = parsed_result;
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+       ports[res->port_id].tx_metadata = rte_cpu_to_be_32(res->value);
+       /* Add/remove callback to insert valid metadata in every Tx packet. */
+       if (ports[res->port_id].tx_metadata)
+               add_tx_md_callback(res->port_id);
+       else
+               remove_tx_md_callback(res->port_id);
+}
+
+cmdline_parse_token_string_t cmd_config_tx_metadata_specific_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_config_tx_metadata_specific_result,
+                       port, "port");
+cmdline_parse_token_string_t cmd_config_tx_metadata_specific_keyword =
+       TOKEN_STRING_INITIALIZER(struct cmd_config_tx_metadata_specific_result,
+                       keyword, "config");
+cmdline_parse_token_num_t cmd_config_tx_metadata_specific_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_config_tx_metadata_specific_result,
+                       port_id, UINT16);
+cmdline_parse_token_string_t cmd_config_tx_metadata_specific_item =
+       TOKEN_STRING_INITIALIZER(struct cmd_config_tx_metadata_specific_result,
+                       item, "tx_metadata");
+cmdline_parse_token_num_t cmd_config_tx_metadata_specific_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_config_tx_metadata_specific_result,
+                       value, UINT32);
+
+cmdline_parse_inst_t cmd_config_tx_metadata_specific = {
+       .f = cmd_config_tx_metadata_specific_parsed,
+       .data = NULL,
+       .help_str = "port config <port_id> tx_metadata <value>",
+       .tokens = {
+               (void *)&cmd_config_tx_metadata_specific_port,
+               (void *)&cmd_config_tx_metadata_specific_keyword,
+               (void *)&cmd_config_tx_metadata_specific_id,
+               (void *)&cmd_config_tx_metadata_specific_item,
+               (void *)&cmd_config_tx_metadata_specific_value,
+               NULL,
+       },
+};
+
+/* *** display tx_metadata per port configuration *** */
+struct cmd_show_tx_metadata_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_load_from_file_parsed(
-       void *parsed_result,
-       __attribute__((unused)) struct cmdline *cl,
-       __attribute__((unused)) void *data)
+cmd_show_tx_metadata_parsed(void *parsed_result,
+               __attribute__((unused)) struct cmdline *cl,
+               __attribute__((unused)) void *data)
 {
-       struct cmd_cmdfile_result *res = parsed_result;
+       struct cmd_show_tx_metadata_result *res = parsed_result;
 
-       cmdline_read_from_file(res->filename);
+       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, "tx_metadata")) {
+               printf("Port %u tx_metadata: %u\n", res->cmd_pid,
+                       rte_be_to_cpu_32(ports[res->cmd_pid].tx_metadata));
+       }
 }
 
-cmdline_parse_inst_t cmd_load_from_file = {
-       .f = cmd_load_from_file_parsed,
+cmdline_parse_token_string_t cmd_show_tx_metadata_show =
+       TOKEN_STRING_INITIALIZER(struct cmd_show_tx_metadata_result,
+                       cmd_show, "show");
+cmdline_parse_token_string_t cmd_show_tx_metadata_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_show_tx_metadata_result,
+                       cmd_port, "port");
+cmdline_parse_token_num_t cmd_show_tx_metadata_pid =
+       TOKEN_NUM_INITIALIZER(struct cmd_show_tx_metadata_result,
+                       cmd_pid, UINT16);
+cmdline_parse_token_string_t cmd_show_tx_metadata_keyword =
+       TOKEN_STRING_INITIALIZER(struct cmd_show_tx_metadata_result,
+                       cmd_keyword, "tx_metadata");
+
+cmdline_parse_inst_t cmd_show_tx_metadata = {
+       .f = cmd_show_tx_metadata_parsed,
        .data = NULL,
-       .help_str = "load <filename>",
+       .help_str = "show port <port_id> tx_metadata",
        .tokens = {
-               (void *)&cmd_load_cmdfile,
-               (void *)&cmd_load_cmdfile_filename,
+               (void *)&cmd_show_tx_metadata_show,
+               (void *)&cmd_show_tx_metadata_port,
+               (void *)&cmd_show_tx_metadata_pid,
+               (void *)&cmd_show_tx_metadata_keyword,
                NULL,
        },
 };
@@ -16266,6 +18705,7 @@ cmdline_parse_ctx_t main_ctx[] = {
        (cmdline_parse_inst_t *)&cmd_showqueue,
        (cmdline_parse_inst_t *)&cmd_showportall,
        (cmdline_parse_inst_t *)&cmd_showcfg,
+       (cmdline_parse_inst_t *)&cmd_showfwdall,
        (cmdline_parse_inst_t *)&cmd_start,
        (cmdline_parse_inst_t *)&cmd_start_tx_first,
        (cmdline_parse_inst_t *)&cmd_start_tx_first_n,
@@ -16352,6 +18792,7 @@ cmdline_parse_ctx_t main_ctx[] = {
        (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_set_port_setup_on,
        (cmdline_parse_inst_t *)&cmd_config_speed_all,
        (cmdline_parse_inst_t *)&cmd_config_speed_specific,
        (cmdline_parse_inst_t *)&cmd_config_loopback_all,
@@ -16361,7 +18802,9 @@ cmdline_parse_ctx_t main_ctx[] = {
        (cmdline_parse_inst_t *)&cmd_config_max_pkt_len,
        (cmdline_parse_inst_t *)&cmd_config_rx_mode_flag,
        (cmdline_parse_inst_t *)&cmd_config_rss,
+       (cmdline_parse_inst_t *)&cmd_config_rxtx_ring_size,
        (cmdline_parse_inst_t *)&cmd_config_rxtx_queue,
+       (cmdline_parse_inst_t *)&cmd_config_deferred_start_rxtx_queue,
        (cmdline_parse_inst_t *)&cmd_setup_rxtx_queue,
        (cmdline_parse_inst_t *)&cmd_config_rss_reta,
        (cmdline_parse_inst_t *)&cmd_showport_reta,
@@ -16461,6 +18904,23 @@ cmdline_parse_ctx_t main_ctx[] = {
 #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_set_vxlan,
+       (cmdline_parse_inst_t *)&cmd_set_vxlan_tos_ttl,
+       (cmdline_parse_inst_t *)&cmd_set_vxlan_with_vlan,
+       (cmdline_parse_inst_t *)&cmd_set_nvgre,
+       (cmdline_parse_inst_t *)&cmd_set_nvgre_with_vlan,
+       (cmdline_parse_inst_t *)&cmd_set_l2_encap,
+       (cmdline_parse_inst_t *)&cmd_set_l2_encap_with_vlan,
+       (cmdline_parse_inst_t *)&cmd_set_l2_decap,
+       (cmdline_parse_inst_t *)&cmd_set_l2_decap_with_vlan,
+       (cmdline_parse_inst_t *)&cmd_set_mplsogre_encap,
+       (cmdline_parse_inst_t *)&cmd_set_mplsogre_encap_with_vlan,
+       (cmdline_parse_inst_t *)&cmd_set_mplsogre_decap,
+       (cmdline_parse_inst_t *)&cmd_set_mplsogre_decap_with_vlan,
+       (cmdline_parse_inst_t *)&cmd_set_mplsoudp_encap,
+       (cmdline_parse_inst_t *)&cmd_set_mplsoudp_encap_with_vlan,
+       (cmdline_parse_inst_t *)&cmd_set_mplsoudp_decap,
+       (cmdline_parse_inst_t *)&cmd_set_mplsoudp_decap_with_vlan,
        (cmdline_parse_inst_t *)&cmd_ddp_add,
        (cmdline_parse_inst_t *)&cmd_ddp_del,
        (cmdline_parse_inst_t *)&cmd_ddp_get_list,
@@ -16498,7 +18958,27 @@ cmdline_parse_ctx_t main_ctx[] = {
        (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_suspend_port_tm_node,
+       (cmdline_parse_inst_t *)&cmd_resume_port_tm_node,
        (cmdline_parse_inst_t *)&cmd_port_tm_hierarchy_commit,
+       (cmdline_parse_inst_t *)&cmd_port_tm_mark_ip_ecn,
+       (cmdline_parse_inst_t *)&cmd_port_tm_mark_ip_dscp,
+       (cmdline_parse_inst_t *)&cmd_port_tm_mark_vlan_dei,
+       (cmdline_parse_inst_t *)&cmd_cfg_tunnel_udp_port,
+       (cmdline_parse_inst_t *)&cmd_rx_offload_get_capa,
+       (cmdline_parse_inst_t *)&cmd_rx_offload_get_configuration,
+       (cmdline_parse_inst_t *)&cmd_config_per_port_rx_offload,
+       (cmdline_parse_inst_t *)&cmd_config_per_queue_rx_offload,
+       (cmdline_parse_inst_t *)&cmd_tx_offload_get_capa,
+       (cmdline_parse_inst_t *)&cmd_tx_offload_get_configuration,
+       (cmdline_parse_inst_t *)&cmd_config_per_port_tx_offload,
+       (cmdline_parse_inst_t *)&cmd_config_per_queue_tx_offload,
+#ifdef RTE_LIBRTE_BPF
+       (cmdline_parse_inst_t *)&cmd_operate_bpf_ld_parse,
+       (cmdline_parse_inst_t *)&cmd_operate_bpf_unld_parse,
+#endif
+       (cmdline_parse_inst_t *)&cmd_config_tx_metadata_specific,
+       (cmdline_parse_inst_t *)&cmd_show_tx_metadata,
        NULL,
 };