app/testpmd: check status of getting MAC address
[dpdk.git] / app / test-pmd / config.c
index 3a244f5..957c61f 100644 (file)
@@ -1,75 +1,20 @@
-/*-
- *   BSD LICENSE
- * 
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
- *   All rights reserved.
- * 
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- * 
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- * 
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*   BSD LICENSE
- *
- *   Copyright(c) 2013 6WIND.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of 6WIND S.A. nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2016 Intel Corporation.
+ * Copyright 2013-2014 6WIND S.A.
  */
 
 #include <stdarg.h>
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdarg.h>
 #include <stdint.h>
 #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>
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
 #include <rte_launch.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_per_lcore.h>
 #include <rte_lcore.h>
 #include <rte_atomic.h>
 #include <rte_branch_prediction.h>
-#include <rte_ring.h>
 #include <rte_mempool.h>
 #include <rte_mbuf.h>
 #include <rte_interrupts.h>
 #include <rte_ether.h>
 #include <rte_ethdev.h>
 #include <rte_string_fns.h>
+#include <rte_cycles.h>
+#include <rte_flow.h>
+#include <rte_errno.h>
+#ifdef RTE_LIBRTE_IXGBE_PMD
+#include <rte_pmd_ixgbe.h>
+#endif
+#ifdef RTE_LIBRTE_I40E_PMD
+#include <rte_pmd_i40e.h>
+#endif
+#ifdef RTE_LIBRTE_BNXT_PMD
+#include <rte_pmd_bnxt.h>
+#endif
+#include <rte_gro.h>
+#include <rte_config.h>
 
 #include "testpmd.h"
 
+static char *flowtype_to_str(uint16_t flow_type);
+
+static const struct {
+       enum tx_pkt_split split;
+       const char *name;
+} tx_split_name[] = {
+       {
+               .split = TX_PKT_SPLIT_OFF,
+               .name = "off",
+       },
+       {
+               .split = TX_PKT_SPLIT_ON,
+               .name = "on",
+       },
+       {
+               .split = TX_PKT_SPLIT_RND,
+               .name = "rand",
+       },
+};
+
+const struct rss_type_info rss_type_table[] = {
+       { "all", ETH_RSS_IP | ETH_RSS_TCP |
+                       ETH_RSS_UDP | ETH_RSS_SCTP |
+                       ETH_RSS_L2_PAYLOAD },
+       { "none", 0 },
+       { "ipv4", ETH_RSS_IPV4 },
+       { "ipv4-frag", ETH_RSS_FRAG_IPV4 },
+       { "ipv4-tcp", ETH_RSS_NONFRAG_IPV4_TCP },
+       { "ipv4-udp", ETH_RSS_NONFRAG_IPV4_UDP },
+       { "ipv4-sctp", ETH_RSS_NONFRAG_IPV4_SCTP },
+       { "ipv4-other", ETH_RSS_NONFRAG_IPV4_OTHER },
+       { "ipv6", ETH_RSS_IPV6 },
+       { "ipv6-frag", ETH_RSS_FRAG_IPV6 },
+       { "ipv6-tcp", ETH_RSS_NONFRAG_IPV6_TCP },
+       { "ipv6-udp", ETH_RSS_NONFRAG_IPV6_UDP },
+       { "ipv6-sctp", ETH_RSS_NONFRAG_IPV6_SCTP },
+       { "ipv6-other", ETH_RSS_NONFRAG_IPV6_OTHER },
+       { "l2-payload", ETH_RSS_L2_PAYLOAD },
+       { "ipv6-ex", ETH_RSS_IPV6_EX },
+       { "ipv6-tcp-ex", ETH_RSS_IPV6_TCP_EX },
+       { "ipv6-udp-ex", ETH_RSS_IPV6_UDP_EX },
+       { "port", ETH_RSS_PORT },
+       { "vxlan", ETH_RSS_VXLAN },
+       { "geneve", ETH_RSS_GENEVE },
+       { "nvgre", ETH_RSS_NVGRE },
+       { "ip", ETH_RSS_IP },
+       { "udp", ETH_RSS_UDP },
+       { "tcp", ETH_RSS_TCP },
+       { "sctp", ETH_RSS_SCTP },
+       { "tunnel", ETH_RSS_TUNNEL },
+       { NULL, 0 },
+};
+
 static void
-print_ethaddr(const char *name, struct ether_addr *eth_addr)
+print_ethaddr(const char *name, struct rte_ether_addr *eth_addr)
 {
-       printf("%s%02X:%02X:%02X:%02X:%02X:%02X", name,
-              eth_addr->addr_bytes[0],
-              eth_addr->addr_bytes[1],
-              eth_addr->addr_bytes[2],
-              eth_addr->addr_bytes[3],
-              eth_addr->addr_bytes[4],
-              eth_addr->addr_bytes[5]);
+       char buf[RTE_ETHER_ADDR_FMT_SIZE];
+       rte_ether_format_addr(buf, RTE_ETHER_ADDR_FMT_SIZE, eth_addr);
+       printf("%s%s", name, buf);
 }
 
 void
 nic_stats_display(portid_t port_id)
 {
+       static uint64_t prev_pkts_rx[RTE_MAX_ETHPORTS];
+       static uint64_t prev_pkts_tx[RTE_MAX_ETHPORTS];
+       static uint64_t prev_cycles[RTE_MAX_ETHPORTS];
+       uint64_t diff_pkts_rx, diff_pkts_tx, diff_cycles;
+       uint64_t mpps_rx, mpps_tx;
        struct rte_eth_stats stats;
        struct rte_port *port = &ports[port_id];
        uint8_t i;
 
        static const char *nic_stats_border = "########################";
 
-       if (port_id >= nb_ports) {
-               printf("Invalid port, range is [0, %d]\n", nb_ports - 1);
+       if (port_id_is_invalid(port_id, ENABLED_WARN)) {
+               print_valid_ports();
                return;
        }
        rte_eth_stats_get(port_id, &stats);
@@ -126,28 +137,28 @@ nic_stats_display(portid_t port_id)
               nic_stats_border, port_id, nic_stats_border);
 
        if ((!port->rx_queue_stats_mapping_enabled) && (!port->tx_queue_stats_mapping_enabled)) {
-               printf("  RX-packets: %-10"PRIu64" RX-errors: %-10"PRIu64"RX-bytes: "
-                      "%-"PRIu64"\n"
-                      "  TX-packets: %-10"PRIu64" TX-errors: %-10"PRIu64"TX-bytes: "
+               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.ipackets, stats.ierrors, stats.ibytes,
                       stats.opackets, stats.oerrors, stats.obytes);
        }
        else {
                printf("  RX-packets:              %10"PRIu64"    RX-errors: %10"PRIu64
-                      "    RX-bytes: %10"PRIu64"\n"
-                      "  TX-packets:              %10"PRIu64"    TX-errors: %10"PRIu64
+                      "    RX-bytes: %10"PRIu64"\n",
+                      stats.ipackets, stats.ierrors, stats.ibytes);
+               printf("  RX-errors:  %10"PRIu64"\n", stats.ierrors);
+               printf("  RX-nombuf:               %10"PRIu64"\n",
+                      stats.rx_nombuf);
+               printf("  TX-packets:              %10"PRIu64"    TX-errors: %10"PRIu64
                       "    TX-bytes: %10"PRIu64"\n",
-                      stats.ipackets, stats.ierrors, stats.ibytes,
                       stats.opackets, stats.oerrors, stats.obytes);
        }
 
-       /* stats fdir */
-       if (fdir_conf.mode != RTE_FDIR_MODE_NONE)
-               printf("  Fdirmiss:   %-10"PRIu64" Fdirmatch: %-10"PRIu64"\n",
-                      stats.fdirmiss,
-                      stats.fdirmatch);
-
        if (port->rx_queue_stats_mapping_enabled) {
                printf("\n");
                for (i = 0; i < RTE_ETHDEV_QUEUE_STAT_CNTRS; i++) {
@@ -166,6 +177,25 @@ nic_stats_display(portid_t port_id)
                }
        }
 
+       diff_cycles = prev_cycles[port_id];
+       prev_cycles[port_id] = rte_rdtsc();
+       if (diff_cycles > 0)
+               diff_cycles = prev_cycles[port_id] - diff_cycles;
+
+       diff_pkts_rx = (stats.ipackets > prev_pkts_rx[port_id]) ?
+               (stats.ipackets - prev_pkts_rx[port_id]) : 0;
+       diff_pkts_tx = (stats.opackets > prev_pkts_tx[port_id]) ?
+               (stats.opackets - prev_pkts_tx[port_id]) : 0;
+       prev_pkts_rx[port_id] = stats.ipackets;
+       prev_pkts_tx[port_id] = stats.opackets;
+       mpps_rx = diff_cycles > 0 ?
+               diff_pkts_rx * rte_get_tsc_hz() / diff_cycles : 0;
+       mpps_tx = diff_cycles > 0 ?
+               diff_pkts_tx * rte_get_tsc_hz() / diff_cycles : 0;
+       printf("\n  Throughput (since last show)\n");
+       printf("  Rx-pps: %12"PRIu64"\n  Tx-pps: %12"PRIu64"\n",
+                       mpps_rx, mpps_tx);
+
        printf("  %s############################%s\n",
               nic_stats_border, nic_stats_border);
 }
@@ -173,14 +203,84 @@ nic_stats_display(portid_t port_id)
 void
 nic_stats_clear(portid_t port_id)
 {
-       if (port_id >= nb_ports) {
-               printf("Invalid port, range is [0, %d]\n", nb_ports - 1);
+       if (port_id_is_invalid(port_id, ENABLED_WARN)) {
+               print_valid_ports();
                return;
        }
        rte_eth_stats_reset(port_id);
        printf("\n  NIC statistics for port %d cleared\n", port_id);
 }
 
+void
+nic_xstats_display(portid_t port_id)
+{
+       struct rte_eth_xstat *xstats;
+       int cnt_xstats, idx_xstat;
+       struct rte_eth_xstat_name *xstats_names;
+
+       printf("###### NIC extended statistics for port %-2d\n", port_id);
+       if (!rte_eth_dev_is_valid_port(port_id)) {
+               printf("Error: Invalid port number %i\n", port_id);
+               return;
+       }
+
+       /* Get count */
+       cnt_xstats = rte_eth_xstats_get_names(port_id, NULL, 0);
+       if (cnt_xstats  < 0) {
+               printf("Error: Cannot get count of xstats\n");
+               return;
+       }
+
+       /* Get id-name lookup table */
+       xstats_names = malloc(sizeof(struct rte_eth_xstat_name) * cnt_xstats);
+       if (xstats_names == NULL) {
+               printf("Cannot allocate memory for xstats lookup\n");
+               return;
+       }
+       if (cnt_xstats != rte_eth_xstats_get_names(
+                       port_id, xstats_names, cnt_xstats)) {
+               printf("Error: Cannot get xstats lookup\n");
+               free(xstats_names);
+               return;
+       }
+
+       /* Get stats themselves */
+       xstats = malloc(sizeof(struct rte_eth_xstat) * cnt_xstats);
+       if (xstats == NULL) {
+               printf("Cannot allocate memory for xstats\n");
+               free(xstats_names);
+               return;
+       }
+       if (cnt_xstats != rte_eth_xstats_get(port_id, xstats, cnt_xstats)) {
+               printf("Error: Unable to get xstats\n");
+               free(xstats_names);
+               free(xstats);
+               return;
+       }
+
+       /* Display xstats */
+       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);
+}
+
+void
+nic_xstats_clear(portid_t port_id)
+{
+       int ret;
+
+       ret = rte_eth_xstats_reset(port_id);
+       if (ret != 0) {
+               printf("%s: Error: failed to reset xstats (port %u): %s",
+                      __func__, port_id, strerror(ret));
+       }
+}
 
 void
 nic_stats_mapping_display(portid_t port_id)
@@ -190,8 +290,8 @@ nic_stats_mapping_display(portid_t port_id)
 
        static const char *nic_stats_mapping_border = "########################";
 
-       if (port_id >= nb_ports) {
-               printf("Invalid port, range is [0, %d]\n", nb_ports - 1);
+       if (port_id_is_invalid(port_id, ENABLED_WARN)) {
+               print_valid_ports();
                return;
        }
 
@@ -230,27 +330,180 @@ nic_stats_mapping_display(portid_t port_id)
               nic_stats_mapping_border, nic_stats_mapping_border);
 }
 
