net: add rte prefix to ether defines
[dpdk.git] / app / test-pmd / parameters.c
index 4bca0b0..245b610 100644 (file)
@@ -1,34 +1,5 @@
-/*-
- *   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.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #include <errno.h>
@@ -41,7 +12,6 @@
 #include <time.h>
 #include <fcntl.h>
 #include <sys/types.h>
-#include <errno.h>
 
 #include <sys/queue.h>
 #include <sys/stat.h>
@@ -49,6 +19,7 @@
 #include <stdint.h>
 #include <unistd.h>
 #include <inttypes.h>
+#include <arpa/inet.h>
 
 #include <rte_common.h>
 #include <rte_byteorder.h>
 #include <rte_debug.h>
 #include <rte_cycles.h>
 #include <rte_memory.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_interrupts.h>
 #include <rte_pci.h>
 #include <cmdline_parse.h>
 #include <cmdline_parse_etheraddr.h>
 #endif
+#ifdef RTE_LIBRTE_PMD_BOND
+#include <rte_eth_bond.h>
+#endif
+#include <rte_flow.h>
 
 #include "testpmd.h"
 
@@ -84,27 +56,35 @@ usage(char* progname)
        printf("usage: %s "
 #ifdef RTE_LIBRTE_CMDLINE
               "[--interactive|-i] "
+              "[--cmdline-file=FILENAME] "
 #endif
               "[--help|-h] | [--auto-start|-a] | ["
+              "--tx-first | --stats-period=PERIOD | "
               "--coremask=COREMASK --portmask=PORTMASK --numa "
               "--mbuf-size= | --total-num-mbufs= | "
               "--nb-cores= | --nb-ports= | "
 #ifdef RTE_LIBRTE_CMDLINE
               "--eth-peers-configfile= | "
               "--eth-peer=X,M:M:M:M:M:M | "
+              "--tx-ip=SRC,DST | --tx-udp=PORT | "
 #endif
               "--pkt-filter-mode= |"
               "--rss-ip | --rss-udp | "
               "--rxpt= | --rxht= | --rxwt= | --rxfreet= | "
               "--txpt= | --txht= | --txwt= | --txfreet= | "
-              "--txrst= | --txqflags= ]\n",
+              "--txrst= | --tx-offloads= | --vxlan-gpe-port= ]\n",
               progname);
 #ifdef RTE_LIBRTE_CMDLINE
        printf("  --interactive: run in interactive mode.\n");
+       printf("  --cmdline-file: execute cli commands before startup.\n");
 #endif
        printf("  --auto-start: start forwarding on init "
               "[always when non-interactive].\n");
        printf("  --help: display this message and quit.\n");
+       printf("  --tx-first: start forwarding sending a burst first "
+              "(only if interactive is disabled).\n");
+       printf("  --stats-period=PERIOD: statistics will be shown "
+              "every PERIOD seconds (only if interactive is disabled).\n");
        printf("  --nb-cores=N: set the number of forwarding cores "
               "(1 <= N <= %d).\n", nb_lcores);
        printf("  --nb-ports=N: set the number of forwarding ports "
@@ -142,18 +122,23 @@ usage(char* progname)
               "(N: none  or match (default) or always).\n");
        printf("  --pkt-filter-size=N: set Flow Director mode "
               "(N: 64K (default mode) or 128K or 256K).\n");
-       printf("  --pkt-filter-flexbytes-offset=N: set flexbytes-offset. "
-              "The offset is defined in word units counted from the "
-              "first byte of the destination Ethernet MAC address. "
-              "0 <= N <= 32.\n");
        printf("  --pkt-filter-drop-queue=N: set drop-queue. "
               "In perfect mode, when you add a rule with queue = -1 "
               "the packet will be enqueued into the rx drop-queue. "
               "If the drop-queue doesn't exist, the packet is dropped. "
               "By default drop-queue=127.\n");
-       printf("  --crc-strip: enable CRC stripping by hardware.\n");
+#ifdef RTE_LIBRTE_LATENCY_STATS
+       printf("  --latencystats=N: enable latency and jitter statistcs "
+              "monitoring on forwarding lcore id N.\n");
+#endif
+       printf("  --disable-crc-strip: disable CRC stripping by hardware.\n");
+       printf("  --enable-lro: enable large receive offload.\n");
        printf("  --enable-rx-cksum: enable rx hardware checksum offload.\n");
-       printf("  --disable-hw-vlan: disable hardware vlan.\n");
+       printf("  --enable-rx-timestamp: enable rx hardware timestamp offload.\n");
+       printf("  --enable-hw-vlan: enable hardware vlan.\n");
+       printf("  --enable-hw-vlan-filter: enable hardware vlan filter.\n");
+       printf("  --enable-hw-vlan-strip: enable hardware vlan strip.\n");
+       printf("  --enable-hw-vlan-extend: enable hardware vlan extend.\n");
        printf("  --enable-drop-en: enable per queue packet drop.\n");
        printf("  --disable-rss: disable rss.\n");
        printf("  --port-topology=N: set port topology (N: paired (default) or "
@@ -168,26 +153,18 @@ usage(char* progname)
        printf("  --txd=N: set the number of descriptors in TX rings to N.\n");
        printf("  --burst=N: set the number of packets per burst to N.\n");
        printf("  --mbcache=N: set the cache of mbuf memory pool to N.\n");
-       printf("  --rxpt=N: set prefetch threshold register of RX rings to N "
-              "(0 <= N <= 16).\n");
-       printf("  --rxht=N: set the host threshold register of RX rings to N "
-              "(0 <= N <= 16).\n");
+       printf("  --rxpt=N: set prefetch threshold register of RX rings to N.\n");
+       printf("  --rxht=N: set the host threshold register of RX rings to N.\n");
        printf("  --rxfreet=N: set the free threshold of RX descriptors to N "
               "(0 <= N < value of rxd).\n");
-       printf("  --rxwt=N: set the write-back threshold register of RX rings "
-              "to N (0 <= N <= 16).\n");
-       printf("  --txpt=N: set the prefetch threshold register of TX rings "
-              "to N (0 <= N <= 16).\n");
-       printf("  --txht=N: set the nhost threshold register of TX rings to N "
-              "(0 <= N <= 16).\n");
-       printf("  --txwt=N: set the write-back threshold register of TX rings "
-              "to N (0 <= N <= 16).\n");
+       printf("  --rxwt=N: set the write-back threshold register of RX rings to N.\n");
+       printf("  --txpt=N: set the prefetch threshold register of TX rings to N.\n");
+       printf("  --txht=N: set the nhost threshold register of TX rings to N.\n");
+       printf("  --txwt=N: set the write-back threshold register of TX rings to N.\n");
        printf("  --txfreet=N: set the transmit free threshold of TX rings to N "
               "(0 <= N <= value of txd).\n");
        printf("  --txrst=N: set the transmit RS bit threshold of TX rings to N "
               "(0 <= N <= value of txd).\n");
-       printf("  --txqflags=0xXXXXXXXX: hexadecimal bitmask of TX queue flags "
-              "(0 <= N <= 0x7FFFFFFF).\n");
        printf("  --tx-queue-stats-mapping=(port,queue,mapping)[,(port,queue,mapping]: "
               "tx queues statistics counters mapping "
               "(0 <= mapping <= %d).\n", RTE_ETHDEV_QUEUE_STAT_CNTRS - 1);
@@ -196,9 +173,39 @@ usage(char* progname)
               "(0 <= mapping <= %d).\n", RTE_ETHDEV_QUEUE_STAT_CNTRS - 1);
        printf("  --no-flush-rx: Don't flush RX streams before forwarding."
               " Used mainly with PCAP drivers.\n");
-       printf("  --txpkts=X[,Y]*: set TX segment sizes.\n");
+       printf("  --txpkts=X[,Y]*: set TX segment sizes"
+               " or total packet length.\n");
+       printf("  --txonly-multi-flow: generate multiple flows in txonly mode\n");
        printf("  --disable-link-check: disable check on link status when "
               "starting/stopping ports.\n");
+       printf("  --no-lsc-interrupt: disable link status change interrupt.\n");
+       printf("  --no-rmv-interrupt: disable device removal interrupt.\n");
+       printf("  --bitrate-stats=N: set the logical core N to perform "
+               "bit-rate calculation.\n");
+       printf("  --print-event <unknown|intr_lsc|queue_state|intr_reset|vf_mbox|macsec|intr_rmv|all>: "
+              "enable print of designated event or all of them.\n");
+       printf("  --mask-event <unknown|intr_lsc|queue_state|intr_reset|vf_mbox|macsec|intr_rmv|all>: "
+              "disable print of designated event or all of them.\n");
+       printf("  --flow-isolate-all: "
+              "requests flow API isolated mode on all ports at initialization time.\n");
+       printf("  --tx-offloads=0xXXXXXXXX: hexadecimal bitmask of TX queue offloads\n");
+       printf("  --hot-plug: enable hot plug for device.\n");
+       printf("  --vxlan-gpe-port=N: UPD port of tunnel VXLAN-GPE\n");
+       printf("  --mlockall: lock all memory\n");
+       printf("  --no-mlockall: do not lock all memory\n");
+       printf("  --mp-alloc <native|anon|xmem|xmemhuge>: mempool allocation method.\n"
+              "    native: use regular DPDK memory to create and populate mempool\n"
+              "    anon: use regular DPDK memory to create and anonymous memory to populate mempool\n"
+              "    xmem: use anonymous memory to create and populate mempool\n"
+              "    xmemhuge: use anonymous hugepage memory to create and populate mempool\n");
+       printf("  --noisy-tx-sw-buffer-size=N: size of FIFO buffer\n");
+       printf("  --noisy-tx-sw-buffer-flushtime=N: flush FIFO after N ms\n");
+       printf("  --noisy-lkup-memory=N: allocate N MB of VNF memory\n");
+       printf("  --noisy-lkup-num-writes=N: do N random writes per packet\n");
+       printf("  --noisy-lkup-num-reads=N: do N random reads per packet\n");
+       printf("  --noisy-lkup-num-writes=N: do N random reads and writes per packet\n");
+       printf("  --no-iova-contig: mempool memory can be IOVA non contiguous. "
+              "valid only with --mp-alloc=anon\n");
 }
 
 #ifdef RTE_LIBRTE_CMDLINE
@@ -220,7 +227,8 @@ init_peer_eth_addrs(char *config_filename)
                if (fgets(buf, sizeof(buf), config_file) == NULL)
                        break;
 
-               if (cmdline_parse_etheraddr(NULL, buf, &peer_eth_addrs[i]) < 0 ){
+               if (cmdline_parse_etheraddr(NULL, buf, &peer_eth_addrs[i],
+                               sizeof(peer_eth_addrs[i])) < 0) {
                        printf("Bad MAC address format on line %d\n", i+1);
                        fclose(config_file);
                        return -1;
@@ -357,13 +365,26 @@ parse_queue_stats_mapping_config(const char *q_arg, int is_rx)
        return 0;
 }
 
+static void
+print_invalid_socket_id_error(void)
+{
+       unsigned int i = 0;
+
+       printf("Invalid socket id, options are: ");
+       for (i = 0; i < num_sockets; i++) {
+               printf("%u%s", socket_ids[i],
+                     (i == num_sockets - 1) ? "\n" : ",");
+       }
+}
+
 static int
 parse_portnuma_config(const char *q_arg)
 {
        char s[256];
        const char *p, *p0 = q_arg;
        char *end;
-       uint8_t i,port_id,socket_id;
+       uint8_t i, socket_id;
+       portid_t port_id;
        unsigned size;
        enum fieldnames {
                FLD_PORT = 0,
@@ -392,16 +413,19 @@ parse_portnuma_config(const char *q_arg)
                        if (errno != 0 || end == str_fld[i] || int_fld[i] > 255)
                                return -1;
                }
-               port_id = (uint8_t)int_fld[FLD_PORT];
-               if (port_id >= nb_ports) {
-                       printf("Invalid port, range is [0, %d]\n", nb_ports - 1);
+               port_id = (portid_t)int_fld[FLD_PORT];
+               if (port_id_is_invalid(port_id, ENABLED_WARN) ||
+                       port_id == (portid_t)RTE_PORT_ALL) {
+                       print_valid_ports();
                        return -1;
                }
                socket_id = (uint8_t)int_fld[FLD_SOCKET];
-               if(socket_id >= MAX_SOCKET) {
-                       printf("Invalid socket id, range is [0, %d]\n",
-                                MAX_SOCKET - 1);
-                       return -1;
+               if (new_socket_id(socket_id)) {
+                       if (num_sockets >= RTE_MAX_NUMA_NODES) {
+                               print_invalid_socket_id_error();
+                               return -1;
+                       }
+                       socket_ids[num_sockets++] = socket_id;
                }
                port_numa[port_id] = socket_id;
        }
@@ -415,7 +439,8 @@ parse_ringnuma_config(const char *q_arg)
        char s[256];
        const char *p, *p0 = q_arg;
        char *end;
-       uint8_t i,port_id,ring_flag,socket_id;
+       uint8_t i, ring_flag, socket_id;
+       portid_t port_id;
        unsigned size;
        enum fieldnames {
                FLD_PORT = 0,
@@ -448,16 +473,19 @@ parse_ringnuma_config(const char *q_arg)
                        if (errno != 0 || end == str_fld[i] || int_fld[i] > 255)
                                return -1;
                }
-               port_id = (uint8_t)int_fld[FLD_PORT];
-               if (port_id >= nb_ports) {
-                       printf("Invalid port, range is [0, %d]\n", nb_ports - 1);
+               port_id = (portid_t)int_fld[FLD_PORT];
+               if (port_id_is_invalid(port_id, ENABLED_WARN) ||
+                       port_id == (portid_t)RTE_PORT_ALL) {
+                       print_valid_ports();
                        return -1;
                }
                socket_id = (uint8_t)int_fld[FLD_SOCKET];
-               if (socket_id >= MAX_SOCKET) {
-                       printf("Invalid socket id, range is [0, %d]\n",
-                               MAX_SOCKET - 1);
-                       return -1;
+               if (new_socket_id(socket_id)) {
+                       if (num_sockets >= RTE_MAX_NUMA_NODES) {
+                               print_invalid_socket_id_error();
+                               return -1;
+                       }
+                       socket_ids[num_sockets++] = socket_id;
                }
                ring_flag = (uint8_t)int_fld[FLD_FLAG];
                if ((ring_flag < RX_RING_ONLY) || (ring_flag > RXTX_RING)) {
@@ -487,50 +515,42 @@ parse_ringnuma_config(const char *q_arg)
        return 0;
 }
 
-static unsigned int
-parse_item_list(char* str, unsigned int max_items, unsigned int *parsed_items)
+static int
+parse_event_printing_config(const char *optarg, int enable)
 {
-       unsigned int nb_item;
-       unsigned int value;
-       unsigned int i;
-       int value_ok;
-       char c;
+       uint32_t mask = 0;
 
-       /*
-        * First parse all items in the list and store their value.
-        */
-       value = 0;
-       nb_item = 0;
-       value_ok = 0;
-       for (i = 0; i < strlen(str); i++) {
-               c = str[i];
-               if ((c >= '0') && (c <= '9')) {
-                       value = (unsigned int) (value * 10 + (c - '0'));
-                       value_ok = 1;
-                       continue;
-               }
-               if (c != ',') {
-                       printf("character %c is not a decimal digit\n", c);
-                       return (0);
-               }
-               if (! value_ok) {
-                       printf("No valid value before comma\n");
-                       return (0);
-               }
-               if (nb_item < max_items) {
-                       parsed_items[nb_item] = value;
-                       value_ok = 0;
-                       value = 0;
-               }
-               nb_item++;
+       if (!strcmp(optarg, "unknown"))
+               mask = UINT32_C(1) << RTE_ETH_EVENT_UNKNOWN;
+       else if (!strcmp(optarg, "intr_lsc"))
+               mask = UINT32_C(1) << RTE_ETH_EVENT_INTR_LSC;
+       else if (!strcmp(optarg, "queue_state"))
+               mask = UINT32_C(1) << RTE_ETH_EVENT_QUEUE_STATE;
+       else if (!strcmp(optarg, "intr_reset"))
+               mask = UINT32_C(1) << RTE_ETH_EVENT_INTR_RESET;
+       else if (!strcmp(optarg, "vf_mbox"))
+               mask = UINT32_C(1) << RTE_ETH_EVENT_VF_MBOX;
+       else if (!strcmp(optarg, "ipsec"))
+               mask = UINT32_C(1) << RTE_ETH_EVENT_IPSEC;
+       else if (!strcmp(optarg, "macsec"))
+               mask = UINT32_C(1) << RTE_ETH_EVENT_MACSEC;
+       else if (!strcmp(optarg, "intr_rmv"))
+               mask = UINT32_C(1) << RTE_ETH_EVENT_INTR_RMV;
+       else if (!strcmp(optarg, "dev_probed"))
+               mask = UINT32_C(1) << RTE_ETH_EVENT_NEW;
+       else if (!strcmp(optarg, "dev_released"))
+               mask = UINT32_C(1) << RTE_ETH_EVENT_DESTROY;
+       else if (!strcmp(optarg, "all"))
+               mask = ~UINT32_C(0);
+       else {
+               fprintf(stderr, "Invalid event: %s\n", optarg);
+               return -1;
        }
-
-       if (nb_item >= max_items)
-               rte_exit(EXIT_FAILURE, "too many txpkt segments!\n");
-
-       parsed_items[nb_item++] = value;
-
-       return (nb_item);
+       if (enable)
+               event_print_mask |= mask;
+       else
+               event_print_mask &= ~mask;
+       return 0;
 }
 
 void
