app/testpmd: adjust on the fly VLAN configuration
[dpdk.git] / app / test-pmd / config.c
index 90e4f19..20a31d0 100644 (file)
 #include <inttypes.h>
 
 #include <sys/queue.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
 
 #include <rte_common.h>
 #include <rte_byteorder.h>
@@ -67,6 +71,9 @@
 #ifdef RTE_LIBRTE_IXGBE_PMD
 #include <rte_pmd_ixgbe.h>
 #endif
+#ifdef RTE_LIBRTE_I40E_PMD
+#include <rte_pmd_i40e.h>
+#endif
 #ifdef RTE_LIBRTE_BNXT_PMD
 #include <rte_pmd_bnxt.h>
 #endif
@@ -285,10 +292,13 @@ nic_xstats_display(portid_t port_id)
        }
 
        /* Display xstats */
-       for (idx_xstat = 0; idx_xstat < cnt_xstats; idx_xstat++)
+       for (idx_xstat = 0; idx_xstat < cnt_xstats; idx_xstat++) {
+               if (xstats_hide_zero && !xstats[idx_xstat].value)
+                       continue;
                printf("%s: %"PRIu64"\n",
                        xstats_names[idx_xstat].name,
                        xstats[idx_xstat].value);
+       }
        free(xstats_names);
        free(xstats);
 }
@@ -407,7 +417,6 @@ tx_queue_infos_display(portid_t port_id, uint16_t queue_id)
        printf("\nTX writeback threshold: %hhu", qinfo.conf.tx_thresh.wthresh);
        printf("\nTX RS threshold: %hu", qinfo.conf.tx_rs_thresh);
        printf("\nTX free threshold: %hu", qinfo.conf.tx_free_thresh);
-       printf("\nTX flags: %#x", qinfo.conf.txq_flags);
        printf("\nTX deferred start: %s",
                (qinfo.conf.tx_deferred_start != 0) ? "on" : "off");
        printf("\nNumber of TXDs: %hu", qinfo.nb_desc);
@@ -512,6 +521,16 @@ port_infos_display(portid_t port_id)
                }
        }
 
+       printf("Minimum size of RX buffer: %u\n", dev_info.min_rx_bufsize);
+       printf("Maximum configurable length of RX packet: %u\n",
+               dev_info.max_rx_pktlen);
+       if (dev_info.max_vfs)
+               printf("Maximum number of VFs: %u\n", dev_info.max_vfs);
+       if (dev_info.max_vmdq_pools)
+               printf("Maximum number of VMDq pools: %u\n",
+                       dev_info.max_vmdq_pools);
+
+       printf("Current number of RX queues: %u\n", dev_info.nb_rx_queues);
        printf("Max possible RX queues: %u\n", dev_info.max_rx_queues);
        printf("Max possible number of RXDs per queue: %hu\n",
                dev_info.rx_desc_lim.nb_max);
@@ -519,6 +538,7 @@ port_infos_display(portid_t port_id)
                dev_info.rx_desc_lim.nb_min);
        printf("RXDs number alignment: %hu\n", dev_info.rx_desc_lim.nb_align);
 
+       printf("Current number of TX queues: %u\n", dev_info.nb_tx_queues);
        printf("Max possible TX queues: %u\n", dev_info.max_tx_queues);
        printf("Max possible number of TXDs per queue: %hu\n",
                dev_info.tx_desc_lim.nb_max);