+void
+rx_queue_infos_display(portid_t port_id, uint16_t queue_id)
+{
+       struct rte_eth_rxq_info qinfo;
+       int32_t rc;
+       static const char *info_border = "*********************";
+
+       rc = rte_eth_rx_queue_info_get(port_id, queue_id, &qinfo);
+       if (rc != 0) {
+               printf("Failed to retrieve information for port: %u, "
+                       "RX queue: %hu\nerror desc: %s(%d)\n",
+                       port_id, queue_id, strerror(-rc), rc);
+               return;
+       }
+
+       printf("\n%s Infos for port %-2u, RX queue %-2u %s",
+              info_border, port_id, queue_id, info_border);
+
+       printf("\nMempool: %s", (qinfo.mp == NULL) ? "NULL" : qinfo.mp->name);
+       printf("\nRX prefetch threshold: %hhu", qinfo.conf.rx_thresh.pthresh);
+       printf("\nRX host threshold: %hhu", qinfo.conf.rx_thresh.hthresh);
+       printf("\nRX writeback threshold: %hhu", qinfo.conf.rx_thresh.wthresh);
+       printf("\nRX free threshold: %hu", qinfo.conf.rx_free_thresh);
+       printf("\nRX drop packets: %s",
+               (qinfo.conf.rx_drop_en != 0) ? "on" : "off");
+       printf("\nRX deferred start: %s",
+               (qinfo.conf.rx_deferred_start != 0) ? "on" : "off");
+       printf("\nRX scattered packets: %s",
+               (qinfo.scattered_rx != 0) ? "on" : "off");
+       printf("\nNumber of RXDs: %hu", qinfo.nb_desc);
+       printf("\n");
+}
+
+void
+tx_queue_infos_display(portid_t port_id, uint16_t queue_id)
+{
+       struct rte_eth_txq_info qinfo;
+       int32_t rc;
+       static const char *info_border = "*********************";
+
+       rc = rte_eth_tx_queue_info_get(port_id, queue_id, &qinfo);
+       if (rc != 0) {
+               printf("Failed to retrieve information for port: %u, "
+                       "TX queue: %hu\nerror desc: %s(%d)\n",
+                       port_id, queue_id, strerror(-rc), rc);
+               return;
+       }
+
+       printf("\n%s Infos for port %-2u, TX queue %-2u %s",
+              info_border, port_id, queue_id, info_border);
+
+       printf("\nTX prefetch threshold: %hhu", qinfo.conf.tx_thresh.pthresh);
+       printf("\nTX host threshold: %hhu", qinfo.conf.tx_thresh.hthresh);
+       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 deferred start: %s",
+               (qinfo.conf.tx_deferred_start != 0) ? "on" : "off");
+       printf("\nNumber of TXDs: %hu", qinfo.nb_desc);
+       printf("\n");
+}
+
+static int bus_match_all(const struct rte_bus *bus, const void *data)
+{
+       RTE_SET_USED(bus);
+       RTE_SET_USED(data);
+       return 0;
+}
+
+void
+device_infos_display(const char *identifier)
+{
+       static const char *info_border = "*********************";
+       struct rte_bus *start = NULL, *next;
+       struct rte_dev_iterator dev_iter;
+       char name[RTE_ETH_NAME_MAX_LEN];
+       struct rte_ether_addr mac_addr;
+       struct rte_device *dev;
+       struct rte_devargs da;
+       portid_t port_id;
+       char devstr[128];
+
+       memset(&da, 0, sizeof(da));
+       if (!identifier)
+               goto skip_parse;
+
+       if (rte_devargs_parsef(&da, "%s", identifier)) {
+               printf("cannot parse identifier\n");
+               if (da.args)
+                       free(da.args);
+               return;
+       }
+
+skip_parse:
+       while ((next = rte_bus_find(start, bus_match_all, NULL)) != NULL) {
+
+               start = next;
+               if (identifier && da.bus != next)
+                       continue;
+
+               /* Skip buses that don't have iterate method */
+               if (!next->dev_iterate)
+                       continue;
+
+               snprintf(devstr, sizeof(devstr), "bus=%s", next->name);
+               RTE_DEV_FOREACH(dev, devstr, &dev_iter) {
+
+                       if (!dev->driver)
+                               continue;
+                       /* Check for matching device if identifier is present */
+                       if (identifier &&
+                           strncmp(da.name, dev->name, strlen(dev->name)))
+                               continue;
+                       printf("\n%s Infos for device %s %s\n",
+                              info_border, dev->name, info_border);
+                       printf("Bus name: %s", dev->bus->name);
+                       printf("\nDriver name: %s", dev->driver->name);
+                       printf("\nDevargs: %s",
+                              dev->devargs ? dev->devargs->args : "");
+                       printf("\nConnect to socket: %d", dev->numa_node);
+                       printf("\n");
+
+                       /* List ports with matching device name */
+                       RTE_ETH_FOREACH_DEV_OF(port_id, dev) {
+                               printf("\n\tPort id: %-2d", port_id);
+                               if (eth_macaddr_get_print_err(port_id,
+                                                             &mac_addr) == 0)
+                                       print_ethaddr("\n\tMAC address: ",
+                                                     &mac_addr);
+                               rte_eth_dev_get_name_by_port(port_id, name);
+                               printf("\n\tDevice name: %s", name);
+                               printf("\n");
+                       }
+               }
+       };
+}
+
 void
 port_infos_display(portid_t port_id)
 {
        struct rte_port *port;
+       struct rte_ether_addr mac_addr;
        struct rte_eth_link link;
+       struct rte_eth_dev_info dev_info;
        int vlan_offload;
-       int socket_id;
        struct rte_mempool * mp;
        static const char *info_border = "*********************";
+       uint16_t mtu;
+       char name[RTE_ETH_NAME_MAX_LEN];
+       int ret;
 
-       if (port_id >= nb_ports) {
-               printf("Invalid port, range is [0, %d]\n", nb_ports - 1);
+       if (port_id_is_invalid(port_id, ENABLED_WARN)) {
+               print_valid_ports();
                return;
        }
        port = &ports[port_id];
-       rte_eth_link_get_nowait(port_id, &link);
-       socket_id = rte_eth_dev_socket_id(port_id);
+       ret = eth_link_get_nowait_print_err(port_id, &link);
+       if (ret < 0)
+               return;
+
+       ret = eth_dev_info_get_print_err(port_id, &dev_info);
+       if (ret != 0)
+               return;
+
        printf("\n%s Infos for port %-2d %s\n",
               info_border, port_id, info_border);
-       print_ethaddr("MAC address: ", &port->eth_addr);
-       printf("\nConnect to socket: %d",socket_id);
+       if (eth_macaddr_get_print_err(port_id, &mac_addr) == 0)
+               print_ethaddr("MAC address: ", &mac_addr);
+       rte_eth_dev_get_name_by_port(port_id, name);
+       printf("\nDevice name: %s", name);
+       printf("\nDriver name: %s", dev_info.driver_name);
+       if (dev_info.device->devargs && dev_info.device->devargs->args)
+               printf("\nDevargs: %s", dev_info.device->devargs->args);
+       printf("\nConnect to socket: %u", port->socket_id);
 
        if (port_numa[port_id] != NUMA_NO_CONFIG) {
                mp = mbuf_pool_find(port_numa[port_id]);
@@ -258,12 +511,16 @@ port_infos_display(portid_t port_id)
                        printf("\nmemory allocation on the socket: %d",
                                                        port_numa[port_id]);
        } else
-               printf("\nmemory allocation on the socket: %d",socket_id);
+               printf("\nmemory allocation on the socket: %u",port->socket_id);
 
        printf("\nLink status: %s\n", (link.link_status) ? ("up") : ("down"));
        printf("Link speed: %u Mbps\n", (unsigned) link.link_speed);
        printf("Link duplex: %s\n", (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
               ("full-duplex") : ("half-duplex"));
+
+       if (!rte_eth_dev_get_mtu(port_id, &mtu))
+               printf("MTU: %u\n", mtu);
+
        printf("Promiscuous mode: %s\n",
               rte_eth_promiscuous_get(port_id) ? "enabled" : "disabled");
        printf("Allmulticast mode: %s\n",
@@ -291,17 +548,418 @@ port_infos_display(portid_t port_id)
                else
                        printf("  qinq(extend) off \n");
        }
+
+       if (dev_info.hash_key_size > 0)
+               printf("Hash key size in bytes: %u\n", dev_info.hash_key_size);
+       if (dev_info.reta_size > 0)
+               printf("Redirection table size: %u\n", dev_info.reta_size);
+       if (!dev_info.flow_type_rss_offloads)
+               printf("No RSS offload flow type is supported.\n");
+       else {
+               uint16_t i;
+               char *p;
+
+               printf("Supported RSS offload flow types:\n");
+               for (i = RTE_ETH_FLOW_UNKNOWN + 1;
+                    i < sizeof(dev_info.flow_type_rss_offloads) * CHAR_BIT; i++) {
+                       if (!(dev_info.flow_type_rss_offloads & (1ULL << i)))
+                               continue;
+                       p = flowtype_to_str(i);
+                       if (p)
+                               printf("  %s\n", p);
+                       else
+                               printf("  user defined %d\n", i);
+               }
+       }
+
+       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);
+       printf("Min possible number of RXDs per queue: %hu\n",
+               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);
+       printf("Min possible number of TXDs per queue: %hu\n",
+               dev_info.tx_desc_lim.nb_min);
+       printf("TXDs number alignment: %hu\n", dev_info.tx_desc_lim.nb_align);
+       printf("Max segment number per packet: %hu\n",
+               dev_info.tx_desc_lim.nb_seg_max);
+       printf("Max segment number per MTU/TSO: %hu\n",
+               dev_info.tx_desc_lim.nb_mtu_seg_max);
+
+       /* Show switch info only if valid switch domain and port id is set */
+       if (dev_info.switch_info.domain_id !=
+               RTE_ETH_DEV_SWITCH_DOMAIN_ID_INVALID) {
+               if (dev_info.switch_info.name)
+                       printf("Switch name: %s\n", dev_info.switch_info.name);
+
+               printf("Switch domain Id: %u\n",
+                       dev_info.switch_info.domain_id);
+               printf("Switch Port Id: %u\n",
+                       dev_info.switch_info.port_id);
+       }
 }
 
-static int
-port_id_is_invalid(portid_t port_id)
+void
+port_summary_header_display(void)
+{
+       uint16_t port_number;
+
+       port_number = rte_eth_dev_count_avail();
+       printf("Number of available ports: %i\n", port_number);
+       printf("%-4s %-17s %-12s %-14s %-8s %s\n", "Port", "MAC Address", "Name",
+                       "Driver", "Status", "Link");
+}
+
+void
+port_summary_display(portid_t port_id)
+{
+       struct rte_ether_addr mac_addr;
+       struct rte_eth_link link;
+       struct rte_eth_dev_info dev_info;
+       char name[RTE_ETH_NAME_MAX_LEN];
+       int ret;
+
+       if (port_id_is_invalid(port_id, ENABLED_WARN)) {
+               print_valid_ports();
+               return;
+       }
+
+       ret = eth_link_get_nowait_print_err(port_id, &link);
+       if (ret < 0)
+               return;
+
+       ret = eth_dev_info_get_print_err(port_id, &dev_info);
+       if (ret != 0)
+               return;
+
+       rte_eth_dev_get_name_by_port(port_id, name);
+       ret = eth_macaddr_get_print_err(port_id, &mac_addr);
+       if (ret != 0)
+               return;
+
+       printf("%-4d %02X:%02X:%02X:%02X:%02X:%02X %-12s %-14s %-8s %uMbps\n",
+               port_id, mac_addr.addr_bytes[0], mac_addr.addr_bytes[1],
+               mac_addr.addr_bytes[2], mac_addr.addr_bytes[3],
+               mac_addr.addr_bytes[4], mac_addr.addr_bytes[5], name,
+               dev_info.driver_name, (link.link_status) ? ("up") : ("down"),
+               (unsigned int) link.link_speed);
+}
+
+void
+port_offload_cap_display(portid_t port_id)
+{
+       struct rte_eth_dev_info dev_info;
+       static const char *info_border = "************";
+       int ret;
+
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
+               return;
+
+       ret = eth_dev_info_get_print_err(port_id, &dev_info);
+       if (ret != 0)
+               return;
+
+       printf("\n%s Port %d supported offload features: %s\n",
+               info_border, port_id, info_border);
+
+       if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_VLAN_STRIP) {
+               printf("VLAN stripped:                 ");
+               if (ports[port_id].dev_conf.rxmode.offloads &
+                   DEV_RX_OFFLOAD_VLAN_STRIP)
+                       printf("on\n");
+               else
+                       printf("off\n");
+       }
+
+       if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_QINQ_STRIP) {
+               printf("Double VLANs stripped:         ");
+               if (ports[port_id].dev_conf.rxmode.offloads &
+                   DEV_RX_OFFLOAD_QINQ_STRIP)
+                       printf("on\n");
+               else
+                       printf("off\n");
+       }
+
+       if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_IPV4_CKSUM) {
+               printf("RX IPv4 checksum:              ");
+               if (ports[port_id].dev_conf.rxmode.offloads &
+                   DEV_RX_OFFLOAD_IPV4_CKSUM)
+                       printf("on\n");
+               else
+                       printf("off\n");
+       }
+
+       if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_UDP_CKSUM) {
+               printf("RX UDP checksum:               ");
+               if (ports[port_id].dev_conf.rxmode.offloads &
+                   DEV_RX_OFFLOAD_UDP_CKSUM)
+                       printf("on\n");
+               else
+                       printf("off\n");
+       }
+
+       if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_TCP_CKSUM) {
+               printf("RX TCP 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_SCTP_CKSUM) {
+               printf("RX SCTP checksum:              ");
+               if (ports[port_id].dev_conf.rxmode.offloads &
+                   DEV_RX_OFFLOAD_SCTP_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:        ");
+               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_OUTER_UDP_CKSUM) {
+               printf("RX Outer UDP checksum:         ");
+               if (ports[port_id].dev_conf.rxmode.offloads &
+                   DEV_RX_OFFLOAD_OUTER_UDP_CKSUM)
+                       printf("on\n");
+               else
+                       printf("off\n");
+       }
+
+       if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_TCP_LRO) {
+               printf("Large receive offload:         ");
+               if (ports[port_id].dev_conf.rxmode.offloads &
+                   DEV_RX_OFFLOAD_TCP_LRO)
+                       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");
+       }
+
+       if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_KEEP_CRC) {
+               printf("Rx Keep CRC:                   ");
+               if (ports[port_id].dev_conf.rxmode.offloads &
+                   DEV_RX_OFFLOAD_KEEP_CRC)
+                       printf("on\n");
+               else
+                       printf("off\n");
+       }
+
+       if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_SECURITY) {
+               printf("RX offload security:           ");
+               if (ports[port_id].dev_conf.rxmode.offloads &
+                   DEV_RX_OFFLOAD_SECURITY)
+                       printf("on\n");
+               else
+                       printf("off\n");
+       }
+
+       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_VLAN_INSERT) {
+               printf("VLAN insert:                   ");
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_VLAN_INSERT)
+                       printf("on\n");
+               else
+                       printf("off\n");
+       }
+
+       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_QINQ_INSERT) {
+               printf("Double VLANs insert:           ");
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_QINQ_INSERT)
+                       printf("on\n");
+               else
+                       printf("off\n");
+       }
+
+       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_IPV4_CKSUM) {
+               printf("TX IPv4 checksum:              ");
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_IPV4_CKSUM)
+                       printf("on\n");
+               else
+                       printf("off\n");
+       }
+
+       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_UDP_CKSUM) {
+               printf("TX UDP checksum:               ");
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_UDP_CKSUM)
+                       printf("on\n");
+               else
+                       printf("off\n");
+       }
+
+       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_TCP_CKSUM) {
+               printf("TX TCP checksum:               ");
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_TCP_CKSUM)
+                       printf("on\n");
+               else
+                       printf("off\n");
+       }
+
+       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_SCTP_CKSUM) {
+               printf("TX SCTP checksum:              ");
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_SCTP_CKSUM)
+                       printf("on\n");
+               else
+                       printf("off\n");
+       }
+
+       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM) {
+               printf("TX Outer IPv4 checksum:        ");
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM)
+                       printf("on\n");
+               else
+                       printf("off\n");
+       }
+
+       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_TCP_TSO) {
+               printf("TX TCP segmentation:           ");
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_TCP_TSO)
+                       printf("on\n");
+               else
+                       printf("off\n");
+       }
+
+       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_UDP_TSO) {
+               printf("TX UDP segmentation:           ");
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_UDP_TSO)
+                       printf("on\n");
+               else
+                       printf("off\n");
+       }
+
+       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_VXLAN_TNL_TSO) {
+               printf("TSO for VXLAN tunnel packet:   ");
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_VXLAN_TNL_TSO)
+                       printf("on\n");
+               else
+                       printf("off\n");
+       }
+
+       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_GRE_TNL_TSO) {
+               printf("TSO for GRE tunnel packet:     ");
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_GRE_TNL_TSO)
+                       printf("on\n");
+               else
+                       printf("off\n");
+       }
+
+       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_IPIP_TNL_TSO) {
+               printf("TSO for IPIP tunnel packet:    ");
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_IPIP_TNL_TSO)
+                       printf("on\n");
+               else
+                       printf("off\n");
+       }
+
+       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_GENEVE_TNL_TSO) {
+               printf("TSO for GENEVE tunnel packet:  ");
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_GENEVE_TNL_TSO)
+                       printf("on\n");
+               else
+                       printf("off\n");
+       }
+
+       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_IP_TNL_TSO) {
+               printf("IP tunnel TSO:  ");
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_IP_TNL_TSO)
+                       printf("on\n");
+               else
+                       printf("off\n");
+       }
+
+       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_UDP_TNL_TSO) {
+               printf("UDP tunnel TSO:  ");
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_UDP_TNL_TSO)
+                       printf("on\n");
+               else
+                       printf("off\n");
+       }
+
+       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_OUTER_UDP_CKSUM) {
+               printf("TX Outer UDP checksum:         ");
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_OUTER_UDP_CKSUM)
+                       printf("on\n");
+               else
+                       printf("off\n");
+       }
+
+}
+
+int
+port_id_is_invalid(portid_t port_id, enum print_warning warning)
 {
-       if (port_id < nb_ports)
+       uint16_t pid;
+
+       if (port_id == (portid_t)RTE_PORT_ALL)
                return 0;
-       printf("Invalid port %d (must be < nb_ports=%d)\n", port_id, nb_ports);
+
+       RTE_ETH_FOREACH_DEV(pid)
+               if (port_id == pid)
+                       return 0;
+
+       if (warning == ENABLED_WARN)
+               printf("Invalid port %d\n", port_id);
+
        return 1;
 }
 
