app/testpmd: handle RSS offload types ESP and AH
[dpdk.git] / app / test-pmd / config.c
index 1a5a5c1..69c5633 100644 (file)
 #include <rte_pmd_bnxt.h>
 #endif
 #include <rte_gro.h>
-#include <rte_config.h>
 
 #include "testpmd.h"
 
+#define ETHDEV_FWVERS_LEN 32
+
 static char *flowtype_to_str(uint16_t flow_type);
 
 static const struct {
@@ -103,6 +104,12 @@ const struct rss_type_info rss_type_table[] = {
        { "tcp", ETH_RSS_TCP },
        { "sctp", ETH_RSS_SCTP },
        { "tunnel", ETH_RSS_TUNNEL },
+       { "l3-src-only", ETH_RSS_L3_SRC_ONLY },
+       { "l3-dst-only", ETH_RSS_L3_DST_ONLY },
+       { "l4-src-only", ETH_RSS_L4_SRC_ONLY },
+       { "l4-dst-only", ETH_RSS_L4_DST_ONLY },
+       { "esp", ETH_RSS_ESP },
+       { "ah", ETH_RSS_AH },
        { NULL, 0 },
 };
 
@@ -119,9 +126,12 @@ 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_bytes_rx[RTE_MAX_ETHPORTS];
+       static uint64_t prev_bytes_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;
+       uint64_t diff_pkts_rx, diff_pkts_tx, diff_bytes_rx, diff_bytes_tx,
+                                                               diff_cycles;
+       uint64_t mpps_rx, mpps_tx, mbps_rx, mbps_tx;
        struct rte_eth_stats stats;
        struct rte_port *port = &ports[port_id];
        uint8_t i;
@@ -192,9 +202,22 @@ nic_stats_display(portid_t port_id)
                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;
+
+       diff_bytes_rx = (stats.ibytes > prev_bytes_rx[port_id]) ?
+               (stats.ibytes - prev_bytes_rx[port_id]) : 0;
+       diff_bytes_tx = (stats.obytes > prev_bytes_tx[port_id]) ?
+               (stats.obytes - prev_bytes_tx[port_id]) : 0;
+       prev_bytes_rx[port_id] = stats.ibytes;
+       prev_bytes_tx[port_id] = stats.obytes;
+       mbps_rx = diff_cycles > 0 ?
+               diff_bytes_rx * rte_get_tsc_hz() / diff_cycles : 0;
+       mbps_tx = diff_cycles > 0 ?
+               diff_bytes_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("  Rx-pps: %12"PRIu64"          Rx-bps: %12"PRIu64"\n  Tx-pps: %12"
+              PRIu64"          Tx-bps: %12"PRIu64"\n", mpps_rx, mbps_rx * 8,
+              mpps_tx, mbps_tx * 8);
 
        printf("  %s############################%s\n",
               nic_stats_border, nic_stats_border);
@@ -218,6 +241,10 @@ nic_xstats_display(portid_t port_id)
        int cnt_xstats, idx_xstat;
        struct rte_eth_xstat_name *xstats_names;
 
+       if (port_id_is_invalid(port_id, ENABLED_WARN)) {
+               print_valid_ports();
+               return;
+       }
        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);