@@ -530,14 +550,12 @@ port_infos_display(portid_t port_id)
 void
 port_offload_cap_display(portid_t port_id)
 {
-       struct rte_eth_dev *dev;
        struct rte_eth_dev_info dev_info;
        static const char *info_border = "************";
 
        if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
 
-       dev = &rte_eth_devices[port_id];
        rte_eth_dev_info_get(port_id, &dev_info);
 
        printf("\n%s Port %d supported offload features: %s\n",
@@ -545,7 +563,8 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_VLAN_STRIP) {
                printf("VLAN stripped:                 ");
-               if (dev->data->dev_conf.rxmode.hw_vlan_strip)
+               if (ports[port_id].dev_conf.rxmode.offloads &
+                   DEV_RX_OFFLOAD_VLAN_STRIP)
                        printf("on\n");
                else
                        printf("off\n");
@@ -553,7 +572,8 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_QINQ_STRIP) {
                printf("Double VLANs stripped:         ");
-               if (dev->data->dev_conf.rxmode.hw_vlan_extend)
+               if (ports[port_id].dev_conf.rxmode.offloads &
+                   DEV_RX_OFFLOAD_VLAN_EXTEND)
                        printf("on\n");
                else
                        printf("off\n");
@@ -561,7 +581,8 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_IPV4_CKSUM) {
                printf("RX IPv4 checksum:              ");
-               if (dev->data->dev_conf.rxmode.hw_ip_checksum)
+               if (ports[port_id].dev_conf.rxmode.offloads &
+                   DEV_RX_OFFLOAD_IPV4_CKSUM)
                        printf("on\n");
                else
                        printf("off\n");
@@ -569,7 +590,8 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_UDP_CKSUM) {
                printf("RX UDP checksum:               ");
-               if (dev->data->dev_conf.rxmode.hw_ip_checksum)
+               if (ports[port_id].dev_conf.rxmode.offloads &
+                   DEV_RX_OFFLOAD_UDP_CKSUM)
                        printf("on\n");
                else
                        printf("off\n");
@@ -577,18 +599,26 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_TCP_CKSUM) {
                printf("RX TCP checksum:               ");
-               if (dev->data->dev_conf.rxmode.hw_ip_checksum)
+               if (ports[port_id].dev_conf.rxmode.offloads &
+                   DEV_RX_OFFLOAD_TCP_CKSUM)
                        printf("on\n");
                else
                        printf("off\n");
        }
 
-       if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM)
-               printf("RX Outer IPv4 checksum:        on");
+       if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM) {
+               printf("RX Outer IPv4 checksum:               ");
+               if (ports[port_id].dev_conf.rxmode.offloads &
+                   DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM)
+                       printf("on\n");
+               else
+                       printf("off\n");
+       }
 
        if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_TCP_LRO) {
                printf("Large receive offload:         ");
-               if (dev->data->dev_conf.rxmode.enable_lro)
+               if (ports[port_id].dev_conf.rxmode.offloads &
+                   DEV_RX_OFFLOAD_TCP_LRO)
                        printf("on\n");
                else
                        printf("off\n");
@@ -596,8 +626,17 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_VLAN_INSERT) {
                printf("VLAN insert:                   ");
-               if (ports[port_id].tx_ol_flags &
-                   TESTPMD_TX_OFFLOAD_INSERT_VLAN)
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_VLAN_INSERT)
+                       printf("on\n");
+               else
+                       printf("off\n");
+       }
+
+       if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_TIMESTAMP) {
+               printf("HW timestamp:                  ");
+               if (ports[port_id].dev_conf.rxmode.offloads &
+                   DEV_RX_OFFLOAD_TIMESTAMP)
                        printf("on\n");
                else
                        printf("off\n");
@@ -605,8 +644,8 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_QINQ_INSERT) {
                printf("Double VLANs insert:           ");
-               if (ports[port_id].tx_ol_flags &
-                   TESTPMD_TX_OFFLOAD_INSERT_QINQ)
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_QINQ_INSERT)
                        printf("on\n");
                else
                        printf("off\n");
@@ -614,7 +653,8 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_IPV4_CKSUM) {
                printf("TX IPv4 checksum:              ");
-               if (ports[port_id].tx_ol_flags & TESTPMD_TX_OFFLOAD_IP_CKSUM)
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_IPV4_CKSUM)
                        printf("on\n");
                else
                        printf("off\n");
@@ -622,7 +662,8 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_UDP_CKSUM) {
                printf("TX UDP checksum:               ");
-               if (ports[port_id].tx_ol_flags & TESTPMD_TX_OFFLOAD_UDP_CKSUM)
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_UDP_CKSUM)
                        printf("on\n");
                else
                        printf("off\n");
@@ -630,7 +671,8 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_TCP_CKSUM) {
                printf("TX TCP checksum:               ");
-               if (ports[port_id].tx_ol_flags & TESTPMD_TX_OFFLOAD_TCP_CKSUM)
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_TCP_CKSUM)
                        printf("on\n");
                else
                        printf("off\n");
