test mbuf attach
[dpdk.git] / app / test-pmd / config.c
index 2356afe..30bee33 100644 (file)
 #include <rte_pmd_bnxt.h>
 #endif
 #include <rte_gro.h>
-#include <rte_config.h>
 
 #include "testpmd.h"
 
+#define ETHDEV_FWVERS_LEN 32
+
+#ifdef CLOCK_MONOTONIC_RAW /* Defined in glibc bits/time.h */
+#define CLOCK_TYPE_ID CLOCK_MONOTONIC_RAW
+#else
+#define CLOCK_TYPE_ID CLOCK_MONOTONIC
+#endif
+
+#define NS_PER_SEC 1E9
+
 static char *flowtype_to_str(uint16_t flow_type);
 
 static const struct {
@@ -74,10 +83,17 @@ static const struct {
 };
 
 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 },
+       { "all", ETH_RSS_ETH | ETH_RSS_VLAN | ETH_RSS_IP | ETH_RSS_TCP |
+               ETH_RSS_UDP | ETH_RSS_SCTP | ETH_RSS_L2_PAYLOAD |
+               ETH_RSS_L2TPV3 | ETH_RSS_ESP | ETH_RSS_AH | ETH_RSS_PFCP |
+               ETH_RSS_GTPU},
        { "none", 0 },
+       { "eth", ETH_RSS_ETH },
+       { "l2-src-only", ETH_RSS_L2_SRC_ONLY },
+       { "l2-dst-only", ETH_RSS_L2_DST_ONLY },
+       { "vlan", ETH_RSS_VLAN },
+       { "s-vlan", ETH_RSS_S_VLAN },
+       { "c-vlan", ETH_RSS_C_VLAN },
        { "ipv4", ETH_RSS_IPV4 },
        { "ipv4-frag", ETH_RSS_FRAG_IPV4 },
        { "ipv4-tcp", ETH_RSS_NONFRAG_IPV4_TCP },
@@ -103,6 +119,22 @@ const struct rss_type_info rss_type_table[] = {
        { "tcp", ETH_RSS_TCP },
        { "sctp", ETH_RSS_SCTP },
        { "tunnel", ETH_RSS_TUNNEL },
+       { "l3-pre32", RTE_ETH_RSS_L3_PRE32 },
+       { "l3-pre40", RTE_ETH_RSS_L3_PRE40 },
+       { "l3-pre48", RTE_ETH_RSS_L3_PRE48 },
+       { "l3-pre56", RTE_ETH_RSS_L3_PRE56 },
+       { "l3-pre64", RTE_ETH_RSS_L3_PRE64 },
+       { "l3-pre96", RTE_ETH_RSS_L3_PRE96 },
+       { "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 },
+       { "l2tpv3", ETH_RSS_L2TPV3 },
+       { "pfcp", ETH_RSS_PFCP },
+       { "pppoe", ETH_RSS_PPPOE },
+       { "gtpu", ETH_RSS_GTPU },
        { NULL, 0 },
 };
 
@@ -121,9 +153,10 @@ nic_stats_display(portid_t port_id)
        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];
+       static uint64_t prev_ns[RTE_MAX_ETHPORTS];
+       struct timespec cur_time;
        uint64_t diff_pkts_rx, diff_pkts_tx, diff_bytes_rx, diff_bytes_tx,
-                                                               diff_cycles;
+                                                               diff_ns;
        uint64_t mpps_rx, mpps_tx, mbps_rx, mbps_tx;
        struct rte_eth_stats stats;
        struct rte_port *port = &ports[port_id];
@@ -180,10 +213,17 @@ 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_ns = 0;
+       if (clock_gettime(CLOCK_TYPE_ID, &cur_time) == 0) {
+               uint64_t ns;
+
+               ns = cur_time.tv_sec * NS_PER_SEC;
+               ns += cur_time.tv_nsec;
+
+               if (prev_ns[port_id] != 0)
+                       diff_ns = ns - prev_ns[port_id];
+               prev_ns[port_id] = ns;
+       }
 
        diff_pkts_rx = (stats.ipackets > prev_pkts_rx[port_id]) ?
                (stats.ipackets - prev_pkts_rx[port_id]) : 0;