@@ -273,7 +300,17 @@ nic_xstats_display(portid_t port_id)
 void
 nic_xstats_clear(portid_t port_id)
 {
-       rte_eth_xstats_reset(port_id);
+       int ret;
+
+       if (port_id_is_invalid(port_id, ENABLED_WARN)) {
+               print_valid_ports();
+               return;
+       }
+       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
@@ -327,6 +364,7 @@ nic_stats_mapping_display(portid_t port_id)
 void
 rx_queue_infos_display(portid_t port_id, uint16_t queue_id)
 {
+       struct rte_eth_burst_mode mode;
        struct rte_eth_rxq_info qinfo;
        int32_t rc;
        static const char *info_border = "*********************";
@@ -354,12 +392,20 @@ rx_queue_infos_display(portid_t port_id, uint16_t queue_id)
        printf("\nRX scattered packets: %s",
                (qinfo.scattered_rx != 0) ? "on" : "off");
        printf("\nNumber of RXDs: %hu", qinfo.nb_desc);
+
+       if (rte_eth_rx_burst_mode_get(port_id, queue_id, &mode) == 0)
+               printf("\nBurst mode: %s%s",
+                      mode.info,
+                      mode.flags & RTE_ETH_BURST_FLAG_PER_QUEUE ?
+                               " (per queue)" : "");
+
        printf("\n");
 }
 
 void
 tx_queue_infos_display(portid_t port_id, uint16_t queue_id)
 {
+       struct rte_eth_burst_mode mode;
        struct rte_eth_txq_info qinfo;
        int32_t rc;
        static const char *info_border = "*********************";
@@ -383,6 +429,13 @@ tx_queue_infos_display(portid_t port_id, uint16_t queue_id)
        printf("\nTX deferred start: %s",
                (qinfo.conf.tx_deferred_start != 0) ? "on" : "off");
        printf("\nNumber of TXDs: %hu", qinfo.nb_desc);
+
+       if (rte_eth_tx_burst_mode_get(port_id, queue_id, &mode) == 0)
+               printf("\nBurst mode: %s%s",
+                      mode.info,
+                      mode.flags & RTE_ETH_BURST_FLAG_PER_QUEUE ?
+                               " (per queue)" : "");
+
        printf("\n");
 }
 
@@ -448,9 +501,11 @@ skip_parse:
 
                        /* List ports with matching device name */
                        RTE_ETH_FOREACH_DEV_OF(port_id, dev) {
-                               rte_eth_macaddr_get(port_id, &mac_addr);
                                printf("\n\tPort id: %-2d", port_id);
-                               print_ethaddr("\n\tMAC address: ", &mac_addr);
+                               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");
@@ -471,22 +526,36 @@ port_infos_display(portid_t port_id)
        static const char *info_border = "*********************";
        uint16_t mtu;
        char name[RTE_ETH_NAME_MAX_LEN];
+       int ret;
+       char fw_version[ETHDEV_FWVERS_LEN];
 
        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);
-       memset(&dev_info, 0, sizeof(dev_info));
-       rte_eth_dev_info_get(port_id, &dev_info);
+       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);
-       rte_eth_macaddr_get(port_id, &mac_addr);
-       print_ethaddr("MAC address: ", &mac_addr);
+       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 (rte_eth_dev_fw_version_get(port_id, fw_version,
+                                               ETHDEV_FWVERS_LEN) == 0)
+               printf("\nFirmware-version: %s", fw_version);
+       else
+               printf("\nFirmware-version: %s", "not available");
+
        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);
@@ -520,19 +589,24 @@ port_infos_display(portid_t port_id)
        if (vlan_offload >= 0){
                printf("VLAN offload: \n");
                if (vlan_offload & ETH_VLAN_STRIP_OFFLOAD)
-                       printf("  strip on \n");
+                       printf("  strip on");
                else
-                       printf("  strip off \n");
+                       printf("  strip off");
 
                if (vlan_offload & ETH_VLAN_FILTER_OFFLOAD)
-                       printf("  filter on \n");
+                       printf("filter on, ");
                else
-                       printf("  filter off \n");
+                       printf("filter off, ");
 
                if (vlan_offload & ETH_VLAN_EXTEND_OFFLOAD)
-                       printf("  qinq(extend) on \n");
+                       printf("extend on, ");
+               else
+                       printf("extend off, ");
+
+               if (vlan_offload & ETH_QINQ_STRIP_OFFLOAD)
+                       printf("qinq strip on\n");
                else
-                       printf("  qinq(extend) off \n");
+                       printf("qinq strip off\n");
        }
 
        if (dev_info.hash_key_size > 0)