+void print_valid_ports(void)
+{
+       portid_t pid;
+
+       printf("The valid ports array is [");
+       RTE_ETH_FOREACH_DEV(pid) {
+               printf(" %d", pid);
+       }
+       printf(" ]\n");
+}
+
 static int
 vlan_id_is_invalid(uint16_t vlan_id)
 {
@@ -314,6 +972,8 @@ vlan_id_is_invalid(uint16_t vlan_id)
 static int
 port_reg_off_is_invalid(portid_t port_id, uint32_t reg_off)
 {
+       const struct rte_pci_device *pci_dev;
+       const struct rte_bus *bus;
        uint64_t pci_len;
 
        if (reg_off & 0x3) {
@@ -322,7 +982,21 @@ port_reg_off_is_invalid(portid_t port_id, uint32_t reg_off)
                       (unsigned)reg_off);
                return 1;
        }
-       pci_len = ports[port_id].dev_info.pci_dev->mem_resource[0].len;
+
+       if (!ports[port_id].dev_info.device) {
+               printf("Invalid device\n");
+               return 0;
+       }
+
+       bus = rte_bus_find_by_device(ports[port_id].dev_info.device);
+       if (bus && !strcmp(bus->name, "pci")) {
+               pci_dev = RTE_DEV_TO_PCI(ports[port_id].dev_info.device);
+       } else {
+               printf("Not a PCI device\n");
+               return 1;
+       }
+
+       pci_len = pci_dev->mem_resource[0].len;
        if (reg_off >= pci_len) {
                printf("Port %d: register offset %u (0x%X) out of port PCI "
                       "resource (length=%"PRIu64")\n",
@@ -357,7 +1031,7 @@ port_reg_bit_display(portid_t port_id, uint32_t reg_off, uint8_t bit_x)
        uint32_t reg_v;
 
 
-       if (port_id_is_invalid(port_id))
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
        if (port_reg_off_is_invalid(port_id, reg_off))
                return;
@@ -376,7 +1050,7 @@ port_reg_bit_field_display(portid_t port_id, uint32_t reg_off,
        uint8_t  l_bit;
        uint8_t  h_bit;
 
-       if (port_id_is_invalid(port_id))
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
        if (port_reg_off_is_invalid(port_id, reg_off))
                return;
@@ -403,7 +1077,7 @@ port_reg_display(portid_t port_id, uint32_t reg_off)
 {
        uint32_t reg_v;
 
-       if (port_id_is_invalid(port_id))
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
        if (port_reg_off_is_invalid(port_id, reg_off))
                return;
@@ -417,7 +1091,7 @@ port_reg_bit_set(portid_t port_id, uint32_t reg_off, uint8_t bit_pos,
 {
        uint32_t reg_v;
 
-       if (port_id_is_invalid(port_id))
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
        if (port_reg_off_is_invalid(port_id, reg_off))
                return;
@@ -445,7 +1119,7 @@ port_reg_bit_field_set(portid_t port_id, uint32_t reg_off,
        uint8_t  l_bit;
        uint8_t  h_bit;
 
-       if (port_id_is_invalid(port_id))
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
        if (port_reg_off_is_invalid(port_id, reg_off))
                return;
@@ -479,7 +1153,7 @@ port_reg_bit_field_set(portid_t port_id, uint32_t reg_off,
 void
 port_reg_set(portid_t port_id, uint32_t reg_off, uint32_t reg_v)
 {
-       if (port_id_is_invalid(port_id))
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
        if (port_reg_off_is_invalid(port_id, reg_off))
                return;
@@ -487,22 +1161,412 @@ port_reg_set(portid_t port_id, uint32_t reg_off, uint32_t reg_v)
        display_port_reg_value(port_id, reg_off, reg_v);
 }
 
-/*
- * RX/TX ring descriptors display functions.
- */
-static int
-rx_queue_id_is_invalid(queueid_t rxq_id)
+void
+port_mtu_set(portid_t port_id, uint16_t mtu)
 {
-       if (rxq_id < nb_rxq)
-               return 0;
-       printf("Invalid RX queue %d (must be < nb_rxq=%d)\n", rxq_id, nb_rxq);
-       return 1;
-}
+       int diag;
+       struct rte_eth_dev_info dev_info;
+       int ret;
 
-static int
-tx_queue_id_is_invalid(queueid_t txq_id)
-{
-       if (txq_id < nb_txq)
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
+               return;
+
+       ret = eth_dev_info_get_print_err(port_id, &dev_info);
+       if (ret != 0)
+               return;
+
+       if (mtu > dev_info.max_mtu || mtu < dev_info.min_mtu) {
+               printf("Set MTU failed. MTU:%u is not in valid range, min:%u - max:%u\n",
+                       mtu, dev_info.min_mtu, dev_info.max_mtu);
+               return;
+       }
+       diag = rte_eth_dev_set_mtu(port_id, mtu);
+       if (diag == 0)
+               return;
+       printf("Set MTU failed. diag=%d\n", diag);
+}
+
+/* Generic flow management functions. */
+
+/** Generate a port_flow entry from attributes/pattern/actions. */
+static struct port_flow *
+port_flow_new(const struct rte_flow_attr *attr,
+             const struct rte_flow_item *pattern,
+             const struct rte_flow_action *actions,
+             struct rte_flow_error *error)
+{
+       const struct rte_flow_conv_rule rule = {
+               .attr_ro = attr,
+               .pattern_ro = pattern,
+               .actions_ro = actions,
+       };
+       struct port_flow *pf;
+       int ret;
+
+       ret = rte_flow_conv(RTE_FLOW_CONV_OP_RULE, NULL, 0, &rule, error);
+       if (ret < 0)
+               return NULL;
+       pf = calloc(1, offsetof(struct port_flow, rule) + ret);
+       if (!pf) {
+               rte_flow_error_set
+                       (error, errno, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
+                        "calloc() failed");
+               return NULL;
+       }
+       if (rte_flow_conv(RTE_FLOW_CONV_OP_RULE, &pf->rule, ret, &rule,
+                         error) >= 0)
+               return pf;
+       free(pf);
+       return NULL;
+}
+
+/** Print a message out of a flow error. */
+static int
+port_flow_complain(struct rte_flow_error *error)
+{
+       static const char *const errstrlist[] = {
+               [RTE_FLOW_ERROR_TYPE_NONE] = "no error",
+               [RTE_FLOW_ERROR_TYPE_UNSPECIFIED] = "cause unspecified",
+               [RTE_FLOW_ERROR_TYPE_HANDLE] = "flow rule (handle)",
+               [RTE_FLOW_ERROR_TYPE_ATTR_GROUP] = "group field",
+               [RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY] = "priority field",
+               [RTE_FLOW_ERROR_TYPE_ATTR_INGRESS] = "ingress field",
+               [RTE_FLOW_ERROR_TYPE_ATTR_EGRESS] = "egress field",
+               [RTE_FLOW_ERROR_TYPE_ATTR_TRANSFER] = "transfer field",
+               [RTE_FLOW_ERROR_TYPE_ATTR] = "attributes structure",
+               [RTE_FLOW_ERROR_TYPE_ITEM_NUM] = "pattern length",
+               [RTE_FLOW_ERROR_TYPE_ITEM_SPEC] = "item specification",
+               [RTE_FLOW_ERROR_TYPE_ITEM_LAST] = "item specification range",
+               [RTE_FLOW_ERROR_TYPE_ITEM_MASK] = "item specification mask",
+               [RTE_FLOW_ERROR_TYPE_ITEM] = "specific pattern item",
+               [RTE_FLOW_ERROR_TYPE_ACTION_NUM] = "number of actions",
+               [RTE_FLOW_ERROR_TYPE_ACTION_CONF] = "action configuration",
+               [RTE_FLOW_ERROR_TYPE_ACTION] = "specific action",
+       };
+       const char *errstr;
+       char buf[32];
+       int err = rte_errno;
+
+       if ((unsigned int)error->type >= RTE_DIM(errstrlist) ||
+           !errstrlist[error->type])
+               errstr = "unknown type";
+       else
+               errstr = errstrlist[error->type];
+       printf("Caught error type %d (%s): %s%s: %s\n",
+              error->type, errstr,
+              error->cause ? (snprintf(buf, sizeof(buf), "cause: %p, ",
+                                       error->cause), buf) : "",
+              error->message ? error->message : "(no stated reason)",
+              rte_strerror(err));
+       return -err;
+}
+
+/** Validate flow rule. */
+int
+port_flow_validate(portid_t port_id,
+                  const struct rte_flow_attr *attr,
+                  const struct rte_flow_item *pattern,
+                  const struct rte_flow_action *actions)
+{
+       struct rte_flow_error error;
+
+       /* Poisoning to make sure PMDs update it in case of error. */
+       memset(&error, 0x11, sizeof(error));
+       if (rte_flow_validate(port_id, attr, pattern, actions, &error))
+               return port_flow_complain(&error);
+       printf("Flow rule validated\n");
+       return 0;
+}
+
+/** Create flow rule. */
+int
+port_flow_create(portid_t port_id,
+                const struct rte_flow_attr *attr,
+                const struct rte_flow_item *pattern,
+                const struct rte_flow_action *actions)
+{
+       struct rte_flow *flow;
+       struct rte_port *port;
+       struct port_flow *pf;
+       uint32_t id;
+       struct rte_flow_error error;
+
+       /* Poisoning to make sure PMDs update it in case of error. */
+       memset(&error, 0x22, sizeof(error));
+       flow = rte_flow_create(port_id, attr, pattern, actions, &error);
+       if (!flow)
+               return port_flow_complain(&error);
+       port = &ports[port_id];
+       if (port->flow_list) {
+               if (port->flow_list->id == UINT32_MAX) {
+                       printf("Highest rule ID is already assigned, delete"
+                              " it first");
+                       rte_flow_destroy(port_id, flow, NULL);
+                       return -ENOMEM;
+               }
+               id = port->flow_list->id + 1;
+       } else
+               id = 0;
+       pf = port_flow_new(attr, pattern, actions, &error);
+       if (!pf) {
+               rte_flow_destroy(port_id, flow, NULL);
+               return port_flow_complain(&error);
+       }
+       pf->next = port->flow_list;
+       pf->id = id;
+       pf->flow = flow;
+       port->flow_list = pf;
+       printf("Flow rule #%u created\n", pf->id);
+       return 0;
+}
+
+/** Destroy a number of flow rules. */
+int
+port_flow_destroy(portid_t port_id, uint32_t n, const uint32_t *rule)
+{
+       struct rte_port *port;
+       struct port_flow **tmp;
+       uint32_t c = 0;
+       int ret = 0;
+
+       if (port_id_is_invalid(port_id, ENABLED_WARN) ||
+           port_id == (portid_t)RTE_PORT_ALL)
+               return -EINVAL;
+       port = &ports[port_id];
+       tmp = &port->flow_list;
+       while (*tmp) {
+               uint32_t i;
+
+               for (i = 0; i != n; ++i) {
+                       struct rte_flow_error error;
+                       struct port_flow *pf = *tmp;
+
+                       if (rule[i] != pf->id)
+                               continue;
+                       /*
+                        * Poisoning to make sure PMDs update it in case
+                        * of error.
+                        */
+                       memset(&error, 0x33, sizeof(error));
+                       if (rte_flow_destroy(port_id, pf->flow, &error)) {
+                               ret = port_flow_complain(&error);
+                               continue;
+                       }
+                       printf("Flow rule #%u destroyed\n", pf->id);
+                       *tmp = pf->next;
+                       free(pf);
+                       break;
+               }
+               if (i == n)
+                       tmp = &(*tmp)->next;
+               ++c;
+       }
+       return ret;
+}
+
+/** Remove all flow rules. */
+int
+port_flow_flush(portid_t port_id)
+{
+       struct rte_flow_error error;
+       struct rte_port *port;
+       int ret = 0;
+
+       /* Poisoning to make sure PMDs update it in case of error. */
+       memset(&error, 0x44, sizeof(error));
+       if (rte_flow_flush(port_id, &error)) {
+               ret = port_flow_complain(&error);
+               if (port_id_is_invalid(port_id, DISABLED_WARN) ||
+                   port_id == (portid_t)RTE_PORT_ALL)
+                       return ret;
+       }
+       port = &ports[port_id];
+       while (port->flow_list) {
+               struct port_flow *pf = port->flow_list->next;
+
+               free(port->flow_list);
+               port->flow_list = pf;
+       }
+       return ret;
+}
+
+/** Query a flow rule. */
+int
+port_flow_query(portid_t port_id, uint32_t rule,
+               const struct rte_flow_action *action)
+{
+       struct rte_flow_error error;
+       struct rte_port *port;
+       struct port_flow *pf;
+       const char *name;
+       union {
+               struct rte_flow_query_count count;
+       } query;
+       int ret;
+
+       if (port_id_is_invalid(port_id, ENABLED_WARN) ||
+           port_id == (portid_t)RTE_PORT_ALL)
+               return -EINVAL;
+       port = &ports[port_id];
+       for (pf = port->flow_list; pf; pf = pf->next)
+               if (pf->id == rule)
+                       break;
+       if (!pf) {
+               printf("Flow rule #%u not found\n", rule);
+               return -ENOENT;
+       }
+       ret = rte_flow_conv(RTE_FLOW_CONV_OP_ACTION_NAME_PTR,
+                           &name, sizeof(name),
+                           (void *)(uintptr_t)action->type, &error);
+       if (ret < 0)
+               return port_flow_complain(&error);
+       switch (action->type) {
+       case RTE_FLOW_ACTION_TYPE_COUNT:
+               break;
+       default:
+               printf("Cannot query action type %d (%s)\n",
+                       action->type, name);
+               return -ENOTSUP;
+       }
+       /* Poisoning to make sure PMDs update it in case of error. */
+       memset(&error, 0x55, sizeof(error));
+       memset(&query, 0, sizeof(query));
+       if (rte_flow_query(port_id, pf->flow, action, &query, &error))
+               return port_flow_complain(&error);
+       switch (action->type) {
+       case RTE_FLOW_ACTION_TYPE_COUNT:
+               printf("%s:\n"
+                      " hits_set: %u\n"
+                      " bytes_set: %u\n"
+                      " hits: %" PRIu64 "\n"
+                      " bytes: %" PRIu64 "\n",
+                      name,
+                      query.count.hits_set,
+                      query.count.bytes_set,
+                      query.count.hits,
+                      query.count.bytes);
+               break;
+       default:
+               printf("Cannot display result for action type %d (%s)\n",
+                      action->type, name);
+               break;
+       }
+       return 0;
+}
+
+/** List flow rules. */
+void
+port_flow_list(portid_t port_id, uint32_t n, const uint32_t group[n])
+{
+       struct rte_port *port;
+       struct port_flow *pf;
+       struct port_flow *list = NULL;
+       uint32_t i;
+
+       if (port_id_is_invalid(port_id, ENABLED_WARN) ||
+           port_id == (portid_t)RTE_PORT_ALL)
+               return;
+       port = &ports[port_id];
+       if (!port->flow_list)
+               return;
+       /* Sort flows by group, priority and ID. */
+       for (pf = port->flow_list; pf != NULL; pf = pf->next) {
+               struct port_flow **tmp;
+               const struct rte_flow_attr *curr = pf->rule.attr;
+
+               if (n) {
+                       /* Filter out unwanted groups. */
+                       for (i = 0; i != n; ++i)
+                               if (curr->group == group[i])
+                                       break;
+                       if (i == n)
+                               continue;
+               }
+               for (tmp = &list; *tmp; tmp = &(*tmp)->tmp) {
+                       const struct rte_flow_attr *comp = (*tmp)->rule.attr;
+
+                       if (curr->group > comp->group ||
+                           (curr->group == comp->group &&
+                            curr->priority > comp->priority) ||
+                           (curr->group == comp->group &&
+                            curr->priority == comp->priority &&
+                            pf->id > (*tmp)->id))
+                               continue;
+                       break;
+               }
+               pf->tmp = *tmp;
+               *tmp = pf;
+       }
+       printf("ID\tGroup\tPrio\tAttr\tRule\n");
+       for (pf = list; pf != NULL; pf = pf->tmp) {
+               const struct rte_flow_item *item = pf->rule.pattern;
+               const struct rte_flow_action *action = pf->rule.actions;
+               const char *name;
+
+               printf("%" PRIu32 "\t%" PRIu32 "\t%" PRIu32 "\t%c%c%c\t",
+                      pf->id,
+                      pf->rule.attr->group,
+                      pf->rule.attr->priority,
+                      pf->rule.attr->ingress ? 'i' : '-',
+                      pf->rule.attr->egress ? 'e' : '-',
+                      pf->rule.attr->transfer ? 't' : '-');
+               while (item->type != RTE_FLOW_ITEM_TYPE_END) {
+                       if (rte_flow_conv(RTE_FLOW_CONV_OP_ITEM_NAME_PTR,
+                                         &name, sizeof(name),
+                                         (void *)(uintptr_t)item->type,
+                                         NULL) <= 0)
+                               name = "[UNKNOWN]";
+                       if (item->type != RTE_FLOW_ITEM_TYPE_VOID)
+                               printf("%s ", name);
+                       ++item;
+               }
+               printf("=>");
+               while (action->type != RTE_FLOW_ACTION_TYPE_END) {
+                       if (rte_flow_conv(RTE_FLOW_CONV_OP_ACTION_NAME_PTR,
+                                         &name, sizeof(name),
+                                         (void *)(uintptr_t)action->type,
+                                         NULL) <= 0)
+                               name = "[UNKNOWN]";
+                       if (action->type != RTE_FLOW_ACTION_TYPE_VOID)
+                               printf(" %s", name);
+                       ++action;
+               }
+               printf("\n");
+       }
+}
+
+/** Restrict ingress traffic to the defined flow rules. */
+int
+port_flow_isolate(portid_t port_id, int set)
+{
+       struct rte_flow_error error;
+
+       /* Poisoning to make sure PMDs update it in case of error. */
+       memset(&error, 0x66, sizeof(error));
+       if (rte_flow_isolate(port_id, set, &error))
+               return port_flow_complain(&error);
+       printf("Ingress traffic on port %u is %s to the defined flow rules\n",
+              port_id,
+              set ? "now restricted" : "not restricted anymore");
+       return 0;
+}
+
+/*
+ * RX/TX ring descriptors display functions.
+ */
+int
+rx_queue_id_is_invalid(queueid_t rxq_id)
+{
+       if (rxq_id < nb_rxq)
+               return 0;
+       printf("Invalid RX queue %d (must be < nb_rxq=%d)\n", rxq_id, nb_rxq);
+       return 1;
+}
+
+int
+tx_queue_id_is_invalid(queueid_t txq_id)
+{
+       if (txq_id < nb_txq)
                return 0;
        printf("Invalid TX queue %d (must be < nb_rxq=%d)\n", txq_id, nb_txq);
        return 1;
@@ -529,46 +1593,115 @@ 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;
 
-       rte_snprintf(mz_name, sizeof(mz_name), "%s_%s_%d_%d",
-                ports[port_id].dev_info.driver_name, ring_name, port_id, q_id);
+       snprintf(mz_name, sizeof(mz_name), "eth_p%d_q%d_%s",
+                       port_id, q_id, ring_name);
        mz = rte_memzone_lookup(mz_name);
        if (mz == NULL)
                printf("%s ring memory zoneof (port %d, queue %d) not"
                       "found (zone name = %s\n",
                       ring_name, port_id, q_id, mz_name);
-       return (mz);
+       return mz;
 }
 
 union igb_ring_dword {
        uint64_t dword;
        struct {
+#if RTE_BYTE_ORDER == RTE_BIG_ENDIAN
+               uint32_t lo;
+               uint32_t hi;
+#else
                uint32_t hi;
                uint32_t lo;
+#endif
        } words;
 };
 
-struct igb_ring_desc {
+struct igb_ring_desc_32_bytes {
        union igb_ring_dword lo_dword;
        union igb_ring_dword hi_dword;
+       union igb_ring_dword resv1;
+       union igb_ring_dword resv2;
 };
 
+struct igb_ring_desc_16_bytes {
+       union igb_ring_dword lo_dword;
+       union igb_ring_dword hi_dword;
+};
+
+static void
+ring_rxd_display_dword(union igb_ring_dword dword)
+{
+       printf("    0x%08X - 0x%08X\n", (unsigned)dword.words.lo,
+                                       (unsigned)dword.words.hi);
+}
+
+static void
+ring_rx_descriptor_display(const struct rte_memzone *ring_mz,
+#ifndef RTE_LIBRTE_I40E_16BYTE_RX_DESC
+                          portid_t port_id,
+#else
+                          __rte_unused portid_t port_id,
+#endif
+                          uint16_t desc_id)
+{
+       int ret;
+       struct igb_ring_desc_16_bytes *ring =
+               (struct igb_ring_desc_16_bytes *)ring_mz->addr;
+#ifndef RTE_LIBRTE_I40E_16BYTE_RX_DESC
+       struct rte_eth_dev_info dev_info;
+
+       ret = eth_dev_info_get_print_err(port_id, &dev_info);
+       if (ret != 0)
+               return;
+
+       if (strstr(dev_info.driver_name, "i40e") != NULL) {
+               /* 32 bytes RX descriptor, i40e only */
+               struct igb_ring_desc_32_bytes *ring =
+                       (struct igb_ring_desc_32_bytes *)ring_mz->addr;
+               ring[desc_id].lo_dword.dword =
+                       rte_le_to_cpu_64(ring[desc_id].lo_dword.dword);
+               ring_rxd_display_dword(ring[desc_id].lo_dword);
+               ring[desc_id].hi_dword.dword =
+                       rte_le_to_cpu_64(ring[desc_id].hi_dword.dword);
+               ring_rxd_display_dword(ring[desc_id].hi_dword);
+               ring[desc_id].resv1.dword =
+                       rte_le_to_cpu_64(ring[desc_id].resv1.dword);
+               ring_rxd_display_dword(ring[desc_id].resv1);
+               ring[desc_id].resv2.dword =
+                       rte_le_to_cpu_64(ring[desc_id].resv2.dword);
+               ring_rxd_display_dword(ring[desc_id].resv2);
+
+               return;
+       }
+#endif
+       /* 16 bytes RX descriptor */
+       ring[desc_id].lo_dword.dword =
+               rte_le_to_cpu_64(ring[desc_id].lo_dword.dword);
+       ring_rxd_display_dword(ring[desc_id].lo_dword);
+       ring[desc_id].hi_dword.dword =
+               rte_le_to_cpu_64(ring[desc_id].hi_dword.dword);
+       ring_rxd_display_dword(ring[desc_id].hi_dword);
+}
+
 static void
-ring_descriptor_display(const struct rte_memzone *ring_mz, uint16_t desc_id)
+ring_tx_descriptor_display(const struct rte_memzone *ring_mz, uint16_t desc_id)
 {
-       struct igb_ring_desc *ring;
-       struct igb_ring_desc rd;
+       struct igb_ring_desc_16_bytes *ring;
+       struct igb_ring_desc_16_bytes txd;
 
-       ring = (struct igb_ring_desc *) ring_mz->addr;
-       rd.lo_dword = rte_le_to_cpu_64(ring[desc_id].lo_dword);
-       rd.hi_dword = rte_le_to_cpu_64(ring[desc_id].hi_dword);
+       ring = (struct igb_ring_desc_16_bytes *)ring_mz->addr;
+       txd.lo_dword.dword = rte_le_to_cpu_64(ring[desc_id].lo_dword.dword);
+       txd.hi_dword.dword = rte_le_to_cpu_64(ring[desc_id].hi_dword.dword);
        printf("    0x%08X - 0x%08X / 0x%08X - 0x%08X\n",
-               (unsigned)rd.lo_dword.words.lo, (unsigned)rd.lo_dword.words.hi,
-               (unsigned)rd.hi_dword.words.lo, (unsigned)rd.hi_dword.words.hi);
+                       (unsigned)txd.lo_dword.words.lo,
+                       (unsigned)txd.lo_dword.words.hi,
+                       (unsigned)txd.hi_dword.words.lo,
+                       (unsigned)txd.hi_dword.words.hi);
 }
 
 void
@@ -576,7 +1709,7 @@ rx_ring_desc_display(portid_t port_id, queueid_t rxq_id, uint16_t rxd_id)
 {
        const struct rte_memzone *rx_mz;
 
-       if (port_id_is_invalid(port_id))
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
        if (rx_queue_id_is_invalid(rxq_id))
                return;
@@ -585,7 +1718,7 @@ rx_ring_desc_display(portid_t port_id, queueid_t rxq_id, uint16_t rxd_id)
        rx_mz = ring_dma_zone_lookup("rx_ring", port_id, rxq_id);
        if (rx_mz == NULL)
                return;
-       ring_descriptor_display(rx_mz, rxd_id);
+       ring_rx_descriptor_display(rx_mz, port_id, rxd_id);
 }
 
 void
@@ -593,7 +1726,7 @@ tx_ring_desc_display(portid_t port_id, queueid_t txq_id, uint16_t txd_id)
 {
        const struct rte_memzone *tx_mz;
 
-       if (port_id_is_invalid(port_id))
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
        if (tx_queue_id_is_invalid(txq_id))
                return;
@@ -602,7 +1735,7 @@ tx_ring_desc_display(portid_t port_id, queueid_t txq_id, uint16_t txd_id)
        tx_mz = ring_dma_zone_lookup("tx_ring", port_id, txq_id);
        if (tx_mz == NULL)
                return;
-       ring_descriptor_display(tx_mz, txd_id);
+       ring_tx_descriptor_display(tx_mz, txd_id);
 }
 
 void
@@ -618,60 +1751,210 @@ fwd_lcores_config_display(void)
 void
 rxtx_config_display(void)
 {
-       printf("  %s packet forwarding - CRC stripping %s - "
-              "packets/burst=%d\n", cur_fwd_eng->fwd_mode_name,
-              rx_mode.hw_strip_crc ? "enabled" : "disabled",
+       portid_t pid;
+       queueid_t qid;
+
+       printf("  %s packet forwarding%s packets/burst=%d\n",
+              cur_fwd_eng->fwd_mode_name,
+              retry_enabled == 0 ? "" : " with retry",
               nb_pkt_per_burst);
 
-       if (cur_fwd_eng == &tx_only_engine)
+       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);
 
        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_free_thresh);
-       printf("  RX threshold registers: pthresh=%d hthresh=%d wthresh=%d\n",
-              rx_thresh.pthresh, rx_thresh.hthresh, rx_thresh.wthresh);
-       printf("  TX queues=%d - TX desc=%d - TX free threshold=%d\n",
-              nb_txq, nb_txd, tx_free_thresh);
-       printf("  TX threshold registers: pthresh=%d hthresh=%d wthresh=%d\n",
-              tx_thresh.pthresh, tx_thresh.hthresh, tx_thresh.wthresh);
-       printf("  TX RS bit threshold=%d - TXQ flags=0x%"PRIx32"\n",
-              tx_rs_thresh, txq_flags);
+
+       RTE_ETH_FOREACH_DEV(pid) {
+               struct rte_eth_rxconf *rx_conf = &ports[pid].rx_conf[0];
+               struct rte_eth_txconf *tx_conf = &ports[pid].tx_conf[0];
+               uint16_t *nb_rx_desc = &ports[pid].nb_rx_desc[0];
+               uint16_t *nb_tx_desc = &ports[pid].nb_tx_desc[0];
+               uint16_t nb_rx_desc_tmp;
+               uint16_t nb_tx_desc_tmp;
+               struct rte_eth_rxq_info rx_qinfo;
+               struct rte_eth_txq_info tx_qinfo;
+               int32_t rc;
+
+               /* per port config */
+               printf("  port %d: RX queue number: %d Tx queue number: %d\n",
+                               (unsigned int)pid, nb_rxq, nb_txq);
+
+               printf("    Rx offloads=0x%"PRIx64" Tx offloads=0x%"PRIx64"\n",
+                               ports[pid].dev_conf.rxmode.offloads,
+                               ports[pid].dev_conf.txmode.offloads);
+
+               /* per rx queue config only for first queue to be less verbose */
+               for (qid = 0; qid < 1; qid++) {
+                       rc = rte_eth_rx_queue_info_get(pid, qid, &rx_qinfo);
+                       if (rc)
+                               nb_rx_desc_tmp = nb_rx_desc[qid];
+                       else
+                               nb_rx_desc_tmp = rx_qinfo.nb_desc;
+
+                       printf("    RX queue: %d\n", qid);
+                       printf("      RX desc=%d - RX free threshold=%d\n",
+                               nb_rx_desc_tmp, rx_conf[qid].rx_free_thresh);
+                       printf("      RX threshold registers: pthresh=%d hthresh=%d "
+                               " wthresh=%d\n",
+                               rx_conf[qid].rx_thresh.pthresh,
+                               rx_conf[qid].rx_thresh.hthresh,
+                               rx_conf[qid].rx_thresh.wthresh);
+                       printf("      RX Offloads=0x%"PRIx64"\n",
+                               rx_conf[qid].offloads);
+               }
+
+               /* per tx queue config only for first queue to be less verbose */
+               for (qid = 0; qid < 1; qid++) {
+                       rc = rte_eth_tx_queue_info_get(pid, qid, &tx_qinfo);
+                       if (rc)
+                               nb_tx_desc_tmp = nb_tx_desc[qid];
+                       else
+                               nb_tx_desc_tmp = tx_qinfo.nb_desc;
+
+                       printf("    TX queue: %d\n", qid);
+                       printf("      TX desc=%d - TX free threshold=%d\n",
+                               nb_tx_desc_tmp, tx_conf[qid].tx_free_thresh);
+                       printf("      TX threshold registers: pthresh=%d hthresh=%d "
+                               " wthresh=%d\n",
+                               tx_conf[qid].tx_thresh.pthresh,
+                               tx_conf[qid].tx_thresh.hthresh,
+                               tx_conf[qid].tx_thresh.wthresh);
+                       printf("      TX offloads=0x%"PRIx64" - TX RS bit threshold=%d\n",
+                               tx_conf[qid].offloads, tx_conf->tx_rs_thresh);
+               }
+       }
 }
 
 void
-port_rss_reta_info(portid_t port_id,struct rte_eth_rss_reta *reta_conf)
+port_rss_reta_info(portid_t port_id,
+                  struct rte_eth_rss_reta_entry64 *reta_conf,
+                  uint16_t nb_entries)
 {
-       uint8_t i,j;
+       uint16_t i, idx, shift;
        int ret;
 
-       if (port_id_is_invalid(port_id)) 
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
 
-       ret = rte_eth_dev_rss_reta_query(port_id, reta_conf);
+       ret = rte_eth_dev_rss_reta_query(port_id, reta_conf, nb_entries);
        if (ret != 0) {
                printf("Failed to get RSS RETA info, return code = %d\n", ret);
                return;
        }
 
-       if (reta_conf->mask_lo != 0) {
-               for (i = 0; i< ETH_RSS_RETA_NUM_ENTRIES/2; i++) {
-                       if (reta_conf->mask_lo & (uint64_t)(1ULL << i))
-                               printf("RSS RETA configuration: hash index=%d,"
-                                       "queue=%d\n",i,reta_conf->reta[i]);     
-               }
+       for (i = 0; i < nb_entries; i++) {
+               idx = i / RTE_RETA_GROUP_SIZE;
+               shift = i % RTE_RETA_GROUP_SIZE;
+               if (!(reta_conf[idx].mask & (1ULL << shift)))
+                       continue;
+               printf("RSS RETA configuration: hash index=%u, queue=%u\n",
+                                       i, reta_conf[idx].reta[shift]);
        }
-       
-       if (reta_conf->mask_hi != 0) {
-               for (i = 0; i< ETH_RSS_RETA_NUM_ENTRIES/2; i++) {
-                       if(reta_conf->mask_hi & (uint64_t)(1ULL << i)) {
-                               j = (uint8_t)(i + ETH_RSS_RETA_NUM_ENTRIES/2);          
-                               printf("RSS RETA configuration: hash index=%d,"
-                                       "queue=%d\n",j,reta_conf->reta[j]);
-                       }
+}
+
+/*
+ * Displays the RSS hash functions of a port, and, optionaly, the RSS hash
+ * key of the port.
+ */
+void
+port_rss_hash_conf_show(portid_t port_id, int show_rss_key)
+{
+       struct rte_eth_rss_conf rss_conf = {0};
+       uint8_t rss_key[RSS_HASH_KEY_LENGTH];
+       uint64_t rss_hf;
+       uint8_t i;
+       int diag;
+       struct rte_eth_dev_info dev_info;
+       uint8_t hash_key_size;
+       int ret;
+
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
+               return;
+
+       ret = eth_dev_info_get_print_err(port_id, &dev_info);
+       if (ret != 0)
+               return;
+
+       if (dev_info.hash_key_size > 0 &&
+                       dev_info.hash_key_size <= sizeof(rss_key))
+               hash_key_size = dev_info.hash_key_size;
+       else {
+               printf("dev_info did not provide a valid hash key size\n");
+               return;
+       }
+
+       /* Get RSS hash key if asked to display it */
+       rss_conf.rss_key = (show_rss_key) ? rss_key : NULL;
+       rss_conf.rss_key_len = hash_key_size;
+       diag = rte_eth_dev_rss_hash_conf_get(port_id, &rss_conf);
+       if (diag != 0) {
+               switch (diag) {
+               case -ENODEV:
+                       printf("port index %d invalid\n", port_id);
+                       break;
+               case -ENOTSUP:
+                       printf("operation not supported by device\n");
+                       break;
+               default:
+                       printf("operation failed - diag=%d\n", diag);
+                       break;
                }
+               return;
+       }
+       rss_hf = rss_conf.rss_hf;
+       if (rss_hf == 0) {
+               printf("RSS disabled\n");
+               return;
+       }
+       printf("RSS functions:\n ");
+       for (i = 0; rss_type_table[i].str; i++) {
+               if (rss_hf & rss_type_table[i].rss_type)
+                       printf("%s ", rss_type_table[i].str);
+       }
+       printf("\n");
+       if (!show_rss_key)
+               return;
+       printf("RSS key:\n");
+       for (i = 0; i < hash_key_size; i++)
+               printf("%02X", rss_key[i]);
+       printf("\n");
+}
+
+void
+port_rss_hash_key_update(portid_t port_id, char rss_type[], uint8_t *hash_key,
+                        uint hash_key_len)
+{
+       struct rte_eth_rss_conf rss_conf;
+       int diag;
+       unsigned int i;
+
+       rss_conf.rss_key = NULL;
+       rss_conf.rss_key_len = hash_key_len;
+       rss_conf.rss_hf = 0;
+       for (i = 0; rss_type_table[i].str; i++) {
+               if (!strcmp(rss_type_table[i].str, rss_type))
+                       rss_conf.rss_hf = rss_type_table[i].rss_type;
+       }
+       diag = rte_eth_dev_rss_hash_conf_get(port_id, &rss_conf);
+       if (diag == 0) {
+               rss_conf.rss_key = hash_key;
+               diag = rte_eth_dev_rss_hash_update(port_id, &rss_conf);
+       }
+       if (diag == 0)
+               return;
+
+       switch (diag) {
+       case -ENODEV:
+               printf("port index %d invalid\n", port_id);
+               break;
+       case -ENOTSUP:
+               printf("operation not supported by device\n");
+               break;
+       default:
+               printf("operation failed - diag=%d\n", diag);
+               break;
        }
 }
 
@@ -718,22 +2001,40 @@ setup_fwd_config_of_each_lcore(struct fwd_config *cfg)
        }
 }
 
+static portid_t
+fwd_topology_tx_port_get(portid_t rxp)
+{
+       static int warning_once = 1;
+
+       RTE_ASSERT(rxp < cur_fwd_config.nb_fwd_ports);
+
+       switch (port_topology) {
+       default:
+       case PORT_TOPOLOGY_PAIRED:
+               if ((rxp & 0x1) == 0) {
+                       if (rxp + 1 < cur_fwd_config.nb_fwd_ports)
+                               return rxp + 1;
+                       if (warning_once) {
+                               printf("\nWarning! port-topology=paired"
+                                      " and odd forward ports number,"
+                                      " the last port will pair with"
+                                      " itself.\n\n");
+                               warning_once = 0;
+                       }
+                       return rxp;
+               }
+               return rxp - 1;
+       case PORT_TOPOLOGY_CHAINED:
+               return (rxp + 1) % cur_fwd_config.nb_fwd_ports;
+       case PORT_TOPOLOGY_LOOP:
+               return rxp;
+       }
+}
+
 static void
 simple_fwd_config_setup(void)
 {
        portid_t i;
-       portid_t j;
-       portid_t inc = 2;
-
-       if (port_topology == PORT_TOPOLOGY_CHAINED) {
-               inc = 1;
-       } else if (nb_fwd_ports % 2) {
-               printf("\nWarning! Cannot handle an odd number of ports "
-                      "with the current port topology. Configuration "
-                      "must be changed to have an even number of ports, "
-                      "or relaunch application with "
-                      "--port-topology=chained\n\n");
-       }
 
        cur_fwd_config.nb_fwd_ports = (portid_t) nb_fwd_ports;
        cur_fwd_config.nb_fwd_streams =
@@ -752,38 +2053,21 @@ simple_fwd_config_setup(void)
                        (lcoreid_t) cur_fwd_config.nb_fwd_ports;
        setup_fwd_config_of_each_lcore(&cur_fwd_config);
 
-       for (i = 0; i < cur_fwd_config.nb_fwd_ports; i = (portid_t) (i + inc)) {
-               j = (portid_t) ((i + 1) % cur_fwd_config.nb_fwd_ports);
+       for (i = 0; i < cur_fwd_config.nb_fwd_ports; i++) {
                fwd_streams[i]->rx_port   = fwd_ports_ids[i];
                fwd_streams[i]->rx_queue  = 0;
-               fwd_streams[i]->tx_port   = fwd_ports_ids[j];
+               fwd_streams[i]->tx_port   =
+                               fwd_ports_ids[fwd_topology_tx_port_get(i)];
                fwd_streams[i]->tx_queue  = 0;
-               fwd_streams[i]->peer_addr = j;
-
-               if (port_topology == PORT_TOPOLOGY_PAIRED) {
-                       fwd_streams[j]->rx_port   = fwd_ports_ids[j];
-                       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[i]->peer_addr = fwd_streams[i]->tx_port;
+               fwd_streams[i]->retry_enabled = retry_enabled;
        }
 }
 
 /**
- * For the RSS forwarding test, each core is assigned on every port a transmit
- * queue whose index is the index of the core itself. This approach limits the
- * maximumm number of processing cores of the RSS test to the maximum number of
- * TX queues supported by the devices.
- *
- * Each core is assigned a single stream, each stream being composed of
- * a RX queue to poll on a RX port for input messages, associated with
- * a TX queue of a TX port where to send forwarded packets.
- * All packets received on the RX queue of index "RxQj" of the RX port "RxPi"
- * are sent on the TX queue "TxQl" of the TX port "TxPk" according to the two
- * following rules:
- *    - TxPk = (RxPi + 1) if RxPi is even, (RxPi - 1) if RxPi is odd
- *    - TxQl = RxQj
+ * For the RSS forwarding test all streams distributed over lcores. Each stream
+ * being composed of a RX queue to poll on a RX port for input messages,
+ * associated with a TX queue of a TX port where to send forwarded packets.
  */
 static void
 rss_fwd_config_setup(void)
@@ -792,7 +2076,7 @@ rss_fwd_config_setup(void)
        portid_t   txp;
        queueid_t  rxq;
        queueid_t  nb_q;
-       lcoreid_t  lc_id;
+       streamid_t  sm_id;
 
        nb_q = nb_rxq;
        if (nb_q > nb_txq)
@@ -801,10 +2085,8 @@ rss_fwd_config_setup(void)
        cur_fwd_config.nb_fwd_ports = nb_fwd_ports;
        cur_fwd_config.nb_fwd_streams =
                (streamid_t) (nb_q * cur_fwd_config.nb_fwd_ports);
-       if (cur_fwd_config.nb_fwd_streams > cur_fwd_config.nb_fwd_lcores)
-               cur_fwd_config.nb_fwd_streams =
-                       (streamid_t)cur_fwd_config.nb_fwd_lcores;
-       else
+
+       if (cur_fwd_config.nb_fwd_streams < cur_fwd_config.nb_fwd_lcores)
                cur_fwd_config.nb_fwd_lcores =
                        (lcoreid_t)cur_fwd_config.nb_fwd_streams;
 
@@ -813,149 +2095,233 @@ rss_fwd_config_setup(void)
 
        setup_fwd_config_of_each_lcore(&cur_fwd_config);
        rxp = 0; rxq = 0;
-       for (lc_id = 0; lc_id < cur_fwd_config.nb_fwd_lcores; lc_id++) {
+       for (sm_id = 0; sm_id < cur_fwd_config.nb_fwd_streams; sm_id++) {
                struct fwd_stream *fs;
 
-               fs = fwd_streams[lc_id];
-               if ((rxp & 0x1) == 0)
-                       txp = (portid_t) (rxp + 1);
-               else
-                       txp = (portid_t) (rxp - 1);
+               fs = fwd_streams[sm_id];
+               txp = fwd_topology_tx_port_get(rxp);
                fs->rx_port = fwd_ports_ids[rxp];
                fs->rx_queue = rxq;
                fs->tx_port = fwd_ports_ids[txp];
                fs->tx_queue = rxq;
                fs->peer_addr = fs->tx_port;
-               rxq = (queueid_t) (rxq + 1);
-               if (rxq < nb_q)
+               fs->retry_enabled = retry_enabled;
+               rxp++;
+               if (rxp < nb_fwd_ports)
                        continue;
-               /*
-                * rxq == nb_q
-                * Restart from RX queue 0 on next RX port
-                */
-               rxq = 0;
-               if (numa_support && (nb_fwd_ports <= (nb_ports >> 1)))
-                       rxp = (portid_t)
-                               (rxp + ((nb_ports >> 1) / nb_fwd_ports));
-               else
-                       rxp = (portid_t) (rxp + 1);
-       }
-}
-
-/*
- * In DCB and VT on,the mapping of 128 receive queues to 128 transmit queues.
- */
-static void
-dcb_rxq_2_txq_mapping(queueid_t rxq, queueid_t *txq)
-{
-       if(dcb_q_mapping == DCB_4_TCS_Q_MAPPING) {
-
-               if (rxq < 32)
-                       /* tc0: 0-31 */ 
-                       *txq = rxq;  
-               else if (rxq < 64) {
-                       /* tc1: 64-95 */ 
-                       *txq =  (uint16_t)(rxq + 32);
-               } 
-               else {  
-                       /* tc2: 96-111;tc3:112-127 */
-                       *txq =  (uint16_t)(rxq/2 + 64);
-               }
-       }
-       else {
-               if (rxq < 16)
-                       /* tc0 mapping*/
-                       *txq = rxq;
-               else if (rxq < 32) {
-                       /* tc1 mapping*/
-                        *txq = (uint16_t)(rxq + 16);
-               }
-               else if (rxq < 64) {
-                       /*tc2,tc3 mapping */
-                       *txq =  (uint16_t)(rxq + 32);
-               }
-               else {
-                       /* tc4,tc5,tc6 and tc7 mapping */
-                       *txq =  (uint16_t)(rxq/2 + 64);
-               }
+               rxp = 0;
+               rxq++;
        }
 }
 
 /**
- * For the DCB forwarding test, each core is assigned on every port multi-transmit
- * queue. 
+ * For the DCB forwarding test, each core is assigned on each traffic class.
  *
  * Each core is assigned a multi-stream, each stream being composed of
  * a RX queue to poll on a RX port for input messages, associated with
- * a TX queue of a TX port where to send forwarded packets.
- * All packets received on the RX queue of index "RxQj" of the RX port "RxPi"
- * are sent on the TX queue "TxQl" of the TX port "TxPk" according to the two
- * following rules:
- * In VT mode,
- *    - TxPk = (RxPi + 1) if RxPi is even, (RxPi - 1) if RxPi is odd
- *    - TxQl = RxQj
- * In non-VT mode,
- *    - TxPk = (RxPi + 1) if RxPi is even, (RxPi - 1) if RxPi is odd  
- *    There is a mapping of RxQj to TxQl to be required,and the mapping was implemented
- *    in dcb_rxq_2_txq_mapping function.
+ * a TX queue of a TX port where to send forwarded packets. All RX and
+ * TX queues are mapping to the same traffic class.
+ * If VMDQ and DCB co-exist, each traffic class on different POOLs share
+ * the same core
  */
 static void
 dcb_fwd_config_setup(void)
 {
-       portid_t   rxp;
-       portid_t   txp;
-       queueid_t  rxq;
-       queueid_t  nb_q;
+       struct rte_eth_dcb_info rxp_dcb_info, txp_dcb_info;
+       portid_t txp, rxp = 0;
+       queueid_t txq, rxq = 0;
        lcoreid_t  lc_id;
-       uint16_t sm_id;
-
-       nb_q = nb_rxq;
+       uint16_t nb_rx_queue, nb_tx_queue;
+       uint16_t i, j, k, sm_id = 0;
+       uint8_t tc = 0;
 
        cur_fwd_config.nb_fwd_lcores = (lcoreid_t) nb_fwd_lcores;
        cur_fwd_config.nb_fwd_ports = nb_fwd_ports;
-       cur_fwd_config.nb_fwd_streams = 
-               (streamid_t) (nb_q * cur_fwd_config.nb_fwd_ports);
+       cur_fwd_config.nb_fwd_streams =
+               (streamid_t) (nb_rxq * cur_fwd_config.nb_fwd_ports);
 
        /* reinitialize forwarding streams */
        init_fwd_streams();
+       sm_id = 0;
+       txp = 1;
+       /* get the dcb info on the first RX and TX ports */
+       (void)rte_eth_dev_get_dcb_info(fwd_ports_ids[rxp], &rxp_dcb_info);
+       (void)rte_eth_dev_get_dcb_info(fwd_ports_ids[txp], &txp_dcb_info);
+
+       for (lc_id = 0; lc_id < cur_fwd_config.nb_fwd_lcores; lc_id++) {
+               fwd_lcores[lc_id]->stream_nb = 0;
+               fwd_lcores[lc_id]->stream_idx = sm_id;
+               for (i = 0; i < ETH_MAX_VMDQ_POOL; i++) {
+                       /* if the nb_queue is zero, means this tc is
+                        * not enabled on the POOL
+                        */
+                       if (rxp_dcb_info.tc_queue.tc_rxq[i][tc].nb_queue == 0)
+                               break;
+                       k = fwd_lcores[lc_id]->stream_nb +
+                               fwd_lcores[lc_id]->stream_idx;
+                       rxq = rxp_dcb_info.tc_queue.tc_rxq[i][tc].base;
+                       txq = txp_dcb_info.tc_queue.tc_txq[i][tc].base;
+                       nb_rx_queue = txp_dcb_info.tc_queue.tc_rxq[i][tc].nb_queue;
+                       nb_tx_queue = txp_dcb_info.tc_queue.tc_txq[i][tc].nb_queue;
+                       for (j = 0; j < nb_rx_queue; j++) {
+                               struct fwd_stream *fs;
+
+                               fs = fwd_streams[k + j];
+                               fs->rx_port = fwd_ports_ids[rxp];
+                               fs->rx_queue = rxq + j;
+                               fs->tx_port = fwd_ports_ids[txp];
+                               fs->tx_queue = txq + j % nb_tx_queue;
+                               fs->peer_addr = fs->tx_port;
+                               fs->retry_enabled = retry_enabled;
+                       }
+                       fwd_lcores[lc_id]->stream_nb +=
+                               rxp_dcb_info.tc_queue.tc_rxq[i][tc].nb_queue;
+               }
+               sm_id = (streamid_t) (sm_id + fwd_lcores[lc_id]->stream_nb);
+
+               tc++;
+               if (tc < rxp_dcb_info.nb_tcs)
+                       continue;
+               /* Restart from TC 0 on next RX port */
+               tc = 0;
+               if (numa_support && (nb_fwd_ports <= (nb_ports >> 1)))
+                       rxp = (portid_t)
+                               (rxp + ((nb_ports >> 1) / nb_fwd_ports));
+               else
+                       rxp++;
+               if (rxp >= nb_fwd_ports)
+                       return;
+               /* get the dcb information on next RX and TX ports */
+               if ((rxp & 0x1) == 0)
+                       txp = (portid_t) (rxp + 1);
+               else
+                       txp = (portid_t) (rxp - 1);
+               rte_eth_dev_get_dcb_info(fwd_ports_ids[rxp], &rxp_dcb_info);
+               rte_eth_dev_get_dcb_info(fwd_ports_ids[txp], &txp_dcb_info);
+       }
+}
+
+static void
+icmp_echo_config_setup(void)
+{
+       portid_t  rxp;
+       queueid_t rxq;
+       lcoreid_t lc_id;
+       uint16_t  sm_id;
 
+       if ((nb_txq * nb_fwd_ports) < nb_fwd_lcores)
+               cur_fwd_config.nb_fwd_lcores = (lcoreid_t)
+                       (nb_txq * nb_fwd_ports);
+       else
+               cur_fwd_config.nb_fwd_lcores = (lcoreid_t) nb_fwd_lcores;
+       cur_fwd_config.nb_fwd_ports = nb_fwd_ports;
+       cur_fwd_config.nb_fwd_streams =
+               (streamid_t) (nb_rxq * cur_fwd_config.nb_fwd_ports);
+       if (cur_fwd_config.nb_fwd_streams < cur_fwd_config.nb_fwd_lcores)
+               cur_fwd_config.nb_fwd_lcores =
+                       (lcoreid_t)cur_fwd_config.nb_fwd_streams;
+       if (verbose_level > 0) {
+               printf("%s fwd_cores=%d fwd_ports=%d fwd_streams=%d\n",
+                      __FUNCTION__,
+                      cur_fwd_config.nb_fwd_lcores,
+                      cur_fwd_config.nb_fwd_ports,
+                      cur_fwd_config.nb_fwd_streams);
+       }
+
+       /* reinitialize forwarding streams */
+       init_fwd_streams();
        setup_fwd_config_of_each_lcore(&cur_fwd_config);
        rxp = 0; rxq = 0;
        for (lc_id = 0; lc_id < cur_fwd_config.nb_fwd_lcores; lc_id++) {
-               /* a fwd core can run multi-streams */
-               for (sm_id = 0; sm_id < fwd_lcores[lc_id]->stream_nb; sm_id++)
-               {
+               if (verbose_level > 0)
+                       printf("  core=%d: \n", lc_id);
+               for (sm_id = 0; sm_id < fwd_lcores[lc_id]->stream_nb; sm_id++) {
                        struct fwd_stream *fs;
                        fs = fwd_streams[fwd_lcores[lc_id]->stream_idx + sm_id];
-                       if ((rxp & 0x1) == 0)
-                               txp = (portid_t) (rxp + 1);
-                       else
-                               txp = (portid_t) (rxp - 1);
                        fs->rx_port = fwd_ports_ids[rxp];
                        fs->rx_queue = rxq;
-                       fs->tx_port = fwd_ports_ids[txp];
-                       if (dcb_q_mapping == DCB_VT_Q_MAPPING)
-                               fs->tx_queue = rxq;
-                       else
-                               dcb_rxq_2_txq_mapping(rxq, &fs->tx_queue);
+                       fs->tx_port = fs->rx_port;
+                       fs->tx_queue = rxq;
                        fs->peer_addr = fs->tx_port;
+                       fs->retry_enabled = retry_enabled;
+                       if (verbose_level > 0)
+                               printf("  stream=%d port=%d rxq=%d txq=%d\n",
+                                      sm_id, fs->rx_port, fs->rx_queue,
+                                      fs->tx_queue);
                        rxq = (queueid_t) (rxq + 1);
-                       if (rxq < nb_q)
-                               continue;
-                       rxq = 0;
-                       if (numa_support && (nb_fwd_ports <= (nb_ports >> 1)))
-                               rxp = (portid_t)
-                                       (rxp + ((nb_ports >> 1) / nb_fwd_ports));
-                       else
+                       if (rxq == nb_rxq) {
+                               rxq = 0;
                                rxp = (portid_t) (rxp + 1);
+                       }
                }
        }
 }
 
+#if defined RTE_LIBRTE_PMD_SOFTNIC
+static void
+softnic_fwd_config_setup(void)
+{
+       struct rte_port *port;
+       portid_t pid, softnic_portid;
+       queueid_t i;
+       uint8_t softnic_enable = 0;
+
+       RTE_ETH_FOREACH_DEV(pid) {
+                       port = &ports[pid];
+                       const char *driver = port->dev_info.driver_name;
+
+                       if (strcmp(driver, "net_softnic") == 0) {
+                               softnic_portid = pid;
+                               softnic_enable = 1;
+                               break;
+                       }
+       }
+
+       if (softnic_enable == 0) {
+               printf("Softnic mode not configured(%s)!\n", __func__);
+               return;
+       }
+
+       cur_fwd_config.nb_fwd_ports = 1;
+       cur_fwd_config.nb_fwd_streams = (streamid_t) nb_rxq;
+
+       /* Re-initialize forwarding streams */
+       init_fwd_streams();
+
+       /*
+        * In the softnic forwarding test, the number of forwarding cores
+        * is set to one and remaining are used for softnic packet processing.
+        */
+       cur_fwd_config.nb_fwd_lcores = 1;
+       setup_fwd_config_of_each_lcore(&cur_fwd_config);
+
+       for (i = 0; i < cur_fwd_config.nb_fwd_streams; i++) {
+               fwd_streams[i]->rx_port   = softnic_portid;
+               fwd_streams[i]->rx_queue  = i;
+               fwd_streams[i]->tx_port   = softnic_portid;
+               fwd_streams[i]->tx_queue  = i;
+               fwd_streams[i]->peer_addr = fwd_streams[i]->tx_port;
+               fwd_streams[i]->retry_enabled = retry_enabled;
+       }
+}
+#endif
+
 void
 fwd_config_setup(void)
 {
        cur_fwd_config.fwd_eng = cur_fwd_eng;
+       if (strcmp(cur_fwd_eng->fwd_mode_name, "icmpecho") == 0) {
+               icmp_echo_config_setup();
+               return;
+       }
+
+#if defined RTE_LIBRTE_PMD_SOFTNIC
+       if (strcmp(cur_fwd_eng->fwd_mode_name, "softnic") == 0) {
+               softnic_fwd_config_setup();
+               return;
+       }
+#endif
+
        if ((nb_rxq > 1) && (nb_txq > 1)){
                if (dcb_config)
                        dcb_fwd_config_setup();
@@ -966,21 +2332,39 @@ fwd_config_setup(void)
                simple_fwd_config_setup();
 }
 
-static void
+static const char *
+mp_alloc_to_str(uint8_t mode)
+{
+       switch (mode) {
+       case MP_ALLOC_NATIVE:
+               return "native";
+       case MP_ALLOC_ANON:
+               return "anon";
+       case MP_ALLOC_XMEM:
+               return "xmem";
+       case MP_ALLOC_XMEM_HUGE:
+               return "xmemhuge";
+       default:
+               return "invalid";
+       }
+}
+
+void
 pkt_fwd_config_display(struct fwd_config *cfg)
 {
        struct fwd_stream *fs;
        lcoreid_t  lc_id;
        streamid_t sm_id;
 
-       printf("%s packet forwarding - ports=%d - cores=%d - streams=%d - "
-               "NUMA support %s, MP over anonymous pages %s\n",
+       printf("%s packet forwarding%s - ports=%d - cores=%d - streams=%d - "
+               "NUMA support %s, MP allocation mode: %s\n",
                cfg->fwd_eng->fwd_mode_name,
+               retry_enabled == 0 ? "" : " with retry",
                cfg->nb_fwd_ports, cfg->nb_fwd_lcores, cfg->nb_fwd_streams,
                numa_support == 1 ? "enabled" : "disabled",
-               mp_anon != 0 ? "enabled" : "disabled");
+               mp_alloc_to_str(mp_alloc_type));
 
-       if (strcmp(cfg->fwd_eng->fwd_mode_name, "mac_retry") == 0)
+       if (retry_enabled)
                printf("TX retry num: %u, delay between TX retries: %uus\n",
                        burst_tx_retry_num, burst_tx_delay_time);
        for (lc_id = 0; lc_id < cfg->nb_fwd_lcores; lc_id++) {
@@ -1005,16 +2389,19 @@ pkt_fwd_config_display(struct fwd_config *cfg)
        printf("\n");
 }
 
-
 void
-fwd_config_display(void)
+set_fwd_eth_peer(portid_t port_id, char *peer_addr)
 {
-       if((dcb_config) && (nb_fwd_lcores == 1)) {
-               printf("In DCB mode,the nb forwarding cores should be larger than 1\n");
+       struct rte_ether_addr new_peer_addr;
+       if (!rte_eth_dev_is_valid_port(port_id)) {
+               printf("Error: Invalid port number %i\n", port_id);
                return;
-       } 
-       fwd_config_setup();
-       pkt_fwd_config_display(&cur_fwd_config);
+       }
+       if (rte_ether_unformat_addr(peer_addr, &new_peer_addr) < 0) {
+               printf("Error: Invalid ethernet address: %s\n", peer_addr);
+               return;
+       }
+       peer_eth_addrs[port_id] = new_peer_addr;
 }
 
 int
@@ -1102,12 +2489,8 @@ set_fwd_ports_list(unsigned int *portlist, unsigned int nb_pt)
  again:
        for (i = 0; i < nb_pt; i++) {
                port_id = (portid_t) portlist[i];
-               if (port_id >= nb_ports) {
-                       printf("Invalid port id %u >= %u\n",
-                              (unsigned int) port_id,
-                              (unsigned int) nb_ports);
+               if (port_id_is_invalid(port_id, ENABLED_WARN))
                        return;
-               }
                if (record_now)
                        fwd_ports_ids[i] = port_id;
        }
@@ -1136,7 +2519,7 @@ set_fwd_ports_mask(uint64_t portmask)
                return;
        }
        nb_pt = 0;
-       for (i = 0; i < 64; i++) {
+       RTE_ETH_FOREACH_DEV(i) {
                if (! ((uint64_t)(1ULL << i) & portmask))
                        continue;
                portlist[nb_pt++] = i;
@@ -1158,6 +2541,22 @@ set_fwd_ports_number(uint16_t nb_pt)
               (unsigned int) nb_fwd_ports);
 }
 
+int
+port_is_forwarding(portid_t port_id)
+{
+       unsigned int i;
+
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
+               return -1;
+
+       for (i = 0; i < nb_fwd_ports; i++) {
+               if (fwd_ports_ids[i] == port_id)
+                       return 1;
+       }
+
+       return 0;
+}
+
 void
 set_nb_pkt_per_burst(uint16_t nb)
 {
@@ -1172,6 +2571,49 @@ set_nb_pkt_per_burst(uint16_t nb)
               (unsigned int) nb_pkt_per_burst);
 }
 
+static const char *
+tx_split_get_name(enum tx_pkt_split split)
+{
+       uint32_t i;
+
+       for (i = 0; i != RTE_DIM(tx_split_name); i++) {
+               if (tx_split_name[i].split == split)
+                       return tx_split_name[i].name;
+       }
+       return NULL;
+}
+
+void
+set_tx_pkt_split(const char *name)
+{
+       uint32_t i;
+
+       for (i = 0; i != RTE_DIM(tx_split_name); i++) {
+               if (strcmp(tx_split_name[i].name, name) == 0) {
+                       tx_pkt_split = tx_split_name[i].split;
+                       return;
+               }
+       }
+       printf("unknown value: \"%s\"\n", name);
+}
+
+void
+show_tx_pkt_segments(void)
+{
+       uint32_t i, n;
+       const char *split;
+
+       n = tx_pkt_nb_segs;
+       split = tx_split_get_name(tx_pkt_split);
+
+       printf("Number of segments: %u\n", n);
+       printf("Segment sizes: ");
+       for (i = 0; i != n - 1; i++)
+               printf("%hu,", tx_pkt_seg_lengths[i]);
+       printf("%hu\n", tx_pkt_seg_lengths[i]);
+       printf("Split packet: %s\n", split);
+}
+
 void
 set_tx_pkt_segments(unsigned *seg_lengths, unsigned nb_segs)
 {
@@ -1188,7 +2630,8 @@ set_tx_pkt_segments(unsigned *seg_lengths, unsigned nb_segs)
         * Check that each segment length is greater or equal than
         * the mbuf data sise.
         * Check also that the total packet length is greater or equal than the
-        * size of an empty UDP/IP packet (sizeof(struct ether_hdr) + 20 + 8).
+        * size of an empty UDP/IP packet (sizeof(struct rte_ether_hdr) +
+        * 20 + 8).
         */
        tx_pkt_len = 0;
        for (i = 0; i < nb_segs; i++) {
@@ -1199,10 +2642,10 @@ set_tx_pkt_segments(unsigned *seg_lengths, unsigned nb_segs)
                }
                tx_pkt_len = (uint16_t)(tx_pkt_len + seg_lengths[i]);
        }
-       if (tx_pkt_len < (sizeof(struct ether_hdr) + 20 + 8)) {
+       if (tx_pkt_len < (sizeof(struct rte_ether_hdr) + 20 + 8)) {
                printf("total packet length=%u < %d - give up\n",
                                (unsigned) tx_pkt_len,
-                               (int)(sizeof(struct ether_hdr) + 20 + 8));
+                               (int)(sizeof(struct rte_ether_hdr) + 20 + 8));
                return;
        }
 
@@ -1213,6 +2656,159 @@ set_tx_pkt_segments(unsigned *seg_lengths, unsigned nb_segs)
        tx_pkt_nb_segs = (uint8_t) nb_segs;
 }
 
+void
+setup_gro(const char *onoff, portid_t port_id)
+{
+       if (!rte_eth_dev_is_valid_port(port_id)) {
+               printf("invalid port id %u\n", port_id);
+               return;
+       }
+       if (test_done == 0) {
+               printf("Before enable/disable GRO,"
+                               " please stop forwarding first\n");
+               return;
+       }
+       if (strcmp(onoff, "on") == 0) {
+               if (gro_ports[port_id].enable != 0) {
+                       printf("Port %u has enabled GRO. Please"
+                                       " disable GRO first\n", port_id);
+                       return;
+               }
+               if (gro_flush_cycles == GRO_DEFAULT_FLUSH_CYCLES) {
+                       gro_ports[port_id].param.gro_types = RTE_GRO_TCP_IPV4;
+                       gro_ports[port_id].param.max_flow_num =
+                               GRO_DEFAULT_FLOW_NUM;
+                       gro_ports[port_id].param.max_item_per_flow =
+                               GRO_DEFAULT_ITEM_NUM_PER_FLOW;
+               }
+               gro_ports[port_id].enable = 1;
+       } else {
+               if (gro_ports[port_id].enable == 0) {
+                       printf("Port %u has disabled GRO\n", port_id);
+                       return;
+               }
+               gro_ports[port_id].enable = 0;
+       }
+}
+
+void
+setup_gro_flush_cycles(uint8_t cycles)
+{
+       if (test_done == 0) {
+               printf("Before change flush interval for GRO,"
+                               " please stop forwarding first.\n");
+               return;
+       }
+
+       if (cycles > GRO_MAX_FLUSH_CYCLES || cycles <
+                       GRO_DEFAULT_FLUSH_CYCLES) {
+               printf("The flushing cycle be in the range"
+                               " of 1 to %u. Revert to the default"
+                               " value %u.\n",
+                               GRO_MAX_FLUSH_CYCLES,
+                               GRO_DEFAULT_FLUSH_CYCLES);
+               cycles = GRO_DEFAULT_FLUSH_CYCLES;
+       }
+
+       gro_flush_cycles = cycles;
+}
+
+void
+show_gro(portid_t port_id)
+{
+       struct rte_gro_param *param;
+       uint32_t max_pkts_num;
+
+       param = &gro_ports[port_id].param;
+
+       if (!rte_eth_dev_is_valid_port(port_id)) {
+               printf("Invalid port id %u.\n", port_id);
+               return;
+       }
+       if (gro_ports[port_id].enable) {
+               printf("GRO type: TCP/IPv4\n");
+               if (gro_flush_cycles == GRO_DEFAULT_FLUSH_CYCLES) {
+                       max_pkts_num = param->max_flow_num *
+                               param->max_item_per_flow;
+               } else
+                       max_pkts_num = MAX_PKT_BURST * GRO_MAX_FLUSH_CYCLES;
+               printf("Max number of packets to perform GRO: %u\n",
+                               max_pkts_num);
+               printf("Flushing cycles: %u\n", gro_flush_cycles);
+       } else
+               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)
+{
+       static char fwd_modes[128] = "";
+       const char *separator = "|";
+       struct fwd_engine *fwd_eng;
+       unsigned i = 0;
+
+       if (strlen (fwd_modes) == 0) {
+               while ((fwd_eng = fwd_engines[i++]) != NULL) {
+                       strncat(fwd_modes, fwd_eng->fwd_mode_name,
+                                       sizeof(fwd_modes) - strlen(fwd_modes) - 1);
+                       strncat(fwd_modes, separator,
+                                       sizeof(fwd_modes) - strlen(fwd_modes) - 1);
+               }
+               fwd_modes[strlen(fwd_modes) - strlen(separator)] = '\0';
+       }
+
+       return fwd_modes;
+}
+
+char*
+list_pkt_forwarding_retry_modes(void)
+{
+       static char fwd_modes[128] = "";
+       const char *separator = "|";
+       struct fwd_engine *fwd_eng;
+       unsigned i = 0;
+
+       if (strlen(fwd_modes) == 0) {
+               while ((fwd_eng = fwd_engines[i++]) != NULL) {
+                       if (fwd_eng == &rx_only_engine)
+                               continue;
+                       strncat(fwd_modes, fwd_eng->fwd_mode_name,
+                                       sizeof(fwd_modes) -
+                                       strlen(fwd_modes) - 1);
+                       strncat(fwd_modes, separator,
+                                       sizeof(fwd_modes) -
+                                       strlen(fwd_modes) - 1);
+               }
+               fwd_modes[strlen(fwd_modes) - strlen(separator)] = '\0';
+       }
+
+       return fwd_modes;
+}
+
 void
 set_pkt_forwarding_mode(const char *fwd_mode_name)
 {
@@ -1222,14 +2818,124 @@ set_pkt_forwarding_mode(const char *fwd_mode_name)
        i = 0;
        while ((fwd_eng = fwd_engines[i]) != NULL) {
                if (! strcmp(fwd_eng->fwd_mode_name, fwd_mode_name)) {
-                       printf("Set %s packet forwarding mode\n",
-                              fwd_mode_name);
+                       printf("Set %s packet forwarding mode%s\n",
+                              fwd_mode_name,
+                              retry_enabled == 0 ? "" : " with retry");
                        cur_fwd_eng = fwd_eng;
                        return;
                }
                i++;
        }
-       printf("Invalid %s packet forwarding mode\n", fwd_mode_name);
+       printf("Invalid %s packet forwarding mode\n", fwd_mode_name);
+}
+
+void
+add_rx_dump_callbacks(portid_t portid)
+{
+       struct rte_eth_dev_info dev_info;
+       uint16_t queue;
+       int ret;
+
+       if (port_id_is_invalid(portid, ENABLED_WARN))
+               return;
+
+       ret = eth_dev_info_get_print_err(portid, &dev_info);
+       if (ret != 0)
+               return;
+
+       for (queue = 0; queue < dev_info.nb_rx_queues; queue++)
+               if (!ports[portid].rx_dump_cb[queue])
+                       ports[portid].rx_dump_cb[queue] =
+                               rte_eth_add_rx_callback(portid, queue,
+                                       dump_rx_pkts, NULL);
+}
+
+void
+add_tx_dump_callbacks(portid_t portid)
+{
+       struct rte_eth_dev_info dev_info;
+       uint16_t queue;
+       int ret;
+
+       if (port_id_is_invalid(portid, ENABLED_WARN))
+               return;
+
+       ret = eth_dev_info_get_print_err(portid, &dev_info);
+       if (ret != 0)
+               return;
+
+       for (queue = 0; queue < dev_info.nb_tx_queues; queue++)
+               if (!ports[portid].tx_dump_cb[queue])
+                       ports[portid].tx_dump_cb[queue] =
+                               rte_eth_add_tx_callback(portid, queue,
+                                                       dump_tx_pkts, NULL);
+}
+
+void
+remove_rx_dump_callbacks(portid_t portid)
+{
+       struct rte_eth_dev_info dev_info;
+       uint16_t queue;
+       int ret;
+
+       if (port_id_is_invalid(portid, ENABLED_WARN))
+               return;
+
+       ret = eth_dev_info_get_print_err(portid, &dev_info);
+       if (ret != 0)
+               return;
+
+       for (queue = 0; queue < dev_info.nb_rx_queues; queue++)
+               if (ports[portid].rx_dump_cb[queue]) {
+                       rte_eth_remove_rx_callback(portid, queue,
+                               ports[portid].rx_dump_cb[queue]);
+                       ports[portid].rx_dump_cb[queue] = NULL;
+               }
+}
+
+void
+remove_tx_dump_callbacks(portid_t portid)
+{
+       struct rte_eth_dev_info dev_info;
+       uint16_t queue;
+       int ret;
+
+       if (port_id_is_invalid(portid, ENABLED_WARN))
+               return;
+
+       ret = eth_dev_info_get_print_err(portid, &dev_info);
+       if (ret != 0)
+               return;
+
+       for (queue = 0; queue < dev_info.nb_tx_queues; queue++)
+               if (ports[portid].tx_dump_cb[queue]) {
+                       rte_eth_remove_tx_callback(portid, queue,
+                               ports[portid].tx_dump_cb[queue]);
+                       ports[portid].tx_dump_cb[queue] = NULL;
+               }
+}
+
+void
+configure_rxtx_dump_callbacks(uint16_t verbose)
+{
+       portid_t portid;
+
+#ifndef RTE_ETHDEV_RXTX_CALLBACKS
+               TESTPMD_LOG(ERR, "setting rxtx callbacks is not enabled\n");
+               return;
+#endif
+
+       RTE_ETH_FOREACH_DEV(portid)
+       {
+               if (verbose == 1 || verbose > 2)
+                       add_rx_dump_callbacks(portid);
+               else
+                       remove_rx_dump_callbacks(portid);
+               if (verbose >= 2)
+                       add_tx_dump_callbacks(portid);
+               else
+                       remove_tx_dump_callbacks(portid);
+       }
 }
 
 void
@@ -1238,6 +2944,7 @@ set_verbose_level(uint16_t vb_level)
        printf("Change verbose level from %u to %u\n",
               (unsigned int) verbose_level, (unsigned int) vb_level);
        verbose_level = vb_level;
+       configure_rxtx_dump_callbacks(verbose_level);
 }
 
 void
@@ -1245,21 +2952,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))
+       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
@@ -1267,21 +2979,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))
+       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
@@ -1289,7 +3006,7 @@ rx_vlan_strip_set_on_queue(portid_t port_id, uint16_t queue_id, int on)
 {
        int diag;
 
-       if (port_id_is_invalid(port_id))
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
 
        diag = rte_eth_dev_set_vlan_strip_on_queue(port_id, queue_id, on);
@@ -1303,38 +3020,44 @@ 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))
+       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;
 }
 
-void
+int
 rx_vft_set(portid_t port_id, uint16_t vlan_id, int on)
 {
        int diag;
 
-       if (port_id_is_invalid(port_id))
-               return;
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
+               return 1;
        if (vlan_id_is_invalid(vlan_id))
-               return;
+               return 1;
        diag = rte_eth_dev_vlan_filter(port_id, vlan_id, on);
        if (diag == 0)
-               return;
+               return 0;
        printf("rte_eth_dev_vlan_filter(port_pi=%d, vlan_id=%d, on=%d) failed "
               "diag=%d\n",
               port_id, vlan_id, on, diag);
+       return -1;
 }
 
 void
@@ -1342,45 +3065,112 @@ rx_vlan_all_filter_set(portid_t port_id, int on)
 {
        uint16_t vlan_id;
 
-       if (port_id_is_invalid(port_id))
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
-       for (vlan_id = 0; vlan_id < 4096; vlan_id++)
-               rx_vft_set(port_id, vlan_id, on);
+       for (vlan_id = 0; vlan_id < 4096; vlan_id++) {
+               if (rx_vft_set(port_id, vlan_id, on))
+                       break;
+       }
 }
 
 void
-vlan_tpid_set(portid_t port_id, uint16_t tp_id)
+vlan_tpid_set(portid_t port_id, enum rte_vlan_type vlan_type, uint16_t tp_id)
 {
        int diag;
-       if (port_id_is_invalid(port_id))
+
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
 
-       diag = rte_eth_dev_set_vlan_ether_type(port_id, tp_id);
+       diag = rte_eth_dev_set_vlan_ether_type(port_id, vlan_type, tp_id);
        if (diag == 0)
                return;
 
-       printf("tx_vlan_tpid_set(port_pi=%d, tpid=%d) failed "
+       printf("tx_vlan_tpid_set(port_pi=%d, vlan_type=%d, tpid=%d) failed "
               "diag=%d\n",
-              port_id, tp_id, diag);
+              port_id, vlan_type, tp_id, diag);
 }
 
 void
 tx_vlan_set(portid_t port_id, uint16_t vlan_id)
 {
-       if (port_id_is_invalid(port_id))
+       struct rte_eth_dev_info dev_info;
+       int ret;
+
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
+               return;
+       if (vlan_id_is_invalid(vlan_id))
+               return;
+
+       if (ports[port_id].dev_conf.txmode.offloads &
+           DEV_TX_OFFLOAD_QINQ_INSERT) {
+               printf("Error, as QinQ has been enabled.\n");
+               return;
+       }
+
+       ret = eth_dev_info_get_print_err(port_id, &dev_info);
+       if (ret != 0)
+               return;
+
+       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].dev_conf.txmode.offloads |= DEV_TX_OFFLOAD_VLAN_INSERT;
+       ports[port_id].tx_vlan_id = vlan_id;
+}
+
+void
+tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer)
+{
+       struct rte_eth_dev_info dev_info;
+       int ret;
+
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
        if (vlan_id_is_invalid(vlan_id))
                return;
-       ports[port_id].tx_ol_flags |= PKT_TX_VLAN_PKT;
+       if (vlan_id_is_invalid(vlan_id_outer))
+               return;
+
+       ret = eth_dev_info_get_print_err(port_id, &dev_info);
+       if (ret != 0)
+               return;
+
+       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].dev_conf.txmode.offloads |= (DEV_TX_OFFLOAD_VLAN_INSERT |
+                                                   DEV_TX_OFFLOAD_QINQ_INSERT);
        ports[port_id].tx_vlan_id = vlan_id;
+       ports[port_id].tx_vlan_id_outer = vlan_id_outer;
 }
 
 void
 tx_vlan_reset(portid_t port_id)
 {
-       if (port_id_is_invalid(port_id))
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
+               return;
+       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;
+}
+
+void
+tx_vlan_pvid_set(portid_t port_id, uint16_t vlan_id, int on)
+{
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
-       ports[port_id].tx_ol_flags &= ~PKT_TX_VLAN_PKT;
+
+       rte_eth_dev_set_vlan_pvid(port_id, vlan_id, on);
 }
 
 void
@@ -1389,7 +3179,7 @@ set_qmap(portid_t port_id, uint8_t is_rx, uint16_t queue_id, uint8_t map_value)
        uint16_t i;
        uint8_t existing_mapping_found = 0;
 
-       if (port_id_is_invalid(port_id))
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
 
        if (is_rx ? (rx_queue_id_is_invalid(queue_id)) : (tx_queue_id_is_invalid(queue_id)))
@@ -1436,202 +3226,664 @@ set_qmap(portid_t port_id, uint8_t is_rx, uint16_t queue_id, uint8_t map_value)
 }
 
 void