@@ -539,22 +559,32 @@ launch_args_parse(int argc, char** argv)
        int n, opt;
        char **argvopt;
        int opt_idx;
+       portid_t pid;
        enum { TX, RX };
+       /* Default offloads for all ports. */
+       uint64_t rx_offloads = rx_mode.offloads;
+       uint64_t tx_offloads = tx_mode.offloads;
+       struct rte_eth_dev_info dev_info;
+       uint16_t rec_nb_pkts;
 
        static struct option lgopts[] = {
                { "help",                       0, 0, 0 },
 #ifdef RTE_LIBRTE_CMDLINE
                { "interactive",                0, 0, 0 },
+               { "cmdline-file",               1, 0, 0 },
                { "auto-start",                 0, 0, 0 },
                { "eth-peers-configfile",       1, 0, 0 },
                { "eth-peer",                   1, 0, 0 },
 #endif
+               { "tx-first",                   0, 0, 0 },
+               { "stats-period",               1, 0, 0 },
                { "ports",                      1, 0, 0 },
                { "nb-cores",                   1, 0, 0 },
                { "nb-ports",                   1, 0, 0 },
                { "coremask",                   1, 0, 0 },
                { "portmask",                   1, 0, 0 },
                { "numa",                       0, 0, 0 },
+               { "no-numa",                    0, 0, 0 },
                { "mp-anon",                    0, 0, 0 },
                { "port-numa-config",           1, 0, 0 },
                { "ring-numa-config",           1, 0, 0 },
@@ -565,11 +595,22 @@ launch_args_parse(int argc, char** argv)
                { "pkt-filter-mode",            1, 0, 0 },
                { "pkt-filter-report-hash",     1, 0, 0 },
                { "pkt-filter-size",            1, 0, 0 },
-               { "pkt-filter-flexbytes-offset",1, 0, 0 },
                { "pkt-filter-drop-queue",      1, 0, 0 },
-               { "crc-strip",                  0, 0, 0 },
+#ifdef RTE_LIBRTE_LATENCY_STATS
+               { "latencystats",               1, 0, 0 },
+#endif
+#ifdef RTE_LIBRTE_BITRATE
+               { "bitrate-stats",              1, 0, 0 },
+#endif
+               { "disable-crc-strip",          0, 0, 0 },
+               { "enable-lro",                 0, 0, 0 },
                { "enable-rx-cksum",            0, 0, 0 },
-               { "disable-hw-vlan",            0, 0, 0 },
+               { "enable-rx-timestamp",        0, 0, 0 },
+               { "enable-scatter",             0, 0, 0 },
+               { "enable-hw-vlan",             0, 0, 0 },
+               { "enable-hw-vlan-filter",      0, 0, 0 },
+               { "enable-hw-vlan-strip",       0, 0, 0 },
+               { "enable-hw-vlan-extend",      0, 0, 0 },
                { "enable-drop-en",            0, 0, 0 },
                { "disable-rss",                0, 0, 0 },
                { "port-topology",              1, 0, 0 },
@@ -587,7 +628,6 @@ launch_args_parse(int argc, char** argv)
                { "txwt",                       1, 0, 0 },
                { "txfreet",                    1, 0, 0 },
                { "txrst",                      1, 0, 0 },
-               { "txqflags",                   1, 0, 0 },
                { "rxpt",                       1, 0, 0 },
                { "rxht",                       1, 0, 0 },
                { "rxwt",                       1, 0, 0 },
@@ -595,8 +635,29 @@ launch_args_parse(int argc, char** argv)
                { "tx-queue-stats-mapping",     1, 0, 0 },
                { "rx-queue-stats-mapping",     1, 0, 0 },
                { "no-flush-rx",        0, 0, 0 },
+               { "flow-isolate-all",           0, 0, 0 },
                { "txpkts",                     1, 0, 0 },
+               { "txonly-multi-flow",          0, 0, 0 },
                { "disable-link-check",         0, 0, 0 },
+               { "no-lsc-interrupt",           0, 0, 0 },
+               { "no-rmv-interrupt",           0, 0, 0 },
+               { "print-event",                1, 0, 0 },
+               { "mask-event",                 1, 0, 0 },
+               { "tx-offloads",                1, 0, 0 },
+               { "hot-plug",                   0, 0, 0 },
+               { "vxlan-gpe-port",             1, 0, 0 },
+               { "mlockall",                   0, 0, 0 },
+               { "no-mlockall",                0, 0, 0 },
+               { "mp-alloc",                   1, 0, 0 },
+               { "tx-ip",                      1, 0, 0 },
+               { "tx-udp",                     1, 0, 0 },
+               { "noisy-tx-sw-buffer-size",    1, 0, 0 },
+               { "noisy-tx-sw-buffer-flushtime", 1, 0, 0 },
+               { "noisy-lkup-memory",          1, 0, 0 },
+               { "noisy-lkup-num-writes",      1, 0, 0 },
+               { "noisy-lkup-num-reads",       1, 0, 0 },
+               { "noisy-lkup-num-reads-writes", 1, 0, 0 },
+               { "no-iova-contig",             0, 0, 0 },
                { 0, 0, 0, 0 },
        };
 