@@ -561,6 +635,8 @@ port_infos_display(portid_t port_id)
        printf("Minimum size of RX buffer: %u\n", dev_info.min_rx_bufsize);
        printf("Maximum configurable length of RX packet: %u\n",
                dev_info.max_rx_pktlen);
+       printf("Maximum configurable size of LRO aggregated packet: %u\n",
+               dev_info.max_lro_pkt_size);
        if (dev_info.max_vfs)
                printf("Maximum number of VFs: %u\n", dev_info.max_vfs);
        if (dev_info.max_vmdq_pools)
@@ -618,16 +694,25 @@ port_summary_display(portid_t port_id)
        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;
        }
 
-       rte_eth_link_get_nowait(port_id, &link);
-       rte_eth_dev_info_get(port_id, &dev_info);
+       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);
-       rte_eth_macaddr_get(port_id, &mac_addr);
+       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],
@@ -642,11 +727,14 @@ 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;
 
-       rte_eth_dev_info_get(port_id, &dev_info);
+       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);
@@ -1139,19 +1227,43 @@ void
 port_mtu_set(portid_t port_id, uint16_t mtu)
 {
        int diag;
+       struct rte_port *rte_port = &ports[port_id];
        struct rte_eth_dev_info dev_info;
+       uint16_t eth_overhead;
+       int ret;
 
        if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
-       rte_eth_dev_info_get(port_id, &dev_info);
+
+       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)
+       if (diag == 0 &&
+           dev_info.rx_offload_capa & DEV_RX_OFFLOAD_JUMBO_FRAME) {
+               /*
+                * Ether overhead in driver is equal to the difference of
+                * max_rx_pktlen and max_mtu in rte_eth_dev_info when the
+                * device supports jumbo frame.
+                */
+               eth_overhead = dev_info.max_rx_pktlen - dev_info.max_mtu;
+               if (mtu > RTE_ETHER_MAX_LEN - eth_overhead) {
+                       rte_port->dev_conf.rxmode.offloads |=
+                                               DEV_RX_OFFLOAD_JUMBO_FRAME;
+                       rte_port->dev_conf.rxmode.max_rx_pkt_len =
+                                               mtu + eth_overhead;
+               } else
+                       rte_port->dev_conf.rxmode.offloads &=
+                                               ~DEV_RX_OFFLOAD_JUMBO_FRAME;
+
                return;
+       }
        printf("Set MTU failed. diag=%d\n", diag);
 }
 
@@ -1221,7 +1333,7 @@ port_flow_complain(struct rte_flow_error *error)
                errstr = "unknown type";
        else
                errstr = errstrlist[error->type];