-tx_cksum_set(portid_t port_id, uint8_t cksum_mask)
+set_xstats_hide_zero(uint8_t on_off)
 {
-       uint16_t tx_ol_flags;
-       if (port_id_is_invalid(port_id))
-               return;
-       /* Clear last 4 bits and then set L3/4 checksum mask again */
-       tx_ol_flags = (uint16_t) (ports[port_id].tx_ol_flags & 0xFFF0);
-       ports[port_id].tx_ol_flags = (uint16_t) ((cksum_mask & 0xf) | tx_ol_flags);
+       xstats_hide_zero = on_off;
+}
+
+static inline void
+print_fdir_mask(struct rte_eth_fdir_masks *mask)
+{
+       printf("\n    vlan_tci: 0x%04x", rte_be_to_cpu_16(mask->vlan_tci_mask));
+
+       if (fdir_conf.mode == RTE_FDIR_MODE_PERFECT_TUNNEL)
+               printf(", mac_addr: 0x%02x, tunnel_type: 0x%01x,"
+                       " tunnel_id: 0x%08x",
+                       mask->mac_addr_byte_mask, mask->tunnel_type_mask,
+                       rte_be_to_cpu_32(mask->tunnel_id_mask));
+       else if (fdir_conf.mode != RTE_FDIR_MODE_PERFECT_MAC_VLAN) {
+               printf(", src_ipv4: 0x%08x, dst_ipv4: 0x%08x",
+                       rte_be_to_cpu_32(mask->ipv4_mask.src_ip),
+                       rte_be_to_cpu_32(mask->ipv4_mask.dst_ip));
+
+               printf("\n    src_port: 0x%04x, dst_port: 0x%04x",
+                       rte_be_to_cpu_16(mask->src_port_mask),
+                       rte_be_to_cpu_16(mask->dst_port_mask));
+
+               printf("\n    src_ipv6: 0x%08x,0x%08x,0x%08x,0x%08x",
+                       rte_be_to_cpu_32(mask->ipv6_mask.src_ip[0]),
+                       rte_be_to_cpu_32(mask->ipv6_mask.src_ip[1]),
+                       rte_be_to_cpu_32(mask->ipv6_mask.src_ip[2]),
+                       rte_be_to_cpu_32(mask->ipv6_mask.src_ip[3]));
+
+               printf("\n    dst_ipv6: 0x%08x,0x%08x,0x%08x,0x%08x",
+                       rte_be_to_cpu_32(mask->ipv6_mask.dst_ip[0]),
+                       rte_be_to_cpu_32(mask->ipv6_mask.dst_ip[1]),
+                       rte_be_to_cpu_32(mask->ipv6_mask.dst_ip[2]),
+                       rte_be_to_cpu_32(mask->ipv6_mask.dst_ip[3]));
+       }
+
+       printf("\n");
+}
+
+static inline void
+print_fdir_flex_payload(struct rte_eth_fdir_flex_conf *flex_conf, uint32_t num)
+{
+       struct rte_eth_flex_payload_cfg *cfg;
+       uint32_t i, j;
+
+       for (i = 0; i < flex_conf->nb_payloads; i++) {
+               cfg = &flex_conf->flex_set[i];
+               if (cfg->type == RTE_ETH_RAW_PAYLOAD)
+                       printf("\n    RAW:  ");
+               else if (cfg->type == RTE_ETH_L2_PAYLOAD)
+                       printf("\n    L2_PAYLOAD:  ");
+               else if (cfg->type == RTE_ETH_L3_PAYLOAD)
+                       printf("\n    L3_PAYLOAD:  ");
+               else if (cfg->type == RTE_ETH_L4_PAYLOAD)
+                       printf("\n    L4_PAYLOAD:  ");
+               else
+                       printf("\n    UNKNOWN PAYLOAD(%u):  ", cfg->type);
+               for (j = 0; j < num; j++)
+                       printf("  %-5u", cfg->src_offset[j]);
+       }
+       printf("\n");
+}
+
+static char *
+flowtype_to_str(uint16_t flow_type)
+{
+       struct flow_type_info {
+               char str[32];
+               uint16_t ftype;
+       };
+
+       uint8_t i;
+       static struct flow_type_info flowtype_str_table[] = {
+               {"raw", RTE_ETH_FLOW_RAW},
+               {"ipv4", RTE_ETH_FLOW_IPV4},
+               {"ipv4-frag", RTE_ETH_FLOW_FRAG_IPV4},
+               {"ipv4-tcp", RTE_ETH_FLOW_NONFRAG_IPV4_TCP},
+               {"ipv4-udp", RTE_ETH_FLOW_NONFRAG_IPV4_UDP},
+               {"ipv4-sctp", RTE_ETH_FLOW_NONFRAG_IPV4_SCTP},
+               {"ipv4-other", RTE_ETH_FLOW_NONFRAG_IPV4_OTHER},
+               {"ipv6", RTE_ETH_FLOW_IPV6},
+               {"ipv6-frag", RTE_ETH_FLOW_FRAG_IPV6},
+               {"ipv6-tcp", RTE_ETH_FLOW_NONFRAG_IPV6_TCP},
+               {"ipv6-udp", RTE_ETH_FLOW_NONFRAG_IPV6_UDP},
+               {"ipv6-sctp", RTE_ETH_FLOW_NONFRAG_IPV6_SCTP},
+               {"ipv6-other", RTE_ETH_FLOW_NONFRAG_IPV6_OTHER},
+               {"l2_payload", RTE_ETH_FLOW_L2_PAYLOAD},
+               {"port", RTE_ETH_FLOW_PORT},
+               {"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(flowtype_str_table); i++) {
+               if (flowtype_str_table[i].ftype == flow_type)
+                       return flowtype_str_table[i].str;
+       }
+
+       return NULL;
+}
+
+static inline void
+print_fdir_flex_mask(struct rte_eth_fdir_flex_conf *flex_conf, uint32_t num)
+{
+       struct rte_eth_fdir_flex_mask *mask;
+       uint32_t i, j;
+       char *p;
+
+       for (i = 0; i < flex_conf->nb_flexmasks; i++) {
+               mask = &flex_conf->flex_mask[i];
+               p = flowtype_to_str(mask->flow_type);
+               printf("\n    %s:\t", p ? p : "unknown");
+               for (j = 0; j < num; j++)
+                       printf(" %02x", mask->mask[j]);
+       }
+       printf("\n");
+}
+
+static inline void
+print_fdir_flow_type(uint32_t flow_types_mask)
+{
+       int i;
+       char *p;
+
+       for (i = RTE_ETH_FLOW_UNKNOWN; i < RTE_ETH_FLOW_MAX; i++) {
+               if (!(flow_types_mask & (1 << i)))
+                       continue;
+               p = flowtype_to_str(i);
+               if (p)
+                       printf(" %s", p);
+               else
+                       printf(" unknown");
+       }
+       printf("\n");
 }
 
 void
-fdir_add_signature_filter(portid_t port_id, uint8_t queue_id,
-                         struct rte_fdir_filter *fdir_filter)
+fdir_get_infos(portid_t port_id)
 {
-       int diag;
+       struct rte_eth_fdir_stats fdir_stat;
+       struct rte_eth_fdir_info fdir_info;
+       int ret;
 
-       if (port_id_is_invalid(port_id))
-               return;
+       static const char *fdir_stats_border = "########################";
 
-       diag = rte_eth_dev_fdir_add_signature_filter(port_id, fdir_filter,
-                                                    queue_id);
-       if (diag == 0)
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
+               return;
+       ret = rte_eth_dev_filter_supported(port_id, RTE_ETH_FILTER_FDIR);
+       if (ret < 0) {
+               printf("\n FDIR is not supported on port %-2d\n",
+                       port_id);
                return;
+       }
 
-       printf("rte_eth_dev_fdir_add_signature_filter for port_id=%d failed "
-              "diag=%d\n", port_id, diag);
+       memset(&fdir_info, 0, sizeof(fdir_info));
+       rte_eth_dev_filter_ctrl(port_id, RTE_ETH_FILTER_FDIR,
+                              RTE_ETH_FILTER_INFO, &fdir_info);
+       memset(&fdir_stat, 0, sizeof(fdir_stat));
+       rte_eth_dev_filter_ctrl(port_id, RTE_ETH_FILTER_FDIR,
+                              RTE_ETH_FILTER_STATS, &fdir_stat);
+       printf("\n  %s FDIR infos for port %-2d     %s\n",
+              fdir_stats_border, port_id, fdir_stats_border);
+       printf("  MODE: ");
+       if (fdir_info.mode == RTE_FDIR_MODE_PERFECT)
+               printf("  PERFECT\n");
+       else if (fdir_info.mode == RTE_FDIR_MODE_PERFECT_MAC_VLAN)
+               printf("  PERFECT-MAC-VLAN\n");
+       else if (fdir_info.mode == RTE_FDIR_MODE_PERFECT_TUNNEL)
+               printf("  PERFECT-TUNNEL\n");
+       else if (fdir_info.mode == RTE_FDIR_MODE_SIGNATURE)
+               printf("  SIGNATURE\n");
+       else
+               printf("  DISABLE\n");
+       if (fdir_info.mode != RTE_FDIR_MODE_PERFECT_MAC_VLAN
+               && fdir_info.mode != RTE_FDIR_MODE_PERFECT_TUNNEL) {
+               printf("  SUPPORTED FLOW TYPE: ");
+               print_fdir_flow_type(fdir_info.flow_types_mask[0]);
+       }
+       printf("  FLEX PAYLOAD INFO:\n");
+       printf("  max_len:       %-10"PRIu32"  payload_limit: %-10"PRIu32"\n"
+              "  payload_unit:  %-10"PRIu32"  payload_seg:   %-10"PRIu32"\n"
+              "  bitmask_unit:  %-10"PRIu32"  bitmask_num:   %-10"PRIu32"\n",
+               fdir_info.max_flexpayload, fdir_info.flex_payload_limit,
+               fdir_info.flex_payload_unit,
+               fdir_info.max_flex_payload_segment_num,
+               fdir_info.flex_bitmask_unit, fdir_info.max_flex_bitmask_num);
+       printf("  MASK: ");
+       print_fdir_mask(&fdir_info.mask);
+       if (fdir_info.flex_conf.nb_payloads > 0) {
+               printf("  FLEX PAYLOAD SRC OFFSET:");
+               print_fdir_flex_payload(&fdir_info.flex_conf, fdir_info.max_flexpayload);
+       }
+       if (fdir_info.flex_conf.nb_flexmasks > 0) {
+               printf("  FLEX MASK CFG:");
+               print_fdir_flex_mask(&fdir_info.flex_conf, fdir_info.max_flexpayload);
+       }
+       printf("  guarant_count: %-10"PRIu32"  best_count:    %"PRIu32"\n",
+              fdir_stat.guarant_cnt, fdir_stat.best_cnt);
+       printf("  guarant_space: %-10"PRIu32"  best_space:    %"PRIu32"\n",
+              fdir_info.guarant_spc, fdir_info.best_spc);
+       printf("  collision:     %-10"PRIu32"  free:          %"PRIu32"\n"
+              "  maxhash:       %-10"PRIu32"  maxlen:        %"PRIu32"\n"
+              "  add:           %-10"PRIu64"  remove:        %"PRIu64"\n"
+              "  f_add:         %-10"PRIu64"  f_remove:      %"PRIu64"\n",
+              fdir_stat.collision, fdir_stat.free,
+              fdir_stat.maxhash, fdir_stat.maxlen,
+              fdir_stat.add, fdir_stat.remove,
+              fdir_stat.f_add, fdir_stat.f_remove);
+       printf("  %s############################%s\n",
+              fdir_stats_border, fdir_stats_border);
 }
 
 void
-fdir_update_signature_filter(portid_t port_id, uint8_t queue_id,
-                            struct rte_fdir_filter *fdir_filter)
+fdir_set_flex_mask(portid_t port_id, struct rte_eth_fdir_flex_mask *cfg)
 {
-       int diag;
+       struct rte_port *port;
+       struct rte_eth_fdir_flex_conf *flex_conf;
+       int i, idx = 0;
 
-       if (port_id_is_invalid(port_id))
-               return;
+       port = &ports[port_id];
+       flex_conf = &port->dev_conf.fdir_conf.flex_conf;
+       for (i = 0; i < RTE_ETH_FLOW_MAX; i++) {
+               if (cfg->flow_type == flex_conf->flex_mask[i].flow_type) {
+                       idx = i;
+                       break;
+               }
+       }
+       if (i >= RTE_ETH_FLOW_MAX) {
+               if (flex_conf->nb_flexmasks < RTE_DIM(flex_conf->flex_mask)) {
+                       idx = flex_conf->nb_flexmasks;
+                       flex_conf->nb_flexmasks++;
+               } else {
+                       printf("The flex mask table is full. Can not set flex"
+                               " mask for flow_type(%u).", cfg->flow_type);
+                       return;
+               }
+       }
+       rte_memcpy(&flex_conf->flex_mask[idx],
+                        cfg,
+                        sizeof(struct rte_eth_fdir_flex_mask));
+}
 
-       diag = rte_eth_dev_fdir_update_signature_filter(port_id, fdir_filter,
-                                                       queue_id);
-       if (diag == 0)
-               return;
+void
+fdir_set_flex_payload(portid_t port_id, struct rte_eth_flex_payload_cfg *cfg)
+{
+       struct rte_port *port;
+       struct rte_eth_fdir_flex_conf *flex_conf;
+       int i, idx = 0;
+
+       port = &ports[port_id];
+       flex_conf = &port->dev_conf.fdir_conf.flex_conf;
+       for (i = 0; i < RTE_ETH_PAYLOAD_MAX; i++) {
+               if (cfg->type == flex_conf->flex_set[i].type) {
+                       idx = i;
+                       break;
+               }
+       }
+       if (i >= RTE_ETH_PAYLOAD_MAX) {
+               if (flex_conf->nb_payloads < RTE_DIM(flex_conf->flex_set)) {
+                       idx = flex_conf->nb_payloads;
+                       flex_conf->nb_payloads++;
+               } else {
+                       printf("The flex payload table is full. Can not set"
+                               " flex payload for type(%u).", cfg->type);
+                       return;
+               }
+       }
+       rte_memcpy(&flex_conf->flex_set[idx],
+                        cfg,
+                        sizeof(struct rte_eth_flex_payload_cfg));
 
-       printf("rte_eth_dev_fdir_update_signature_filter for port_id=%d failed "
-              "diag=%d\n", port_id, diag);
 }
 
 void
-fdir_remove_signature_filter(portid_t port_id,
-                            struct rte_fdir_filter *fdir_filter)
+set_vf_traffic(portid_t port_id, uint8_t is_rx, uint16_t vf, uint8_t on)
 {
+#ifdef RTE_LIBRTE_IXGBE_PMD
        int diag;
 
-       if (port_id_is_invalid(port_id))
-               return;
+       if (is_rx)
+               diag = rte_pmd_ixgbe_set_vf_rx(port_id, vf, on);
+       else
+               diag = rte_pmd_ixgbe_set_vf_tx(port_id, vf, on);
 
-       diag = rte_eth_dev_fdir_remove_signature_filter(port_id, fdir_filter);
        if (diag == 0)
                return;
+       printf("rte_pmd_ixgbe_set_vf_%s for port_id=%d failed diag=%d\n",
+                       is_rx ? "rx" : "tx", port_id, diag);
+       return;
+#endif
+       printf("VF %s setting not supported for port %d\n",
+                       is_rx ? "Rx" : "Tx", port_id);
+       RTE_SET_USED(vf);
+       RTE_SET_USED(on);
+}
 
-       printf("rte_eth_dev_fdir_add_signature_filter for port_id=%d failed "
-              "diag=%d\n", port_id, diag);
+int
+set_queue_rate_limit(portid_t port_id, uint16_t queue_idx, uint16_t rate)
+{
+       int diag;
+       struct rte_eth_link link;
+       int ret;
 
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
+               return 1;
+       ret = eth_link_get_nowait_print_err(port_id, &link);
+       if (ret < 0)
+               return 1;
+       if (rate > link.link_speed) {
+               printf("Invalid rate value:%u bigger than link speed: %u\n",
+                       rate, link.link_speed);
+               return 1;
+       }
+       diag = rte_eth_set_queue_rate_limit(port_id, queue_idx, rate);
+       if (diag == 0)
+               return diag;
+       printf("rte_eth_set_queue_rate_limit for port_id=%d failed diag=%d\n",
+               port_id, diag);
+       return diag;
 }
 
-void
-fdir_get_infos(portid_t port_id)
+int
+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,
+                                                      q_msk);
+#endif
+#ifdef RTE_LIBRTE_BNXT_PMD
+       if (diag == -ENOTSUP)
+               diag = rte_pmd_bnxt_set_vf_rate_limit(port_id, vf, rate, q_msk);
+#endif
+       if (diag == 0)
+               return diag;
+
+       printf("set_vf_rate_limit for port_id=%d failed diag=%d\n",
+               port_id, diag);
+       return diag;
+}
+
+/*
+ * Functions to manage the set of filtered Multicast MAC addresses.
+ *
+ * A pool of filtered multicast MAC addresses is associated with each port.
+ * The pool is allocated in chunks of MCAST_POOL_INC multicast addresses.
+ * The address of the pool and the number of valid multicast MAC addresses
+ * recorded in the pool are stored in the fields "mc_addr_pool" and
+ * "mc_addr_nb" of the "rte_port" data structure.
+ *
+ * The function "rte_eth_dev_set_mc_addr_list" of the PMDs API imposes
+ * to be supplied a contiguous array of multicast MAC addresses.
+ * To comply with this constraint, the set of multicast addresses recorded
+ * into the pool are systematically compacted at the beginning of the pool.
+ * Hence, when a multicast address is removed from the pool, all following
+ * addresses, if any, are copied back to keep the set contiguous.
+ */
+#define MCAST_POOL_INC 32
+
+static int
+mcast_addr_pool_extend(struct rte_port *port)
 {
-       struct rte_eth_fdir fdir_infos;
+       struct rte_ether_addr *mc_pool;
+       size_t mc_pool_size;
 
-       static const char *fdir_stats_border = "########################";
+       /*
+        * If a free entry is available at the end of the pool, just
+        * increment the number of recorded multicast addresses.
+        */
+       if ((port->mc_addr_nb % MCAST_POOL_INC) != 0) {
+               port->mc_addr_nb++;
+               return 0;
+       }
 
-       if (port_id_is_invalid(port_id))
-               return;
+       /*
+        * [re]allocate a pool with MCAST_POOL_INC more entries.
+        * The previous test guarantees that port->mc_addr_nb is a multiple
+        * of MCAST_POOL_INC.
+        */
+       mc_pool_size = sizeof(struct rte_ether_addr) * (port->mc_addr_nb +
+                                                   MCAST_POOL_INC);
+       mc_pool = (struct rte_ether_addr *) realloc(port->mc_addr_pool,
+                                               mc_pool_size);
+       if (mc_pool == NULL) {
+               printf("allocation of pool of %u multicast addresses failed\n",
+                      port->mc_addr_nb + MCAST_POOL_INC);
+               return -ENOMEM;
+       }
 
-       rte_eth_dev_fdir_get_infos(port_id, &fdir_infos);
+       port->mc_addr_pool = mc_pool;
+       port->mc_addr_nb++;
+       return 0;
 
-       printf("\n  %s FDIR infos for port %-2d     %s\n",
-              fdir_stats_border, port_id, fdir_stats_border);
+}
 