@@ -631,10 +692,33 @@ launch_args_parse(int argc, char** argv)
                                printf("Interactive-mode selected\n");
                                interactive = 1;
                        }
+                       if (!strcmp(lgopts[opt_idx].name, "cmdline-file")) {
+                               printf("CLI commands to be read from %s\n",
+                                      optarg);
+                               strlcpy(cmdline_filename, optarg,
+                                       sizeof(cmdline_filename));
+                       }
                        if (!strcmp(lgopts[opt_idx].name, "auto-start")) {
                                printf("Auto-start selected\n");
                                auto_start = 1;
                        }
+                       if (!strcmp(lgopts[opt_idx].name, "tx-first")) {
+                               printf("Ports to start sending a burst of "
+                                               "packets first\n");
+                               tx_first = 1;
+                       }
+                       if (!strcmp(lgopts[opt_idx].name, "stats-period")) {
+                               char *end = NULL;
+                               unsigned int n;
+
+                               n = strtoul(optarg, &end, 10);
+                               if ((optarg[0] == '\0') || (end == NULL) ||
+                                               (*end != '\0'))
+                                       break;
+
+                               stats_period = n;
+                               break;
+                       }
                        if (!strcmp(lgopts[opt_idx].name,
                                    "eth-peers-configfile")) {
                                if (init_peer_eth_addrs(optarg) != 0)
@@ -655,7 +739,8 @@ launch_args_parse(int argc, char** argv)
                                                 "eth-peer: port %d >= RTE_MAX_ETHPORTS(%d)\n",
                                                 n, RTE_MAX_ETHPORTS);
 