@@ -191,10 +231,10 @@ nic_stats_display(portid_t 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;
+       mpps_rx = diff_ns > 0 ?
+               (double)diff_pkts_rx / diff_ns * NS_PER_SEC : 0;
+       mpps_tx = diff_ns > 0 ?
+               (double)diff_pkts_tx / diff_ns * NS_PER_SEC : 0;
 
        diff_bytes_rx = (stats.ibytes > prev_bytes_rx[port_id]) ?
                (stats.ibytes - prev_bytes_rx[port_id]) : 0;
@@ -202,10 +242,10 @@ nic_stats_display(portid_t 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;
+       mbps_rx = diff_ns > 0 ?
+               (double)diff_bytes_rx / diff_ns * NS_PER_SEC : 0;
+       mbps_tx = diff_ns > 0 ?
+               (double)diff_bytes_tx / diff_ns * NS_PER_SEC : 0;
 
        printf("\n  Throughput (since last show)\n");
        printf("  Rx-pps: %12"PRIu64"          Rx-bps: %12"PRIu64"\n  Tx-pps: %12"
@@ -219,11 +259,28 @@ nic_stats_display(portid_t port_id)
 void
 nic_stats_clear(portid_t port_id)
 {
+       int ret;
+
        if (port_id_is_invalid(port_id, ENABLED_WARN)) {
                print_valid_ports();
                return;
        }
-       rte_eth_stats_reset(port_id);
+
+       ret = rte_eth_stats_reset(port_id);
+       if (ret != 0) {
+               printf("%s: Error: failed to reset stats (port %u): %s",
+                      __func__, port_id, strerror(-ret));
+               return;
+       }
+
+       ret = rte_eth_stats_get(port_id, &ports[port_id].stats);
+       if (ret != 0) {
+               if (ret < 0)
+                       ret = -ret;
+               printf("%s: Error: failed to get stats (port %u): %s",
+                      __func__, port_id, strerror(ret));
+               return;
+       }
        printf("\n  NIC statistics for port %d cleared\n", port_id);
 }
 
@@ -234,6 +291,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);
@@ -291,10 +352,25 @@ nic_xstats_clear(portid_t 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));
+               return;
+       }
+
+       ret = rte_eth_stats_get(port_id, &ports[port_id].stats);
+       if (ret != 0) {
+               if (ret < 0)
+                       ret = -ret;
+               printf("%s: Error: failed to get stats (port %u): %s",
                       __func__, port_id, strerror(ret));
+               return;
        }
 }
 
@@ -349,6 +425,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 = "*********************";
@@ -376,12 +453,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 = "*********************";
@@ -405,6 +490,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");
 }
 
@@ -496,6 +588,7 @@ port_infos_display(portid_t port_id)
        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();
@@ -517,6 +610,13 @@ port_infos_display(portid_t port_id)
        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);
@@ -596,6 +696,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)
@@ -950,6 +1052,15 @@ port_offload_cap_display(portid_t port_id)
                        printf("off\n");
        }
 
+       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_SEND_ON_TIMESTAMP) {
+               printf("Tx scheduling on timestamp:    ");
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_SEND_ON_TIMESTAMP)
+                       printf("on\n");
+               else
+                       printf("off\n");
+       }
+
 }
 
 int
@@ -1186,7 +1297,9 @@ 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))
@@ -1202,9 +1315,24 @@ port_mtu_set(portid_t port_id, uint16_t mtu)
                return;
        }
        diag = rte_eth_dev_set_mtu(port_id, mtu);
-       if (diag == 0)
-               return;
-       printf("Set MTU failed. diag=%d\n", diag);
+       if (diag)
+               printf("Set MTU failed. diag=%d\n", diag);
+       else if (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;
+       }
 }
 
 /* Generic flow management functions. */