@@ -638,7 +680,8 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_SCTP_CKSUM) {
                printf("TX SCTP checksum:              ");
-               if (ports[port_id].tx_ol_flags & TESTPMD_TX_OFFLOAD_SCTP_CKSUM)
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_SCTP_CKSUM)
                        printf("on\n");
                else
                        printf("off\n");
@@ -646,8 +689,8 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM) {
                printf("TX Outer IPv4 checksum:        ");
-               if (ports[port_id].tx_ol_flags &
-                   TESTPMD_TX_OFFLOAD_OUTER_IP_CKSUM)
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM)
                        printf("on\n");
                else
                        printf("off\n");
@@ -655,7 +698,8 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_TCP_TSO) {
                printf("TX TCP segmentation:           ");
-               if (ports[port_id].tso_segsz != 0)
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_TCP_TSO)
                        printf("on\n");
                else
                        printf("off\n");
@@ -663,7 +707,8 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_UDP_TSO) {
                printf("TX UDP segmentation:           ");
-               if (ports[port_id].tso_segsz != 0)
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_UDP_TSO)
                        printf("on\n");
                else
                        printf("off\n");
@@ -671,7 +716,8 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_VXLAN_TNL_TSO) {
                printf("TSO for VXLAN tunnel packet:   ");
-               if (ports[port_id].tunnel_tso_segsz)
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_VXLAN_TNL_TSO)
                        printf("on\n");
                else
                        printf("off\n");
@@ -679,7 +725,8 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_GRE_TNL_TSO) {
                printf("TSO for GRE tunnel packet:     ");
-               if (ports[port_id].tunnel_tso_segsz)
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_GRE_TNL_TSO)
                        printf("on\n");
                else
                        printf("off\n");
@@ -687,7 +734,8 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_IPIP_TNL_TSO) {
                printf("TSO for IPIP tunnel packet:    ");
-               if (ports[port_id].tunnel_tso_segsz)
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_IPIP_TNL_TSO)
                        printf("on\n");
                else
                        printf("off\n");
@@ -695,7 +743,8 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_GENEVE_TNL_TSO) {
                printf("TSO for GENEVE tunnel packet:  ");
-               if (ports[port_id].tunnel_tso_segsz)
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_GENEVE_TNL_TSO)
                        printf("on\n");
                else
                        printf("off\n");
@@ -1482,7 +1531,7 @@ tx_desc_id_is_invalid(uint16_t txdesc_id)
 }
 
 static const struct rte_memzone *
