common/sfc_efx/base: add interrupts module for Riverhead

[dpdk.git] / app / test-pmd / parameters.c

diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index 404dba2..1ead595 100644 (file)
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -49,7 +49,7 @@
 static void
 usage(char* progname)
 {
-       printf("usage: %s "
+       printf("usage: %s [EAL options] -- "
 #ifdef RTE_LIBRTE_CMDLINE
               "[--interactive|-i] "
               "[--cmdline-file=FILENAME] "
@@ -66,11 +66,12 @@ usage(char* progname)
               "--tx-ip=SRC,DST | --tx-udp=PORT | "
 #endif
               "--pkt-filter-mode= |"
-              "--rss-ip | --rss-udp | "
-              "--rxpt= | --rxht= | --rxwt= | --rxfreet= | "
-              "--txpt= | --txht= | --txwt= | --txfreet= | "
+              "--rss-ip | --rss-udp | --rss-level-inner | --rss-level-outer |"
+              "--rxpt= | --rxht= | --rxwt= |"
+              " --rxfreet= | --txpt= | --txht= | --txwt= | --txfreet= | "
               "--txrst= | --tx-offloads= | | --rx-offloads= | "
-              "--vxlan-gpe-port= ]\n",
+              "--vxlan-gpe-port= | --record-core-cycles | "
+              "--record-burst-stats]\n",
               progname);
 #ifdef RTE_LIBRTE_CMDLINE
        printf("  --interactive: run in interactive mode.\n");
@@ -147,8 +148,12 @@ usage(char* progname)
               "is default).\n");
        printf("  --forward-mode=N: set forwarding mode (N: %s).\n",
               list_pkt_forwarding_modes());
+       printf("  --forward-mode=5tswap: set forwarding mode to "
+                       "swap L2,L3,L4 for MAC, IPv4/IPv6 and TCP/UDP only.\n");
        printf("  --rss-ip: set RSS functions to IPv4/IPv6 only .\n");
        printf("  --rss-udp: set RSS functions to IPv4/IPv6 + UDP.\n");
+       printf("  --rss-level-inner: set RSS hash level to innermost\n");
+       printf("  --rss-level-outer: set RSS hash level to outermost\n");
        printf("  --rxq=N: set the number of RX queues per port to N.\n");
        printf("  --rxd=N: set the number of descriptors in RX rings to N.\n");
        printf("  --txq=N: set the number of TX queues per port to N.\n");
@@ -187,9 +192,9 @@ usage(char* progname)
        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>: "
+       printf("  --print-event <unknown|intr_lsc|queue_state|intr_reset|vf_mbox|macsec|intr_rmv|flow_aged|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>: "
+       printf("  --mask-event <unknown|intr_lsc|queue_state|intr_reset|vf_mbox|macsec|intr_rmv|flow_aged|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");
@@ -212,6 +217,10 @@ usage(char* progname)
        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");
+       printf("  --rx-mq-mode=0xX: hexadecimal bitmask of RX mq mode can be "
+              "enabled\n");
+       printf("  --record-core-cycles: enable measurement of CPU cycles.\n");
+       printf("  --record-burst-stats: enable display of RX and TX bursts.\n");
 }
 
 #ifdef RTE_LIBRTE_CMDLINE
@@ -545,6 +554,8 @@ parse_event_printing_config(const char *optarg, int enable)
                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, "flow_aged"))
+               mask = UINT32_C(1) << RTE_ETH_EVENT_FLOW_AGED;
        else if (!strcmp(optarg, "all"))
                mask = ~UINT32_C(0);
        else {
@@ -607,7 +618,7 @@ launch_args_parse(int argc, char** argv)
 #ifdef RTE_LIBRTE_LATENCY_STATS
                { "latencystats",               1, 0, 0 },
 #endif
-#ifdef RTE_LIBRTE_BITRATE
+#ifdef RTE_LIBRTE_BITRATESTATS
                { "bitrate-stats",              1, 0, 0 },
 #endif
                { "disable-crc-strip",          0, 0, 0 },
@@ -626,6 +637,8 @@ launch_args_parse(int argc, char** argv)
                { "forward-mode",               1, 0, 0 },
                { "rss-ip",                     0, 0, 0 },
                { "rss-udp",                    0, 0, 0 },
+               { "rss-level-outer",            0, 0, 0 },
+               { "rss-level-inner",            0, 0, 0 },
                { "rxq",                        1, 0, 0 },
                { "txq",                        1, 0, 0 },
                { "rxd",                        1, 0, 0 },
@@ -670,6 +683,9 @@ launch_args_parse(int argc, char** argv)
                { "noisy-lkup-num-reads",       1, 0, 0 },
                { "noisy-lkup-num-reads-writes", 1, 0, 0 },
                { "no-iova-contig",             0, 0, 0 },
+               { "rx-mq-mode",                 1, 0, 0 },
+               { "record-core-cycles",         0, 0, 0 },
+               { "record-burst-stats",         0, 0, 0 },
                { 0, 0, 0, 0 },
        };
 
@@ -979,7 +995,7 @@ launch_args_parse(int argc, char** argv)
                                                 " must be >= 0\n", n);
                        }
 #endif
-#ifdef RTE_LIBRTE_BITRATE
+#ifdef RTE_LIBRTE_BITRATESTATS
                        if (!strcmp(lgopts[opt_idx].name, "bitrate-stats")) {
                                n = atoi(optarg);
                                if (n >= 0) {
@@ -1044,6 +1060,10 @@ launch_args_parse(int argc, char** argv)
                                rss_hf = ETH_RSS_IP;
                        if (!strcmp(lgopts[opt_idx].name, "rss-udp"))
                                rss_hf = ETH_RSS_UDP;
+                       if (!strcmp(lgopts[opt_idx].name, "rss-level-inner"))
+                               rss_hf |= ETH_RSS_LEVEL_INNERMOST;
+                       if (!strcmp(lgopts[opt_idx].name, "rss-level-outer"))
+                               rss_hf |= ETH_RSS_LEVEL_OUTERMOST;
                        if (!strcmp(lgopts[opt_idx].name, "rxq")) {
                                n = atoi(optarg);
                                if (n >= 0 && check_nb_rxq((queueid_t)n) == 0)
@@ -1363,6 +1383,21 @@ launch_args_parse(int argc, char** argv)
                        }
                        if (!strcmp(lgopts[opt_idx].name, "no-iova-contig"))
                                mempool_flags = MEMPOOL_F_NO_IOVA_CONTIG;
+
+                       if (!strcmp(lgopts[opt_idx].name, "rx-mq-mode")) {
+                               char *end = NULL;
+                               n = strtoul(optarg, &end, 16);
+                               if (n >= 0 && n <= ETH_MQ_RX_VMDQ_DCB_RSS)
+                                       rx_mq_mode = (enum rte_eth_rx_mq_mode)n;
+                               else
+                                       rte_exit(EXIT_FAILURE,
+                                                "rx-mq-mode must be >= 0 and <= %d\n",
+                                                ETH_MQ_RX_VMDQ_DCB_RSS);
+                       }
+                       if (!strcmp(lgopts[opt_idx].name, "record-core-cycles"))
+                               record_core_cycles = 1;
+                       if (!strcmp(lgopts[opt_idx].name, "record-burst-stats"))
+                               record_burst_stats = 1;
                        break;
                case 'h':
                        usage(argv[0]);