@@ -1273,7 +1401,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) : "",
@@ -1282,6 +1410,57 @@ port_flow_complain(struct rte_flow_error *error)
        return -err;
 }
 
+static void
+rss_config_display(struct rte_flow_action_rss *rss_conf)
+{
+       uint8_t i;
+
+       if (rss_conf == NULL) {
+               printf("Invalid rule\n");
+               return;
+       }
+
+       printf("RSS:\n"
+              " queues:");
+       if (rss_conf->queue_num == 0)
+               printf(" none");
+       for (i = 0; i < rss_conf->queue_num; i++)
+               printf(" %d", rss_conf->queue[i]);
+       printf("\n");
+
+       printf(" function: ");
+       switch (rss_conf->func) {
+       case RTE_ETH_HASH_FUNCTION_DEFAULT:
+               printf("default\n");
+               break;
+       case RTE_ETH_HASH_FUNCTION_TOEPLITZ:
+               printf("toeplitz\n");
+               break;
+       case RTE_ETH_HASH_FUNCTION_SIMPLE_XOR:
+               printf("simple_xor\n");
+               break;
+       case RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ:
+               printf("symmetric_toeplitz\n");
+               break;
+       default:
+               printf("Unknown function\n");
+               return;
+       }
+
+       printf(" types:\n");
+       if (rss_conf->types == 0) {
+               printf("  none\n");
+               return;
+       }
+       for (i = 0; rss_type_table[i].str; i++) {
+               if ((rss_conf->types &
+                   rss_type_table[i].rss_type) ==
+                   rss_type_table[i].rss_type &&
+                   rss_type_table[i].rss_type != 0)
+                       printf("  %s\n", rss_type_table[i].str);
+       }
+}
+
 /** Validate flow rule. */
 int
 port_flow_validate(portid_t port_id,
@@ -1299,6 +1478,26 @@ port_flow_validate(portid_t port_id,
        return 0;
 }
 
+/** Update age action context by port_flow pointer. */
+void
+update_age_action_context(const struct rte_flow_action *actions,
+                       struct port_flow *pf)
+{
+       struct rte_flow_action_age *age = NULL;
+
+       for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) {
+               switch (actions->type) {
+               case RTE_FLOW_ACTION_TYPE_AGE:
+                       age = (struct rte_flow_action_age *)
+                               (uintptr_t)actions->conf;
+                       age->context = pf;
+                       return;
+               default:
+                       break;
+               }
+       }
+}
+
 /** Create flow rule. */
 int
 port_flow_create(portid_t port_id,
@@ -1309,28 +1508,27 @@ port_flow_create(portid_t port_id,
        struct rte_flow *flow;
        struct rte_port *port;
        struct port_flow *pf;
-       uint32_t id;
+       uint32_t id = 0;
        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);
+       if (!pf)
+               return port_flow_complain(&error);
+       update_age_action_context(actions, pf);
+       /* 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) {
+               free(pf);
                return port_flow_complain(&error);
        }
        pf->next = port->flow_list;
@@ -1411,6 +1609,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,
@@ -1422,6 +1647,7 @@ port_flow_query(portid_t port_id, uint32_t rule,
        const char *name;
        union {
                struct rte_flow_query_count count;
+               struct rte_flow_action_rss rss_conf;
        } query;
        int ret;
 
@@ -1443,6 +1669,7 @@ port_flow_query(portid_t port_id, uint32_t rule,
                return port_flow_complain(&error);
        switch (action->type) {
        case RTE_FLOW_ACTION_TYPE_COUNT:
+       case RTE_FLOW_ACTION_TYPE_RSS:
                break;
        default:
                printf("Cannot query action type %d (%s)\n",
@@ -1467,6 +1694,9 @@ port_flow_query(portid_t port_id, uint32_t rule,
                       query.count.hits,
                       query.count.bytes);
                break;
+       case RTE_FLOW_ACTION_TYPE_RSS:
+               rss_config_display(&query.rss_conf);
+               break;
        default:
                printf("Cannot display result for action type %d (%s)\n",
                       action->type, name);
@@ -1475,6 +1705,73 @@ port_flow_query(portid_t port_id, uint32_t rule,
        return 0;
 }
 
+/** List simply and destroy all aged flows. */
+void
+port_flow_aged(portid_t port_id, uint8_t destroy)
+{
+       void **contexts;
+       int nb_context, total = 0, idx;
+       struct rte_flow_error error;
+       struct port_flow *pf;
+
+       if (port_id_is_invalid(port_id, ENABLED_WARN) ||
+           port_id == (portid_t)RTE_PORT_ALL)
+               return;
+       total = rte_flow_get_aged_flows(port_id, NULL, 0, &error);
+       printf("Port %u total aged flows: %d\n", port_id, total);
+       if (total < 0) {
+               port_flow_complain(&error);
+               return;
+       }
+       if (total == 0)
+               return;
+       contexts = malloc(sizeof(void *) * total);
+       if (contexts == NULL) {
+               printf("Cannot allocate contexts for aged flow\n");
+               return;
+       }
+       printf("ID\tGroup\tPrio\tAttr\n");
+       nb_context = rte_flow_get_aged_flows(port_id, contexts, total, &error);
+       if (nb_context != total) {
+               printf("Port:%d get aged flows count(%d) != total(%d)\n",
+                       port_id, nb_context, total);
+               free(contexts);
+               return;
+       }
+       for (idx = 0; idx < nb_context; idx++) {
+               pf = (struct port_flow *)contexts[idx];
+               if (!pf) {
+                       printf("Error: get Null context in port %u\n", port_id);
+                       continue;
+               }
+               printf("%" PRIu32 "\t%" PRIu32 "\t%" PRIu32 "\t%c%c%c\t\n",
+                      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' : '-');
+       }
+       if (destroy) {
+               int ret;
+               uint32_t flow_id;
+
+               total = 0;
+               printf("\n");
+               for (idx = 0; idx < nb_context; idx++) {
+                       pf = (struct port_flow *)contexts[idx];
+                       if (!pf)
+                               continue;
+                       flow_id = pf->id;
+                       ret = port_flow_destroy(port_id, 1, &flow_id);
+                       if (!ret)
+                               total++;
+               }
+               printf("%d flows be destroyed\n", total);
+       }
+       free(contexts);
+}
+
 /** List flow rules. */
 void
 port_flow_list(portid_t port_id, uint32_t n, const uint32_t group[n])
@@ -2278,55 +2575,6 @@ icmp_echo_config_setup(void)
        }
 }
 