-ring_dma_zone_lookup(const char *ring_name, uint8_t port_id, uint16_t q_id)
+ring_dma_zone_lookup(const char *ring_name, portid_t port_id, uint16_t q_id)
 {
        char mz_name[RTE_MEMZONE_NAMESIZE];
        const struct rte_memzone *mz;
@@ -1532,9 +1581,9 @@ ring_rxd_display_dword(union igb_ring_dword dword)
 static void
 ring_rx_descriptor_display(const struct rte_memzone *ring_mz,
 #ifndef RTE_LIBRTE_I40E_16BYTE_RX_DESC
-                          uint8_t port_id,
+                          portid_t port_id,
 #else
-                          __rte_unused uint8_t port_id,
+                          __rte_unused portid_t port_id,
 #endif
                           uint16_t desc_id)
 {
@@ -1637,33 +1686,46 @@ fwd_lcores_config_display(void)
 void
 rxtx_config_display(void)
 {
-       printf("  %s packet forwarding%s - CRC stripping %s - "
-              "packets/burst=%d\n", cur_fwd_eng->fwd_mode_name,
+       portid_t pid;
+
+       printf("  %s packet forwarding%s packets/burst=%d\n",
+              cur_fwd_eng->fwd_mode_name,
               retry_enabled == 0 ? "" : " with retry",
-              rx_mode.hw_strip_crc ? "enabled" : "disabled",
               nb_pkt_per_burst);
 
        if (cur_fwd_eng == &tx_only_engine || cur_fwd_eng == &flow_gen_engine)
                printf("  packet len=%u - nb packet segments=%d\n",
                                (unsigned)tx_pkt_length, (int) tx_pkt_nb_segs);
 
-       struct rte_eth_rxconf *rx_conf = &ports[0].rx_conf;
-       struct rte_eth_txconf *tx_conf = &ports[0].tx_conf;
-
        printf("  nb forwarding cores=%d - nb forwarding ports=%d\n",
               nb_fwd_lcores, nb_fwd_ports);
-       printf("  RX queues=%d - RX desc=%d - RX free threshold=%d\n",
-              nb_rxq, nb_rxd, rx_conf->rx_free_thresh);
-       printf("  RX threshold registers: pthresh=%d hthresh=%d wthresh=%d\n",
-              rx_conf->rx_thresh.pthresh, rx_conf->rx_thresh.hthresh,
-              rx_conf->rx_thresh.wthresh);
-       printf("  TX queues=%d - TX desc=%d - TX free threshold=%d\n",
-              nb_txq, nb_txd, tx_conf->tx_free_thresh);
-       printf("  TX threshold registers: pthresh=%d hthresh=%d wthresh=%d\n",
-              tx_conf->tx_thresh.pthresh, tx_conf->tx_thresh.hthresh,
-              tx_conf->tx_thresh.wthresh);
-       printf("  TX RS bit threshold=%d - TXQ flags=0x%"PRIx32"\n",
-              tx_conf->tx_rs_thresh, tx_conf->txq_flags);
+
+       RTE_ETH_FOREACH_DEV(pid) {
+               struct rte_eth_rxconf *rx_conf = &ports[pid].rx_conf;
+               struct rte_eth_txconf *tx_conf = &ports[pid].tx_conf;
+
+               printf("  port %d:\n", (unsigned int)pid);
+               printf("  CRC stripping %s\n",
+                               (ports[pid].dev_conf.rxmode.offloads &
+                                DEV_RX_OFFLOAD_CRC_STRIP) ?
+                               "enabled" : "disabled");
+               printf("  RX queues=%d - RX desc=%d - RX free threshold=%d\n",
+                               nb_rxq, nb_rxd, rx_conf->rx_free_thresh);
+               printf("  RX threshold registers: pthresh=%d hthresh=%d "
+                      " wthresh=%d\n",
+                               rx_conf->rx_thresh.pthresh,
+                               rx_conf->rx_thresh.hthresh,
+                               rx_conf->rx_thresh.wthresh);
+               printf("  TX queues=%d - TX desc=%d - TX free threshold=%d\n",
+                               nb_txq, nb_txd, tx_conf->tx_free_thresh);
+               printf("  TX threshold registers: pthresh=%d hthresh=%d "
+                      " wthresh=%d\n",
+                               tx_conf->tx_thresh.pthresh,
+                               tx_conf->tx_thresh.hthresh,
+                               tx_conf->tx_thresh.wthresh);
+               printf("  TX RS bit threshold=%d - TXQ offloads=0x%"PRIx64"\n",
+                               tx_conf->tx_rs_thresh, tx_conf->offloads);
+       }
 }
 
 void
@@ -1887,7 +1949,7 @@ simple_fwd_config_setup(void)
                fwd_streams[i]->rx_queue  = 0;
                fwd_streams[i]->tx_port   = fwd_ports_ids[j];
                fwd_streams[i]->tx_queue  = 0;
-               fwd_streams[i]->peer_addr = j;
+               fwd_streams[i]->peer_addr = fwd_streams[i]->tx_port;
                fwd_streams[i]->retry_enabled = retry_enabled;
 
                if (port_topology == PORT_TOPOLOGY_PAIRED) {
@@ -1895,7 +1957,7 @@ simple_fwd_config_setup(void)
                        fwd_streams[j]->rx_queue  = 0;
                        fwd_streams[j]->tx_port   = fwd_ports_ids[i];
                        fwd_streams[j]->tx_queue  = 0;
-                       fwd_streams[j]->peer_addr = i;
+                       fwd_streams[j]->peer_addr = fwd_streams[j]->tx_port;
                        fwd_streams[j]->retry_enabled = retry_enabled;
                }
        }
@@ -2510,6 +2572,30 @@ show_gro(portid_t port_id)
                printf("Port %u doesn't enable GRO.\n", port_id);
 }
 
+void
+setup_gso(const char *mode, portid_t port_id)
+{
+       if (!rte_eth_dev_is_valid_port(port_id)) {
+               printf("invalid port id %u\n", port_id);
+               return;
+       }
+       if (strcmp(mode, "on") == 0) {
+               if (test_done == 0) {
+                       printf("before enabling GSO,"
+                                       " please stop forwarding first\n");
+                       return;
+               }
+               gso_ports[port_id].enable = 1;
+       } else if (strcmp(mode, "off") == 0) {
+               if (test_done == 0) {
+                       printf("before disabling GSO,"
+                                       " please stop forwarding first\n");
+                       return;
+               }
+               gso_ports[port_id].enable = 0;
+       }
+}
+
 char*
 list_pkt_forwarding_modes(void)
 {
@@ -2589,21 +2675,26 @@ vlan_extend_set(portid_t port_id, int on)
 {
        int diag;
        int vlan_offload;
+       uint64_t port_rx_offloads = ports[port_id].dev_conf.rxmode.offloads;
 
        if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
 
        vlan_offload = rte_eth_dev_get_vlan_offload(port_id);
 
-       if (on)
+       if (on) {
                vlan_offload |= ETH_VLAN_EXTEND_OFFLOAD;
-       else
+               port_rx_offloads |= DEV_RX_OFFLOAD_VLAN_EXTEND;
+       } else {
                vlan_offload &= ~ETH_VLAN_EXTEND_OFFLOAD;
+               port_rx_offloads &= ~DEV_RX_OFFLOAD_VLAN_EXTEND;
+       }
 
        diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload);
        if (diag < 0)
                printf("rx_vlan_extend_set(port_pi=%d, on=%d) failed "
               "diag=%d\n", port_id, on, diag);
+       ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads;
 }
 
 void
@@ -2611,21 +2702,26 @@ rx_vlan_strip_set(portid_t port_id, int on)
 {
        int diag;
        int vlan_offload;
+       uint64_t port_rx_offloads = ports[port_id].dev_conf.rxmode.offloads;
 
        if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
 
        vlan_offload = rte_eth_dev_get_vlan_offload(port_id);
 
-       if (on)
+       if (on) {
                vlan_offload |= ETH_VLAN_STRIP_OFFLOAD;
-       else
+               port_rx_offloads |= DEV_RX_OFFLOAD_VLAN_STRIP;
+       } else {
                vlan_offload &= ~ETH_VLAN_STRIP_OFFLOAD;
+               port_rx_offloads &= ~DEV_RX_OFFLOAD_VLAN_STRIP;
+       }
 
        diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload);
        if (diag < 0)
                printf("rx_vlan_strip_set(port_pi=%d, on=%d) failed "
               "diag=%d\n", port_id, on, diag);
+       ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads;
 }
 
 void