-                               if (cmdline_parse_etheraddr(NULL, port_end, &peer_addr) < 0 )
+                               if (cmdline_parse_etheraddr(NULL, port_end,
+                                               &peer_addr, sizeof(peer_addr)) < 0)
                                        rte_exit(EXIT_FAILURE,
                                                 "Invalid ethernet address: %s\n",
                                                 port_end);
@@ -665,14 +750,62 @@ launch_args_parse(int argc, char** argv)
                                nb_peer_eth_addrs++;
                        }
 #endif
+                       if (!strcmp(lgopts[opt_idx].name, "tx-ip")) {
+                               struct in_addr in;
+                               char *end;
+
+                               end = strchr(optarg, ',');
+                               if (end == optarg || !end)
+                                       rte_exit(EXIT_FAILURE,
+                                                "Invalid tx-ip: %s", optarg);
+
+                               *end++ = 0;
+                               if (inet_aton(optarg, &in) == 0)
+                                       rte_exit(EXIT_FAILURE,
+                                                "Invalid source IP address: %s\n",
+                                                optarg);
+                               tx_ip_src_addr = rte_be_to_cpu_32(in.s_addr);
+
+                               if (inet_aton(end, &in) == 0)
+                                       rte_exit(EXIT_FAILURE,
+                                                "Invalid destination IP address: %s\n",
+                                                optarg);
+                               tx_ip_dst_addr = rte_be_to_cpu_32(in.s_addr);
+                       }
+                       if (!strcmp(lgopts[opt_idx].name, "tx-udp")) {
+                               char *end = NULL;
+
+                               errno = 0;
+                               n = strtoul(optarg, &end, 10);
+                               if (errno != 0 || end == optarg ||
+                                   n > UINT16_MAX ||
+                                   !(*end == '\0' || *end == ','))
+                                       rte_exit(EXIT_FAILURE,
+                                                "Invalid UDP port: %s\n",
+                                                optarg);
+                               tx_udp_src_port = n;
+                               if (*end == ',') {
+                                       char *dst = end + 1;
+
+                                       n = strtoul(dst, &end, 10);
+                                       if (errno != 0 || end == dst ||
+                                           n > UINT16_MAX || *end)
+                                               rte_exit(EXIT_FAILURE,
+                                                        "Invalid destination UDP port: %s\n",
+                                                        dst);
+                                       tx_udp_dst_port = n;
+                               } else {
+                                       tx_udp_dst_port = n;
+                               }
+
+                       }
                        if (!strcmp(lgopts[opt_idx].name, "nb-ports")) {
                                n = atoi(optarg);
                                if (n > 0 && n <= nb_ports)
-                                       nb_fwd_ports = (uint8_t) n;
+                                       nb_fwd_ports = n;
                                else
                                        rte_exit(EXIT_FAILURE,
-                                                "nb-ports should be > 0 and <= %d\n",
-                                                nb_ports);
+                                                "Invalid port %d\n", n);
                        }
                        if (!strcmp(lgopts[opt_idx].name, "nb-cores")) {
                                n = atoi(optarg);
@@ -687,14 +820,27 @@ launch_args_parse(int argc, char** argv)
                                parse_fwd_coremask(optarg);
                        if (!strcmp(lgopts[opt_idx].name, "portmask"))
                                parse_fwd_portmask(optarg);
-                       if (!strcmp(lgopts[opt_idx].name, "numa")) {
+                       if (!strcmp(lgopts[opt_idx].name, "no-numa"))
+                               numa_support = 0;
+                       if (!strcmp(lgopts[opt_idx].name, "numa"))
                                numa_support = 1;
-                               memset(port_numa,NUMA_NO_CONFIG,RTE_MAX_ETHPORTS);
-                               memset(rxring_numa,NUMA_NO_CONFIG,RTE_MAX_ETHPORTS);
-                               memset(txring_numa,NUMA_NO_CONFIG,RTE_MAX_ETHPORTS);
-                       }
                        if (!strcmp(lgopts[opt_idx].name, "mp-anon")) {
-                               mp_anon = 1;
+                               mp_alloc_type = MP_ALLOC_ANON;
+                       }
+                       if (!strcmp(lgopts[opt_idx].name, "mp-alloc")) {
+                               if (!strcmp(optarg, "native"))
+                                       mp_alloc_type = MP_ALLOC_NATIVE;
+                               else if (!strcmp(optarg, "anon"))
+                                       mp_alloc_type = MP_ALLOC_ANON;
+                               else if (!strcmp(optarg, "xmem"))
+                                       mp_alloc_type = MP_ALLOC_XMEM;
+                               else if (!strcmp(optarg, "xmemhuge"))
+                                       mp_alloc_type = MP_ALLOC_XMEM_HUGE;
+                               else
+                                       rte_exit(EXIT_FAILURE,
+                                               "mp-alloc %s invalid - must be: "
+                                               "native, anon, xmem or xmemhuge\n",
+                                                optarg);
                        }
                        if (!strcmp(lgopts[opt_idx].name, "port-numa-config")) {
                                if (parse_portnuma_config(optarg))
@@ -707,12 +853,13 @@ launch_args_parse(int argc, char** argv)
                                           "invalid ring-numa configuration\n");
                        if (!strcmp(lgopts[opt_idx].name, "socket-num")) {
                                n = atoi(optarg);
-                               if(n < MAX_SOCKET)
+                               if (!new_socket_id((uint8_t)n)) {
                                        socket_num = (uint8_t)n;
-                               else
+                               } else {
+                                       print_invalid_socket_id_error();
                                        rte_exit(EXIT_FAILURE,
-                                               "The socket number should be < %d\n",
-                                               MAX_SOCKET);
+                                               "Invalid socket id");
+                               }
                        }
                        if (!strcmp(lgopts[opt_idx].name, "mbuf-size")) {
                                n = atoi(optarg);
@@ -732,14 +879,15 @@ launch_args_parse(int argc, char** argv)
                        }
                        if (!strcmp(lgopts[opt_idx].name, "max-pkt-len")) {
                                n = atoi(optarg);
-                               if (n >= ETHER_MIN_LEN) {
+                               if (n >= RTE_ETHER_MIN_LEN) {
                                        rx_mode.max_rx_pkt_len = (uint32_t) n;
-                                       if (n > ETHER_MAX_LEN)
-                                           rx_mode.jumbo_frame = 1;
+                                       if (n > RTE_ETHER_MAX_LEN)
+                                               rx_offloads |=
+                                                       DEV_RX_OFFLOAD_JUMBO_FRAME;
                                } else
                                        rte_exit(EXIT_FAILURE,
                                                 "Invalid max-pkt-len=%d - should be > %d\n",
-                                                n, ETHER_MIN_LEN);
+                                                n, RTE_ETHER_MIN_LEN);
                        }
                        if (!strcmp(lgopts[opt_idx].name, "pkt-filter-mode")) {
                                if (!strcmp(optarg, "signature"))
@@ -747,12 +895,17 @@ launch_args_parse(int argc, char** argv)
                                                RTE_FDIR_MODE_SIGNATURE;
                                else if (!strcmp(optarg, "perfect"))
                                        fdir_conf.mode = RTE_FDIR_MODE_PERFECT;
+                               else if (!strcmp(optarg, "perfect-mac-vlan"))
+                                       fdir_conf.mode = RTE_FDIR_MODE_PERFECT_MAC_VLAN;
+                               else if (!strcmp(optarg, "perfect-tunnel"))
+                                       fdir_conf.mode = RTE_FDIR_MODE_PERFECT_TUNNEL;
                                else if (!strcmp(optarg, "none"))
                                        fdir_conf.mode = RTE_FDIR_MODE_NONE;
                                else
                                        rte_exit(EXIT_FAILURE,
                                                 "pkt-mode-invalid %s invalid - must be: "
-                                                "none, signature or perfect\n",
+                                                "none, signature, perfect, perfect-mac-vlan"
+                                                " or perfect-tunnel\n",
                                                 optarg);
                        }
                        if (!strcmp(lgopts[opt_idx].name,
@@ -787,17 +940,6 @@ launch_args_parse(int argc, char** argv)
                                                 " must be: 64K or 128K or 256K\n",
                                                 optarg);
                        }