-#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)
 {
@@ -2336,13 +2584,6 @@ fwd_config_setup(void)
                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();
@@ -2365,6 +2606,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";
        }
@@ -2528,6 +2771,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)
 {
@@ -2677,6 +3026,58 @@ set_tx_pkt_segments(unsigned *seg_lengths, unsigned nb_segs)
        tx_pkt_nb_segs = (uint8_t) nb_segs;
 }
 
+void
+show_tx_pkt_times(void)
+{
+       printf("Interburst gap: %u\n", tx_pkt_times_inter);
+       printf("Intraburst gap: %u\n", tx_pkt_times_intra);
+}
+
+void
+set_tx_pkt_times(unsigned int *tx_times)
+{
+       uint16_t port_id;
+       int offload_found = 0;
+       int offset;
+       int flag;
+
+       static const struct rte_mbuf_dynfield desc_offs = {
+               .name = RTE_MBUF_DYNFIELD_TIMESTAMP_NAME,
+               .size = sizeof(uint64_t),
+               .align = __alignof__(uint64_t),
+       };
+       static const struct rte_mbuf_dynflag desc_flag = {
+               .name = RTE_MBUF_DYNFLAG_TX_TIMESTAMP_NAME,
+       };
+
+       RTE_ETH_FOREACH_DEV(port_id) {
+               struct rte_eth_dev_info dev_info = { 0 };
+               int ret;
+
+               ret = rte_eth_dev_info_get(port_id, &dev_info);
+               if (ret == 0 && dev_info.tx_offload_capa &
+                               DEV_TX_OFFLOAD_SEND_ON_TIMESTAMP) {
+                       offload_found = 1;
+                       break;
+               }
+       }
+       if (!offload_found) {
+               printf("No device supporting Tx timestamp scheduling found, "
+                      "dynamic flag and field not registered\n");
+               return;
+       }
+       offset = rte_mbuf_dynfield_register(&desc_offs);
+       if (offset < 0 && rte_errno != EEXIST)
+               printf("Dynamic timestamp field registration error: %d",
+                      rte_errno);
+       flag = rte_mbuf_dynflag_register(&desc_flag);
+       if (flag < 0 && rte_errno != EEXIST)
+               printf("Dynamic timestamp flag registration error: %d",
+                      rte_errno);
+       tx_pkt_times_inter = tx_times[0];
+       tx_pkt_times_intra = tx_times[1];
+}
+
 void
 setup_gro(const char *onoff, portid_t port_id)
 {
@@ -3412,30 +3813,65 @@ print_fdir_flow_type(uint32_t flow_types_mask)
        printf("\n");
 }
 