-       printf("Caught error type %d (%s): %s%s: %s\n",
+       printf("%s(): Caught PMD error type %d (%s): %s%s: %s\n", __func__,
               error->type, errstr,
               error->cause ? (snprintf(buf, sizeof(buf), "cause: %p, ",
                                        error->cause), buf) : "",
@@ -1359,6 +1471,33 @@ port_flow_flush(portid_t port_id)
        return ret;
 }
 
+/** Dump all flow rules. */
+int
+port_flow_dump(portid_t port_id, const char *file_name)
+{
+       int ret = 0;
+       FILE *file = stdout;
+       struct rte_flow_error error;
+
+       if (file_name && strlen(file_name)) {
+               file = fopen(file_name, "w");
+               if (!file) {
+                       printf("Failed to create file %s: %s\n", file_name,
+                              strerror(errno));
+                       return -errno;
+               }
+       }
+       ret = rte_flow_dev_dump(port_id, file, &error);
+       if (ret) {
+               port_flow_complain(&error);
+               printf("Failed to dump flow: %s\n", strerror(-ret));
+       } else
+               printf("Flow dump finished\n");
+       if (file_name && strlen(file_name))
+               fclose(file);
+       return ret;
+}
+
 /** Query a flow rule. */
 int
 port_flow_query(portid_t port_id, uint32_t rule,
@@ -1621,10 +1760,13 @@ ring_rx_descriptor_display(const struct rte_memzone *ring_mz,
        struct igb_ring_desc_16_bytes *ring =
                (struct igb_ring_desc_16_bytes *)ring_mz->addr;
 #ifndef RTE_LIBRTE_I40E_16BYTE_RX_DESC
+       int ret;
        struct rte_eth_dev_info dev_info;
 
-       memset(&dev_info, 0, sizeof(dev_info));
-       rte_eth_dev_info_get(port_id, &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 =
@@ -1834,11 +1976,15 @@ port_rss_hash_conf_show(portid_t port_id, int show_rss_key)
        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;
 
-       rte_eth_dev_info_get(port_id, &dev_info);
+       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;
@@ -2306,6 +2452,8 @@ mp_alloc_to_str(uint8_t mode)
                return "xmem";
        case MP_ALLOC_XMEM_HUGE:
                return "xmemhuge";
+       case MP_ALLOC_XBUF:
+               return "xbuf";
        default:
                return "invalid";
        }
@@ -2469,6 +2617,112 @@ set_fwd_ports_list(unsigned int *portlist, unsigned int nb_pt)
        }
 }
 
+/**
+ * Parse the user input and obtain the list of forwarding ports
+ *
+ * @param[in] list
+ *   String containing the user input. User can specify
+ *   in these formats 1,3,5 or 1-3 or 1-2,5 or 3,5-6.
+ *   For example, if the user wants to use all the available
+ *   4 ports in his system, then the input can be 0-3 or 0,1,2,3.
+ *   If the user wants to use only the ports 1,2 then the input
+ *   is 1,2.
+ *   valid characters are '-' and ','
+ * @param[out] values
+ *   This array will be filled with a list of port IDs
+ *   based on the user input
+ *   Note that duplicate entries are discarded and only the first
+ *   count entries in this array are port IDs and all the rest
+ *   will contain default values
+ * @param[in] maxsize
+ *   This parameter denotes 2 things
+ *   1) Number of elements in the values array
+ *   2) Maximum value of each element in the values array
+ * @return
+ *   On success, returns total count of parsed port IDs
+ *   On failure, returns 0
+ */
+static unsigned int
+parse_port_list(const char *list, unsigned int *values, unsigned int maxsize)
+{
+       unsigned int count = 0;
+       char *end = NULL;
+       int min, max;
+       int value, i;
+       unsigned int marked[maxsize];
+
+       if (list == NULL || values == NULL)
+               return 0;
+
+       for (i = 0; i < (int)maxsize; i++)
+               marked[i] = 0;
+
+       min = INT_MAX;
+
+       do {
+               /*Remove the blank spaces if any*/
+               while (isblank(*list))
+                       list++;
+               if (*list == '\0')
+                       break;
+               errno = 0;
+               value = strtol(list, &end, 10);
+               if (errno || end == NULL)
+                       return 0;
+               if (value < 0 || value >= (int)maxsize)
+                       return 0;
+               while (isblank(*end))
+                       end++;
+               if (*end == '-' && min == INT_MAX) {
+                       min = value;
+               } else if ((*end == ',') || (*end == '\0')) {
+                       max = value;
+                       if (min == INT_MAX)
+                               min = value;
+                       for (i = min; i <= max; i++) {
+                               if (count < maxsize) {
+                                       if (marked[i])
+                                               continue;
+                                       values[count] = i;
+                                       marked[i] = 1;
+                                       count++;
+                               }
+                       }
+                       min = INT_MAX;
+               } else
+                       return 0;
+               list = end + 1;
+       } while (*end != '\0');
+
+       return count;
+}
+
+void
+parse_fwd_portlist(const char *portlist)
+{
+       unsigned int portcount;
+       unsigned int portindex[RTE_MAX_ETHPORTS];
+       unsigned int i, valid_port_count = 0;
+
+       portcount = parse_port_list(portlist, portindex, RTE_MAX_ETHPORTS);
+       if (!portcount)
+               rte_exit(EXIT_FAILURE, "Invalid fwd port list\n");
+
+       /*
+        * Here we verify the validity of the ports
+        * and thereby calculate the total number of
+        * valid ports
+        */
+       for (i = 0; i < portcount && i < RTE_DIM(portindex); i++) {
+               if (rte_eth_dev_is_valid_port(portindex[i])) {
+                       portindex[valid_port_count] = portindex[i];
+                       valid_port_count++;
+               }
+       }
+
+       set_fwd_ports_list(portindex, valid_port_count);
+}
+
 void
 set_fwd_ports_mask(uint64_t portmask)
 {
@@ -2796,11 +3050,15 @@ 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;
 
-       rte_eth_dev_info_get(portid, &dev_info);
+       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] =
@@ -2813,10 +3071,15 @@ 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;
-       rte_eth_dev_info_get(portid, &dev_info);
+
+       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] =
@@ -2829,10 +3092,15 @@ 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;
-       rte_eth_dev_info_get(portid, &dev_info);
+
+       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,
@@ -2846,10 +3114,15 @@ 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;
-       rte_eth_dev_info_get(portid, &dev_info);
+
+       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,
@@ -2985,6 +3258,33 @@ rx_vlan_filter_set(portid_t port_id, int on)
        ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads;
 }
 