-       printf("  collision: %-10"PRIu64"  free:     %"PRIu64"\n"
-              "  maxhash:   %-10"PRIu64"  maxlen:   %"PRIu64"\n"
-              "  add:       %-10"PRIu64"  remove:   %"PRIu64"\n"
-              "  f_add:     %-10"PRIu64"  f_remove: %"PRIu64"\n",
-              (uint64_t)(fdir_infos.collision), (uint64_t)(fdir_infos.free),
-              (uint64_t)(fdir_infos.maxhash), (uint64_t)(fdir_infos.maxlen),
-              fdir_infos.add, fdir_infos.remove,
-              fdir_infos.f_add, fdir_infos.f_remove);
-       printf("  %s############################%s\n",
-              fdir_stats_border, fdir_stats_border);
+static void
+mcast_addr_pool_remove(struct rte_port *port, uint32_t addr_idx)
+{
+       port->mc_addr_nb--;
+       if (addr_idx == port->mc_addr_nb) {
+               /* No need to recompact the set of multicast addressses. */
+               if (port->mc_addr_nb == 0) {
+                       /* free the pool of multicast addresses. */
+                       free(port->mc_addr_pool);
+                       port->mc_addr_pool = NULL;
+               }
+               return;
+       }
+       memmove(&port->mc_addr_pool[addr_idx],
+               &port->mc_addr_pool[addr_idx + 1],
+               sizeof(struct rte_ether_addr) * (port->mc_addr_nb - addr_idx));
 }
 