@@ -2647,21 +2743,26 @@ rx_vlan_filter_set(portid_t port_id, int on)
 {
        int diag;
        int vlan_offload;
+       uint64_t port_rx_offloads = ports[port_id].dev_conf.rxmode.offloads;
 
        if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
 
        vlan_offload = rte_eth_dev_get_vlan_offload(port_id);
 
-       if (on)
+       if (on) {
                vlan_offload |= ETH_VLAN_FILTER_OFFLOAD;
-       else
+               port_rx_offloads |= DEV_RX_OFFLOAD_VLAN_FILTER;
+       } else {
                vlan_offload &= ~ETH_VLAN_FILTER_OFFLOAD;
+               port_rx_offloads &= ~DEV_RX_OFFLOAD_VLAN_FILTER;
+       }
 
        diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload);
        if (diag < 0)
                printf("rx_vlan_filter_set(port_pi=%d, on=%d) failed "
               "diag=%d\n", port_id, on, diag);
+       ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads;
 }
 
 int
@@ -2716,6 +2817,8 @@ void
 tx_vlan_set(portid_t port_id, uint16_t vlan_id)
 {
        int vlan_offload;
+       struct rte_eth_dev_info dev_info;
+
        if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
        if (vlan_id_is_invalid(vlan_id))
@@ -2726,9 +2829,15 @@ tx_vlan_set(portid_t port_id, uint16_t vlan_id)
                printf("Error, as QinQ has been enabled.\n");
                return;
        }
+       rte_eth_dev_info_get(port_id, &dev_info);
+       if ((dev_info.tx_offload_capa & DEV_TX_OFFLOAD_VLAN_INSERT) == 0) {
+               printf("Error: vlan insert is not supported by port %d\n",
+                       port_id);
+               return;
+       }
 
        tx_vlan_reset(port_id);