-                       if (!strcmp(lgopts[opt_idx].name,
-                                   "pkt-filter-flexbytes-offset")) {
-                               n = atoi(optarg);
-                               if ( n >= 0 && n <= (int) 32)
-                                       fdir_conf.flexbytes_offset =
-                                               (uint8_t) n;
-                               else
-                                       rte_exit(EXIT_FAILURE,
-                                                "flexbytes %d invalid - must"
-                                                "be  >= 0 && <= 32\n", n);
-                       }
                        if (!strcmp(lgopts[opt_idx].name,
                                    "pkt-filter-drop-queue")) {
                                n = atoi(optarg);
@@ -808,16 +950,56 @@ launch_args_parse(int argc, char** argv)
                                                 "drop queue %d invalid - must"
                                                 "be >= 0 \n", n);
                        }
-                       if (!strcmp(lgopts[opt_idx].name, "crc-strip"))
-                               rx_mode.hw_strip_crc = 1;
+#ifdef RTE_LIBRTE_LATENCY_STATS
+                       if (!strcmp(lgopts[opt_idx].name,
+                                   "latencystats")) {
+                               n = atoi(optarg);
+                               if (n >= 0) {
+                                       latencystats_lcore_id = (lcoreid_t) n;
+                                       latencystats_enabled = 1;
+                               } else
+                                       rte_exit(EXIT_FAILURE,
+                                                "invalid lcore id %d for latencystats"
+                                                " must be >= 0\n", n);
+                       }
+#endif
+#ifdef RTE_LIBRTE_BITRATE
+                       if (!strcmp(lgopts[opt_idx].name, "bitrate-stats")) {
+                               n = atoi(optarg);
+                               if (n >= 0) {
+                                       bitrate_lcore_id = (lcoreid_t) n;
+                                       bitrate_enabled = 1;
+                               } else
+                                       rte_exit(EXIT_FAILURE,
+                                                "invalid lcore id %d for bitrate stats"
+                                                " must be >= 0\n", n);
+                       }
+#endif
+                       if (!strcmp(lgopts[opt_idx].name, "disable-crc-strip"))
+                               rx_offloads |= DEV_RX_OFFLOAD_KEEP_CRC;
+                       if (!strcmp(lgopts[opt_idx].name, "enable-lro"))
+                               rx_offloads |= DEV_RX_OFFLOAD_TCP_LRO;
+                       if (!strcmp(lgopts[opt_idx].name, "enable-scatter"))
+                               rx_offloads |= DEV_RX_OFFLOAD_SCATTER;
                        if (!strcmp(lgopts[opt_idx].name, "enable-rx-cksum"))