-void
-fdir_add_perfect_filter(portid_t port_id, uint16_t soft_id, uint8_t queue_id,
-                       uint8_t drop, struct rte_fdir_filter *fdir_filter)
+static void
+eth_port_multicast_addr_list_set(portid_t port_id)
 {
+       struct rte_port *port;
        int diag;
 
-       if (port_id_is_invalid(port_id))
-               return;
-
-       diag = rte_eth_dev_fdir_add_perfect_filter(port_id, fdir_filter,
-                                                  soft_id, queue_id, drop);
+       port = &ports[port_id];
+       diag = rte_eth_dev_set_mc_addr_list(port_id, port->mc_addr_pool,
+                                           port->mc_addr_nb);
        if (diag == 0)
                return;
-
-       printf("rte_eth_dev_fdir_add_perfect_filter for port_id=%d failed "
-              "diag=%d\n", port_id, diag);
+       printf("rte_eth_dev_set_mc_addr_list(port=%d, nb=%u) failed. diag=%d\n",
+              port->mc_addr_nb, port_id, -diag);
 }
 
 void
-fdir_update_perfect_filter(portid_t port_id, uint16_t soft_id, uint8_t queue_id,
-                          uint8_t drop, struct rte_fdir_filter *fdir_filter)
+mcast_addr_add(portid_t port_id, struct rte_ether_addr *mc_addr)
 {
-       int diag;
+       struct rte_port *port;
+       uint32_t i;
 
-       if (port_id_is_invalid(port_id))
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
 
-       diag = rte_eth_dev_fdir_update_perfect_filter(port_id, fdir_filter,
-                                                     soft_id, queue_id, drop);
-       if (diag == 0)
-               return;
+       port = &ports[port_id];
+
+       /*
+        * Check that the added multicast MAC address is not already recorded
+        * in the pool of multicast addresses.
+        */
+       for (i = 0; i < port->mc_addr_nb; i++) {
+               if (rte_is_same_ether_addr(mc_addr, &port->mc_addr_pool[i])) {
+                       printf("multicast address already filtered by port\n");
+                       return;
+               }
+       }
 
-       printf("rte_eth_dev_fdir_update_perfect_filter for port_id=%d failed "
-              "diag=%d\n", port_id, diag);
+       if (mcast_addr_pool_extend(port) != 0)
+               return;
+       rte_ether_addr_copy(mc_addr, &port->mc_addr_pool[i]);
+       eth_port_multicast_addr_list_set(port_id);
 }
 
 void