-       ports[port_id].tx_ol_flags |= TESTPMD_TX_OFFLOAD_INSERT_VLAN;
+       ports[port_id].dev_conf.txmode.offloads |= DEV_TX_OFFLOAD_VLAN_INSERT;
        ports[port_id].tx_vlan_id = vlan_id;
 }
 
@@ -2736,6 +2845,8 @@ void
 tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer)
 {
        int vlan_offload;
+       struct rte_eth_dev_info dev_info;
+
        if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
        if (vlan_id_is_invalid(vlan_id))
@@ -2748,9 +2859,15 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer)
                printf("Error, as QinQ hasn't been enabled.\n");
                return;
        }
+       rte_eth_dev_info_get(port_id, &dev_info);
+       if ((dev_info.tx_offload_capa & DEV_TX_OFFLOAD_QINQ_INSERT) == 0) {
+               printf("Error: qinq insert not supported by port %d\n",
+                       port_id);
+               return;
+       }
 
        tx_vlan_reset(port_id);
-       ports[port_id].tx_ol_flags |= TESTPMD_TX_OFFLOAD_INSERT_QINQ;
+       ports[port_id].dev_conf.txmode.offloads |= DEV_TX_OFFLOAD_QINQ_INSERT;
        ports[port_id].tx_vlan_id = vlan_id;
        ports[port_id].tx_vlan_id_outer = vlan_id_outer;
 }
@@ -2760,8 +2877,9 @@ tx_vlan_reset(portid_t port_id)
 {
        if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
-       ports[port_id].tx_ol_flags &= ~(TESTPMD_TX_OFFLOAD_INSERT_VLAN |
-                               TESTPMD_TX_OFFLOAD_INSERT_QINQ);
+       ports[port_id].dev_conf.txmode.offloads &=
+                               ~(DEV_TX_OFFLOAD_VLAN_INSERT |
+                                 DEV_TX_OFFLOAD_QINQ_INSERT);
        ports[port_id].tx_vlan_id = 0;
        ports[port_id].tx_vlan_id_outer = 0;
 }
@@ -2827,6 +2945,12 @@ set_qmap(portid_t port_id, uint8_t is_rx, uint16_t queue_id, uint8_t map_value)
        }
 }
 