-                               rx_mode.hw_ip_checksum = 1;
+                               rx_offloads |= DEV_RX_OFFLOAD_CHECKSUM;
+                       if (!strcmp(lgopts[opt_idx].name,
+                                       "enable-rx-timestamp"))
+                               rx_offloads |= DEV_RX_OFFLOAD_TIMESTAMP;
+                       if (!strcmp(lgopts[opt_idx].name, "enable-hw-vlan"))
+                               rx_offloads |= DEV_RX_OFFLOAD_VLAN;
 
-                       if (!strcmp(lgopts[opt_idx].name, "disable-hw-vlan")) {
-                               rx_mode.hw_vlan_filter = 0;
-                               rx_mode.hw_vlan_strip  = 0;
-                               rx_mode.hw_vlan_extend = 0;
-                       }
+                       if (!strcmp(lgopts[opt_idx].name,
+                                       "enable-hw-vlan-filter"))
+                               rx_offloads |= DEV_RX_OFFLOAD_VLAN_FILTER;
+
+                       if (!strcmp(lgopts[opt_idx].name,
+                                       "enable-hw-vlan-strip"))
+                               rx_offloads |= DEV_RX_OFFLOAD_VLAN_STRIP;
+
+                       if (!strcmp(lgopts[opt_idx].name,
+                                       "enable-hw-vlan-extend"))
+                               rx_offloads |= DEV_RX_OFFLOAD_VLAN_EXTEND;
 
                        if (!strcmp(lgopts[opt_idx].name, "enable-drop-en"))
                                rx_drop_en = 1;
@@ -833,7 +1015,7 @@ launch_args_parse(int argc, char** argv)
                                        port_topology = PORT_TOPOLOGY_LOOP;
                                else
                                        rte_exit(EXIT_FAILURE, "port-topology %s invalid -"
-                                                " must be: paired or chained \n",
+                                                " must be: paired, chained or loop\n",
                                                 optarg);
                        }
                        if (!strcmp(lgopts[opt_idx].name, "forward-mode"))
@@ -844,44 +1026,60 @@ launch_args_parse(int argc, char** argv)
                                rss_hf = ETH_RSS_UDP;
                        if (!strcmp(lgopts[opt_idx].name, "rxq")) {
                                n = atoi(optarg);
-                               if (n >= 1 && n <= (int) MAX_QUEUE_ID)
+                               if (n >= 0 && check_nb_rxq((queueid_t)n) == 0)
                                        nb_rxq = (queueid_t) n;
                                else
                                        rte_exit(EXIT_FAILURE, "rxq %d invalid - must be"
-                                                 " >= 1 && <= %d\n", n,
-                                                 (int) MAX_QUEUE_ID);
+                                                 " >= 0 && <= %u\n", n,
+                                                 get_allowed_max_nb_rxq(&pid));
                        }
                        if (!strcmp(lgopts[opt_idx].name, "txq")) {
                                n = atoi(optarg);
-                               if (n >= 1 && n <= (int) MAX_QUEUE_ID)
+                               if (n >= 0 && check_nb_txq((queueid_t)n) == 0)
                                        nb_txq = (queueid_t) n;
                                else
                                        rte_exit(EXIT_FAILURE, "txq %d invalid - must be"
-                                                 " >= 1 && <= %d\n", n,
-                                                 (int) MAX_QUEUE_ID);
-                       }
-                       if (!strcmp(lgopts[opt_idx].name, "rxd")) {
-                               n = atoi(optarg);
-                               if (n > 0)
-                                       nb_rxd = (uint16_t) n;
-                               else
-                                       rte_exit(EXIT_FAILURE, "rxd must be > 0\n");
+                                                 " >= 0 && <= %u\n", n,
+                                                 get_allowed_max_nb_txq(&pid));
                        }