-fdir_remove_perfect_filter(portid_t port_id, uint16_t soft_id,
-                          struct rte_fdir_filter *fdir_filter)
+mcast_addr_remove(portid_t port_id, struct rte_ether_addr *mc_addr)
 {
-       int diag;
+       struct rte_port *port;
+       uint32_t i;
 
-       if (port_id_is_invalid(port_id))
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
 
-       diag = rte_eth_dev_fdir_remove_perfect_filter(port_id, fdir_filter,
-                                                     soft_id);
-       if (diag == 0)
+       port = &ports[port_id];
+
+       /*
+        * Search the pool of multicast MAC addresses for the removed address.
+        */
+       for (i = 0; i < port->mc_addr_nb; i++) {
+               if (rte_is_same_ether_addr(mc_addr, &port->mc_addr_pool[i]))
+                       break;
+       }
+       if (i == port->mc_addr_nb) {
+               printf("multicast address not filtered by port %d\n", port_id);
                return;
+       }
 
-       printf("rte_eth_dev_fdir_update_perfect_filter for port_id=%d failed "
-              "diag=%d\n", port_id, diag);
+       mcast_addr_pool_remove(port, i);
+       eth_port_multicast_addr_list_set(port_id);
 }
 
 void
-fdir_set_masks(portid_t port_id, struct rte_fdir_masks *fdir_masks)
+port_dcb_info_display(portid_t port_id)
 {
-       int diag;
+       struct rte_eth_dcb_info dcb_info;
+       uint16_t i;
+       int ret;
+       static const char *border = "================";
 
-       if (port_id_is_invalid(port_id))
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
 
-       diag = rte_eth_dev_fdir_set_masks(port_id, fdir_masks);
-       if (diag == 0)
+       ret = rte_eth_dev_get_dcb_info(port_id, &dcb_info);
+       if (ret) {
+               printf("\n Failed to get dcb infos on port %-2d\n",
+                       port_id);
                return;
+       }
+       printf("\n  %s DCB infos for port %-2d  %s\n", border, port_id, border);
+       printf("  TC NUMBER: %d\n", dcb_info.nb_tcs);
+       printf("\n  TC :        ");
+       for (i = 0; i < dcb_info.nb_tcs; i++)
+               printf("\t%4d", i);
+       printf("\n  Priority :  ");
+       for (i = 0; i < dcb_info.nb_tcs; i++)
+               printf("\t%4d", dcb_info.prio_tc[i]);
+       printf("\n  BW percent :");
+       for (i = 0; i < dcb_info.nb_tcs; i++)
+               printf("\t%4d%%", dcb_info.tc_bws[i]);
+       printf("\n  RXQ base :  ");
+       for (i = 0; i < dcb_info.nb_tcs; i++)
+               printf("\t%4d", dcb_info.tc_queue.tc_rxq[0][i].base);
+       printf("\n  RXQ number :");
+       for (i = 0; i < dcb_info.nb_tcs; i++)
+               printf("\t%4d", dcb_info.tc_queue.tc_rxq[0][i].nb_queue);
+       printf("\n  TXQ base :  ");
+       for (i = 0; i < dcb_info.nb_tcs; i++)
+               printf("\t%4d", dcb_info.tc_queue.tc_txq[0][i].base);
+       printf("\n  TXQ number :");
+       for (i = 0; i < dcb_info.nb_tcs; i++)
+               printf("\t%4d", dcb_info.tc_queue.tc_txq[0][i].nb_queue);
+       printf("\n");
+}
+
+uint8_t *
+open_file(const char *file_path, uint32_t *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 (fd == -1) {
+               printf("%s: Failed to open %s\n", __func__, file_path);
+               return buf;
+       }
+
+       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 = 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) {
+               close(fd);
+               printf("%s: Failed to malloc memory\n", __func__);
+               return buf;
+       }
+
+       ret = read(fd, buf, pkg_size);
+       if (ret < 0) {
+               close(fd);
+               printf("%s: File read operation failed\n", __func__);
+               close_file(buf);
+               return NULL;
+       }
+
+       if (size)
+               *size = pkg_size;
+
+       close(fd);
 