+void
+rx_vlan_qinq_strip_set(portid_t port_id, int on)
+{
+       int diag;
+       int vlan_offload;
+       uint64_t port_rx_offloads = ports[port_id].dev_conf.rxmode.offloads;
+
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
+               return;
+
+       vlan_offload = rte_eth_dev_get_vlan_offload(port_id);
+
+       if (on) {
+               vlan_offload |= ETH_QINQ_STRIP_OFFLOAD;
+               port_rx_offloads |= DEV_RX_OFFLOAD_QINQ_STRIP;
+       } else {
+               vlan_offload &= ~ETH_QINQ_STRIP_OFFLOAD;
+               port_rx_offloads &= ~DEV_RX_OFFLOAD_QINQ_STRIP;
+       }
+
+       diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload);
+       if (diag < 0)
+               printf("%s(port_pi=%d, on=%d) failed "
+              "diag=%d\n", __func__, port_id, on, diag);
+       ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads;
+}
+
 int
 rx_vft_set(portid_t port_id, uint16_t vlan_id, int on)
 {
@@ -3037,6 +3337,7 @@ void
 tx_vlan_set(portid_t port_id, uint16_t vlan_id)
 {
        struct rte_eth_dev_info dev_info;
+       int ret;
 
        if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
@@ -3048,7 +3349,11 @@ tx_vlan_set(portid_t port_id, uint16_t vlan_id)
                printf("Error, as QinQ has been enabled.\n");
                return;
        }
-       rte_eth_dev_info_get(port_id, &dev_info);
+
+       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);
@@ -3064,6 +3369,7 @@ 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;
@@ -3072,7 +3378,10 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer)
        if (vlan_id_is_invalid(vlan_id_outer))
                return;
 
-       rte_eth_dev_info_get(port_id, &dev_info);
+       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);
@@ -3463,10 +3772,13 @@ 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;
-       rte_eth_link_get_nowait(port_id, &link);
+       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);
@@ -3560,6 +3872,14 @@ mcast_addr_pool_extend(struct rte_port *port)
 
 }
 