-                       if (!strcmp(lgopts[opt_idx].name, "txd")) {
-                               n = atoi(optarg);
-                               if (n > 0)
-                                       nb_txd = (uint16_t) n;
-                               else
-                                       rte_exit(EXIT_FAILURE, "txd must be in > 0\n");
+                       if (!nb_rxq && !nb_txq) {
+                               rte_exit(EXIT_FAILURE, "Either rx or tx queues should "
+                                               "be non-zero\n");
                        }
                        if (!strcmp(lgopts[opt_idx].name, "burst")) {
                                n = atoi(optarg);
-                               if ((n >= 1) && (n <= MAX_PKT_BURST))
-                                       nb_pkt_per_burst = (uint16_t) n;
-                               else
+                               if (n == 0) {
+                                       /* A burst size of zero means that the
+                                        * PMD should be queried for
+                                        * recommended Rx burst size. Since
+                                        * testpmd uses a single size for all
+                                        * ports, port 0 is queried for the
+                                        * value, on the assumption that all
+                                        * ports are of the same NIC model.
+                                        */
+                                       rte_eth_dev_info_get(0, &dev_info);
+                                       rec_nb_pkts = dev_info
+                                               .default_rxportconf.burst_size;
+
+                                       if (rec_nb_pkts == 0)
+                                               rte_exit(EXIT_FAILURE,
+                                                       "PMD does not recommend a burst size. "
+                                                       "Provided value must be between "
+                                                       "1 and %d\n", MAX_PKT_BURST);
+                                       else if (rec_nb_pkts > MAX_PKT_BURST)
+                                               rte_exit(EXIT_FAILURE,
+                                                       "PMD recommended burst size of %d"
+                                                       " exceeds maximum value of %d\n",
+                                                       rec_nb_pkts, MAX_PKT_BURST);
+                                       printf("Using PMD-provided burst value of %d\n",
+                                               rec_nb_pkts);
+                                       nb_pkt_per_burst = rec_nb_pkts;
+                               } else if (n > MAX_PKT_BURST)
                                        rte_exit(EXIT_FAILURE,
-                                                "burst must >= 1 and <= %d]",
-                                                MAX_PKT_BURST);
+                                               "burst must be between1 and %d\n",
+                                               MAX_PKT_BURST);
+                               else
+                                       nb_pkt_per_burst = (uint16_t) n;
                        }
                        if (!strcmp(lgopts[opt_idx].name, "mbcache")) {
                                n = atoi(optarg);
@@ -893,71 +1091,20 @@ launch_args_parse(int argc, char** argv)
                                                 "mbcache must be >= 0 and <= %d\n",
                                                 RTE_MEMPOOL_CACHE_MAX_SIZE);
                        }
-                       if (!strcmp(lgopts[opt_idx].name, "txpt")) {
-                               n = atoi(optarg);
-                               if (n >= 0)
-                                       tx_thresh.pthresh = (uint8_t)n;
-                               else
-                                       rte_exit(EXIT_FAILURE, "txpt must be >= 0\n");
-                       }
-                       if (!strcmp(lgopts[opt_idx].name, "txht")) {
-                               n = atoi(optarg);
-                               if (n >= 0)
-                                       tx_thresh.hthresh = (uint8_t)n;
-                               else
-                                       rte_exit(EXIT_FAILURE, "txht must be >= 0\n");
-                       }
-                       if (!strcmp(lgopts[opt_idx].name, "txwt")) {
-                               n = atoi(optarg);
-                               if (n >= 0)
-                                       tx_thresh.wthresh = (uint8_t)n;
-                               else
-                                       rte_exit(EXIT_FAILURE, "txwt must be >= 0\n");
-                       }
                        if (!strcmp(lgopts[opt_idx].name, "txfreet")) {
                                n = atoi(optarg);
                                if (n >= 0)
-                                       tx_free_thresh = (uint16_t)n;
+                                       tx_free_thresh = (int16_t)n;
                                else
                                        rte_exit(EXIT_FAILURE, "txfreet must be >= 0\n");
                        }
                        if (!strcmp(lgopts[opt_idx].name, "txrst")) {
                                n = atoi(optarg);
                                if (n >= 0)
-                                       tx_rs_thresh = (uint16_t)n;
+                                       tx_rs_thresh = (int16_t)n;
                                else
                                        rte_exit(EXIT_FAILURE, "txrst must be >= 0\n");
                        }