+void
+set_xstats_hide_zero(uint8_t on_off)
+{
+       xstats_hide_zero = on_off;
+}
+
 static inline void
 print_fdir_mask(struct rte_eth_fdir_masks *mask)
 {
@@ -3146,6 +3270,10 @@ set_vf_rate_limit(portid_t port_id, uint16_t vf, uint16_t rate, uint64_t q_msk)
 {
        int diag = -ENOTSUP;
 
+       RTE_SET_USED(vf);
+       RTE_SET_USED(rate);
+       RTE_SET_USED(q_msk);
+
 #ifdef RTE_LIBRTE_IXGBE_PMD
        if (diag == -ENOTSUP)
                diag = rte_pmd_ixgbe_set_vf_rate_limit(port_id, vf, rate,
@@ -3236,7 +3364,7 @@ mcast_addr_pool_remove(struct rte_port *port, uint32_t addr_idx)
 }
 
 static void
-eth_port_multicast_addr_list_set(uint8_t port_id)
+eth_port_multicast_addr_list_set(portid_t port_id)
 {
        struct rte_port *port;
        int diag;
@@ -3251,7 +3379,7 @@ eth_port_multicast_addr_list_set(uint8_t port_id)
 }
 
 void
-mcast_addr_add(uint8_t port_id, struct ether_addr *mc_addr)
+mcast_addr_add(portid_t port_id, struct ether_addr *mc_addr)
 {
        struct rte_port *port;
        uint32_t i;
@@ -3279,7 +3407,7 @@ mcast_addr_add(uint8_t port_id, struct ether_addr *mc_addr)
 }
 
 void
-mcast_addr_remove(uint8_t port_id, struct ether_addr *mc_addr)
+mcast_addr_remove(portid_t port_id, struct ether_addr *mc_addr)
 {
        struct rte_port *port;
        uint32_t i;
@@ -3306,7 +3434,7 @@ mcast_addr_remove(uint8_t port_id, struct ether_addr *mc_addr)
 }
 
 void
-port_dcb_info_display(uint8_t port_id)
+port_dcb_info_display(portid_t port_id)
 {
        struct rte_eth_dcb_info dcb_info;
        uint16_t i;
@@ -3351,46 +3479,43 @@ port_dcb_info_display(uint8_t port_id)
 uint8_t *
 open_ddp_package_file(const char *file_path, uint32_t *size)
 {
-       FILE *fh = fopen(file_path, "rb");
-       uint32_t pkg_size;
+       int fd = open(file_path, O_RDONLY);
+       off_t pkg_size;
        uint8_t *buf = NULL;
        int ret = 0;
+       struct stat st_buf;
 
        if (size)
                *size = 0;
 
-       if (fh == NULL) {
+       if (fd == -1) {
                printf("%s: Failed to open %s\n", __func__, file_path);
                return buf;
        }
 
-       ret = fseek(fh, 0, SEEK_END);
-       if (ret < 0) {
-               fclose(fh);
+       if ((fstat(fd, &st_buf) != 0) || (!S_ISREG(st_buf.st_mode))) {
+               close(fd);
                printf("%s: File operations failed\n", __func__);
                return buf;
        }
 
-       pkg_size = ftell(fh);
+       pkg_size = st_buf.st_size;
+       if (pkg_size < 0) {
+               close(fd);
+               printf("%s: File operations failed\n", __func__);
+               return buf;
+       }
 
        buf = (uint8_t *)malloc(pkg_size);
        if (!buf) {
-               fclose(fh);
+               close(fd);
                printf("%s: Failed to malloc memory\n", __func__);
                return buf;
        }
 
-       ret = fseek(fh, 0, SEEK_SET);
-       if (ret < 0) {
-               fclose(fh);
-               printf("%s: File seek operation failed\n", __func__);
-               close_ddp_package_file(buf);
-               return NULL;
-       }
-
-       ret = fread(buf, 1, pkg_size, fh);
+       ret = read(fd, buf, pkg_size);
        if (ret < 0) {
-               fclose(fh);
+               close(fd);
                printf("%s: File read operation failed\n", __func__);
                close_ddp_package_file(buf);
                return NULL;
@@ -3399,7 +3524,7 @@ open_ddp_package_file(const char *file_path, uint32_t *size)
        if (size)
                *size = pkg_size;
 
-       fclose(fh);
+       close(fd);
 
        return buf;
 }
@@ -3435,3 +3560,46 @@ close_ddp_package_file(uint8_t *buf)
 
        return -1;
 }
+
+void
+port_queue_region_info_display(portid_t port_id, void *buf)
+{
+#ifdef RTE_LIBRTE_I40E_PMD
+       uint16_t i, j;
+       struct rte_pmd_i40e_queue_regions *info =
+               (struct rte_pmd_i40e_queue_regions *)buf;
+       static const char *queue_region_info_stats_border = "-------";
+
+       if (!info->queue_region_number)
+               printf("there is no region has been set before");
+
+       printf("\n      %s All queue region info for port=%2d %s",
+                       queue_region_info_stats_border, port_id,
+                       queue_region_info_stats_border);
+       printf("\n      queue_region_number: %-14u \n",
+                       info->queue_region_number);
+
+       for (i = 0; i < info->queue_region_number; i++) {
+               printf("\n      region_id: %-14u queue_number: %-14u "
+                       "queue_start_index: %-14u \n",
+                       info->region[i].region_id,
+                       info->region[i].queue_num,
+                       info->region[i].queue_start_index);
+
+               printf("  user_priority_num is  %-14u :",
+                                       info->region[i].user_priority_num);
+               for (j = 0; j < info->region[i].user_priority_num; j++)
+                       printf(" %-14u ", info->region[i].user_priority[j]);
+
+               printf("\n      flowtype_num is  %-14u :",
+                               info->region[i].flowtype_num);
+               for (j = 0; j < info->region[i].flowtype_num; j++)
+                       printf(" %-14u ", info->region[i].hw_flowtype[j]);
+       }
+#else
+       RTE_SET_USED(port_id);
+       RTE_SET_USED(buf);
+#endif
+
+       printf("\n\n");
+}