-       printf("rte_eth_dev_set_masks_filter for port_id=%d failed "
-              "diag=%d\n", port_id, diag);
+       return buf;
 }
 
-void 
-set_vf_traffic(portid_t port_id, uint8_t is_rx, uint16_t vf, uint8_t on)
+int
+save_file(const char *file_path, uint8_t *buf, uint32_t size)
 {
-       int diag;
-       
-       if (port_id_is_invalid(port_id))
-               return;
-       if (is_rx)
-               diag = rte_eth_dev_set_vf_rx(port_id,vf,on);
-       else
-               diag = rte_eth_dev_set_vf_tx(port_id,vf,on);
-       if (diag == 0)
-               return;
-       if(is_rx)       
-               printf("rte_eth_dev_set_vf_rx for port_id=%d failed "
-                       "diag=%d\n", port_id, diag);
-       else
-               printf("rte_eth_dev_set_vf_tx for port_id=%d failed "
-                       "diag=%d\n", port_id, diag);
-               
+       FILE *fh = fopen(file_path, "wb");
+
+       if (fh == NULL) {
+               printf("%s: Failed to open %s\n", __func__, file_path);
+               return -1;
+       }
+
+       if (fwrite(buf, 1, size, fh) != size) {
+               fclose(fh);
+               printf("%s: File write operation failed\n", __func__);
+               return -1;
+       }
+
+       fclose(fh);
+
+       return 0;
 }
 
-void
-set_vf_rx_vlan(portid_t port_id, uint16_t vlan_id, uint64_t vf_mask, uint8_t on)
+int
+close_file(uint8_t *buf)
 {
-       int diag;
+       if (buf) {
+               free((void *)buf);
+               return 0;
+       }
 
-       if (port_id_is_invalid(port_id))
-               return;
-       if (vlan_id_is_invalid(vlan_id))
-               return;
-       diag = rte_eth_dev_set_vf_vlan_filter(port_id, vlan_id, vf_mask, on);
-       if (diag == 0)
-               return;
-       printf("rte_eth_dev_set_vf_vlan_filter for port_id=%d failed "
-              "diag=%d\n", port_id, diag);
+       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");
+}