-                       if (!strcmp(lgopts[opt_idx].name, "txqflags")) {
-                               char *end = NULL;
-                               n = strtoul(optarg, &end, 16);
-                               if (n >= 0)
-                                       txq_flags = (uint32_t)n;
-                               else
-                                       rte_exit(EXIT_FAILURE,
-                                                "txqflags must be >= 0\n");
-                       }
-                       if (!strcmp(lgopts[opt_idx].name, "rxpt")) {
-                               n = atoi(optarg);
-                               if (n >= 0)
-                                       rx_thresh.pthresh = (uint8_t)n;
-                               else
-                                       rte_exit(EXIT_FAILURE, "rxpt must be >= 0\n");
-                       }
-                       if (!strcmp(lgopts[opt_idx].name, "rxht")) {
-                               n = atoi(optarg);
-                               if (n >= 0)
-                                       rx_thresh.hthresh = (uint8_t)n;
-                               else
-                                       rte_exit(EXIT_FAILURE, "rxht must be >= 0\n");
-                       }
-                       if (!strcmp(lgopts[opt_idx].name, "rxwt")) {
-                               n = atoi(optarg);
-                               if (n >= 0)
-                                       rx_thresh.wthresh = (uint8_t)n;
-                               else
-                                       rte_exit(EXIT_FAILURE, "rxwt must be >= 0\n");
-                       }
                        if (!strcmp(lgopts[opt_idx].name, "rxd")) {
                                n = atoi(optarg);
                                if (n > 0) {
@@ -983,49 +1130,49 @@ launch_args_parse(int argc, char** argv)
                        if (!strcmp(lgopts[opt_idx].name, "txpt")) {
                                n = atoi(optarg);
                                if (n >= 0)
-                                       tx_thresh.pthresh = (uint8_t)n;
+                                       tx_pthresh = (int8_t)n;
                                else
                                        rte_exit(EXIT_FAILURE, "txpt must be >= 0\n");
                        }
                        if (!strcmp(lgopts[opt_idx].name, "txht")) {
                                n = atoi(optarg);
                                if (n >= 0)
-                                       tx_thresh.hthresh = (uint8_t)n;
+                                       tx_hthresh = (int8_t)n;
                                else
                                        rte_exit(EXIT_FAILURE, "txht must be >= 0\n");
                        }
                        if (!strcmp(lgopts[opt_idx].name, "txwt")) {
                                n = atoi(optarg);
                                if (n >= 0)
-                                       tx_thresh.wthresh = (uint8_t)n;
+                                       tx_wthresh = (int8_t)n;
                                else
                                        rte_exit(EXIT_FAILURE, "txwt must be >= 0\n");
                        }
                        if (!strcmp(lgopts[opt_idx].name, "rxpt")) {
                                n = atoi(optarg);
                                if (n >= 0)
-                                       rx_thresh.pthresh = (uint8_t)n;
+                                       rx_pthresh = (int8_t)n;
                                else
                                        rte_exit(EXIT_FAILURE, "rxpt must be >= 0\n");
                        }
                        if (!strcmp(lgopts[opt_idx].name, "rxht")) {
                                n = atoi(optarg);
                                if (n >= 0)
-                                       rx_thresh.hthresh = (uint8_t)n;
+                                       rx_hthresh = (int8_t)n;
                                else
                                        rte_exit(EXIT_FAILURE, "rxht must be >= 0\n");
                        }
                        if (!strcmp(lgopts[opt_idx].name, "rxwt")) {
                                n = atoi(optarg);
                                if (n >= 0)
-                                       rx_thresh.wthresh = (uint8_t)n;
+                                       rx_wthresh = (int8_t)n;
                                else
                                        rte_exit(EXIT_FAILURE, "rxwt must be >= 0\n");
                        }
                        if (!strcmp(lgopts[opt_idx].name, "rxfreet")) {
                                n = atoi(optarg);
                                if (n >= 0)
-                                       rx_free_thresh = (uint16_t)n;
+                                       rx_free_thresh = (int16_t)n;
                                else
                                        rte_exit(EXIT_FAILURE, "rxfreet must be >= 0\n");
                        }
@@ -1045,17 +1192,114 @@ launch_args_parse(int argc, char** argv)
                                unsigned seg_lengths[RTE_MAX_SEGS_PER_PKT];
                                unsigned int nb_segs;
 
-                               nb_segs = parse_item_list(optarg, RTE_MAX_SEGS_PER_PKT, seg_lengths);
+                               nb_segs = parse_item_list(optarg, "txpkt segments",
+                                               RTE_MAX_SEGS_PER_PKT, seg_lengths, 0);
                                if (nb_segs > 0)
                                        set_tx_pkt_segments(seg_lengths, nb_segs);
                                else
                                        rte_exit(EXIT_FAILURE, "bad txpkts\n");
                        }
+                       if (!strcmp(lgopts[opt_idx].name, "txonly-multi-flow"))
+                               txonly_multi_flow = 1;
                        if (!strcmp(lgopts[opt_idx].name, "no-flush-rx"))
                                no_flush_rx = 1;
                        if (!strcmp(lgopts[opt_idx].name, "disable-link-check"))
                                no_link_check = 1;
-
+                       if (!strcmp(lgopts[opt_idx].name, "no-lsc-interrupt"))
+                               lsc_interrupt = 0;
+                       if (!strcmp(lgopts[opt_idx].name, "no-rmv-interrupt"))
+                               rmv_interrupt = 0;
+                       if (!strcmp(lgopts[opt_idx].name, "flow-isolate-all"))
+                               flow_isolate_all = 1;
+                       if (!strcmp(lgopts[opt_idx].name, "tx-offloads")) {
+                               char *end = NULL;
+                               n = strtoull(optarg, &end, 16);
+                               if (n >= 0)
+                                       tx_offloads = (uint64_t)n;
+                               else
+                                       rte_exit(EXIT_FAILURE,
+                                                "tx-offloads must be >= 0\n");
+                       }
+                       if (!strcmp(lgopts[opt_idx].name, "vxlan-gpe-port")) {
+                               n = atoi(optarg);
+                               if (n >= 0)
+                                       vxlan_gpe_udp_port = (uint16_t)n;
+                               else
+                                       rte_exit(EXIT_FAILURE,
+                                                "vxlan-gpe-port must be >= 0\n");
+                       }
+                       if (!strcmp(lgopts[opt_idx].name, "print-event"))
+                               if (parse_event_printing_config(optarg, 1)) {
+                                       rte_exit(EXIT_FAILURE,
+                                                "invalid print-event argument\n");
+                               }
+                       if (!strcmp(lgopts[opt_idx].name, "mask-event"))
+                               if (parse_event_printing_config(optarg, 0)) {
+                                       rte_exit(EXIT_FAILURE,
+                                                "invalid mask-event argument\n");
+                               }
+                       if (!strcmp(lgopts[opt_idx].name, "hot-plug"))
+                               hot_plug = 1;
+                       if (!strcmp(lgopts[opt_idx].name, "mlockall"))
+                               do_mlockall = 1;
+                       if (!strcmp(lgopts[opt_idx].name, "no-mlockall"))
+                               do_mlockall = 0;
+                       if (!strcmp(lgopts[opt_idx].name,
+                                   "noisy-tx-sw-buffer-size")) {
+                               n = atoi(optarg);
+                               if (n >= 0)
+                                       noisy_tx_sw_bufsz = n;
+                               else
+                                       rte_exit(EXIT_FAILURE,
+                                               "noisy-tx-sw-buffer-size must be >= 0\n");
+                       }
+                       if (!strcmp(lgopts[opt_idx].name,
+                                   "noisy-tx-sw-buffer-flushtime")) {
+                               n = atoi(optarg);
+                               if (n >= 0)
+                                       noisy_tx_sw_buf_flush_time = n;
+                               else
+                                       rte_exit(EXIT_FAILURE,
+                                                "noisy-tx-sw-buffer-flushtime must be >= 0\n");
+                       }
+                       if (!strcmp(lgopts[opt_idx].name,
+                                   "noisy-lkup-memory")) {
+                               n = atoi(optarg);
+                               if (n >= 0)
+                                       noisy_lkup_mem_sz = n;
+                               else
+                                       rte_exit(EXIT_FAILURE,
+                                                "noisy-lkup-memory must be >= 0\n");
+                       }
+                       if (!strcmp(lgopts[opt_idx].name,
+                                   "noisy-lkup-num-writes")) {
+                               n = atoi(optarg);
+                               if (n >= 0)
+                                       noisy_lkup_num_writes = n;
+                               else
+                                       rte_exit(EXIT_FAILURE,
+                                                "noisy-lkup-num-writes must be >= 0\n");
+                       }
+                       if (!strcmp(lgopts[opt_idx].name,
+                                   "noisy-lkup-num-reads")) {
+                               n = atoi(optarg);
+                               if (n >= 0)
+                                       noisy_lkup_num_reads = n;
+                               else
+                                       rte_exit(EXIT_FAILURE,
+                                                "noisy-lkup-num-reads must be >= 0\n");
+                       }
+                       if (!strcmp(lgopts[opt_idx].name,
+                                   "noisy-lkup-num-reads-writes")) {
+                               n = atoi(optarg);
+                               if (n >= 0)
+                                       noisy_lkup_num_reads_writes = n;
+                               else
+                                       rte_exit(EXIT_FAILURE,
+                                                "noisy-lkup-num-reads-writes must be >= 0\n");
+                       }
+                       if (!strcmp(lgopts[opt_idx].name, "no-iova-contig"))
+                               mempool_flags = MEMPOOL_F_NO_IOVA_CONTIG;
                        break;
                case 'h':
                        usage(argv[0]);
@@ -1068,4 +1312,16 @@ launch_args_parse(int argc, char** argv)
                        break;
                }
        }
+
+       /* Set offload configuration from command line parameters. */
+       rx_mode.offloads = rx_offloads;
+       tx_mode.offloads = tx_offloads;
+
+       if (mempool_flags & MEMPOOL_F_NO_IOVA_CONTIG &&
+           mp_alloc_type != MP_ALLOC_ANON) {
+               TESTPMD_LOG(WARNING, "cannot use no-iova-contig without "
+                                 "mp-alloc=anon. mempool no-iova-contig is "
+                                 "ignored\n");
+               mempool_flags = 0;
+       }
 }