+static void
+mcast_addr_pool_append(struct rte_port *port, struct rte_ether_addr *mc_addr)
+{
+       if (mcast_addr_pool_extend(port) != 0)
+               return;
+       rte_ether_addr_copy(mc_addr, &port->mc_addr_pool[port->mc_addr_nb - 1]);
+}
+
 static void
 mcast_addr_pool_remove(struct rte_port *port, uint32_t addr_idx)
 {
@@ -3578,7 +3898,7 @@ mcast_addr_pool_remove(struct rte_port *port, uint32_t addr_idx)
                sizeof(struct rte_ether_addr) * (port->mc_addr_nb - addr_idx));
 }
 
-static void
+static int
 eth_port_multicast_addr_list_set(portid_t port_id)
 {
        struct rte_port *port;
@@ -3587,10 +3907,11 @@ eth_port_multicast_addr_list_set(portid_t port_id)
        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_set_mc_addr_list(port=%d, nb=%u) failed. diag=%d\n",
-              port->mc_addr_nb, port_id, -diag);
+       if (diag < 0)
+               printf("rte_eth_dev_set_mc_addr_list(port=%d, nb=%u) failed. diag=%d\n",
+                       port_id, port->mc_addr_nb, diag);
+
+       return diag;
 }
 
 void
@@ -3615,10 +3936,10 @@ mcast_addr_add(portid_t port_id, struct rte_ether_addr *mc_addr)
                }
        }
 
-       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);
+       mcast_addr_pool_append(port, mc_addr);
+       if (eth_port_multicast_addr_list_set(port_id) < 0)
+               /* Rollback on failure, remove the address from the pool */
+               mcast_addr_pool_remove(port, i);
 }
 
 void
@@ -3645,7 +3966,9 @@ mcast_addr_remove(portid_t port_id, struct rte_ether_addr *mc_addr)
        }
 
        mcast_addr_pool_remove(port, i);
-       eth_port_multicast_addr_list_set(port_id);
+       if (eth_port_multicast_addr_list_set(port_id) < 0)
+               /* Rollback on failure, add the address back into the pool */
+               mcast_addr_pool_append(port, mc_addr);
 }
 
 void
@@ -3818,3 +4141,60 @@ port_queue_region_info_display(portid_t port_id, void *buf)
 
        printf("\n\n");
 }
+
+void
+show_macs(portid_t port_id)
+{
+       char buf[RTE_ETHER_ADDR_FMT_SIZE];
+       struct rte_eth_dev_info dev_info;
+       struct rte_ether_addr *addr;
+       uint32_t i, num_macs = 0;
+       struct rte_eth_dev *dev;
+
+       dev = &rte_eth_devices[port_id];
+
+       rte_eth_dev_info_get(port_id, &dev_info);
+
+       for (i = 0; i < dev_info.max_mac_addrs; i++) {
+               addr = &dev->data->mac_addrs[i];
+
+               /* skip zero address */
+               if (rte_is_zero_ether_addr(addr))
+                       continue;
+
+               num_macs++;
+       }
+
+       printf("Number of MAC address added: %d\n", num_macs);
+
+       for (i = 0; i < dev_info.max_mac_addrs; i++) {
+               addr = &dev->data->mac_addrs[i];
+
+               /* skip zero address */
+               if (rte_is_zero_ether_addr(addr))
+                       continue;
+
+               rte_ether_format_addr(buf, RTE_ETHER_ADDR_FMT_SIZE, addr);
+               printf("  %s\n", buf);
+       }
+}
+
+void
+show_mcast_macs(portid_t port_id)
+{
+       char buf[RTE_ETHER_ADDR_FMT_SIZE];
+       struct rte_ether_addr *addr;
+       struct rte_port *port;
+       uint32_t i;
+
+       port = &ports[port_id];
+
+       printf("Number of Multicast MAC address added: %d\n", port->mc_addr_nb);
+
+       for (i = 0; i < port->mc_addr_nb; i++) {
+               addr = &port->mc_addr_pool[i];
+
+               rte_ether_format_addr(buf, RTE_ETHER_ADDR_FMT_SIZE, addr);
+               printf("  %s\n", buf);
+       }
+}