+static int
+get_fdir_info(portid_t port_id, struct rte_eth_fdir_info *fdir_info,
+                   struct rte_eth_fdir_stats *fdir_stat)
+{
+       int ret;
+
+       ret = rte_eth_dev_filter_supported(port_id, RTE_ETH_FILTER_FDIR);
+       if (!ret) {
+               rte_eth_dev_filter_ctrl(port_id, RTE_ETH_FILTER_FDIR,
+                              RTE_ETH_FILTER_INFO, fdir_info);
+               rte_eth_dev_filter_ctrl(port_id, RTE_ETH_FILTER_FDIR,
+                              RTE_ETH_FILTER_STATS, fdir_stat);
+               return 0;
+       }
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       if (ret == -ENOTSUP) {
+               ret = rte_pmd_i40e_get_fdir_info(port_id, fdir_info);
+               if (!ret)
+                       ret = rte_pmd_i40e_get_fdir_stats(port_id, fdir_stat);
+       }
+#endif
+#ifdef RTE_LIBRTE_IXGBE_PMD
+       if (ret == -ENOTSUP) {
+               ret = rte_pmd_ixgbe_get_fdir_info(port_id, fdir_info);
+               if (!ret)
+                       ret = rte_pmd_ixgbe_get_fdir_stats(port_id, fdir_stat);
+       }
+#endif
+       switch (ret) {
+       case 0:
+               break;
+       case -ENOTSUP:
+               printf("\n FDIR is not supported on port %-2d\n",
+                       port_id);
+               break;
+       default:
+               printf("programming error: (%s)\n", strerror(-ret));
+               break;
+       }
+       return ret;
+}
+
 void
 fdir_get_infos(portid_t port_id)
 {
        struct rte_eth_fdir_stats fdir_stat;
        struct rte_eth_fdir_info fdir_info;
-       int ret;
 
        static const char *fdir_stats_border = "########################";
 
        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;
-       }
 
        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);
+       if (get_fdir_info(port_id, &fdir_info, &fdir_stat))
+               return;
+
        printf("\n  %s FDIR infos for port %-2d     %s\n",
               fdir_stats_border, port_id, fdir_stats_border);
        printf("  MODE: ");
@@ -3677,6 +4113,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)
 {
@@ -3695,7 +4139,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;
@@ -3704,10 +4148,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
@@ -3732,10 +4177,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
@@ -3762,7 +4207,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
@@ -3935,3 +4382,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);
+       }
+}