net: add rte prefix to ether defines

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

diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index 7b6b609..245b610 100644 (file)
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -19,6 +19,7 @@
 #include <stdint.h>
 #include <unistd.h>
 #include <inttypes.h>
+#include <arpa/inet.h>
 
 #include <rte_common.h>
 #include <rte_byteorder.h>
@@ -65,6 +66,7 @@ usage(char* progname)
 #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 | "
@@ -202,6 +204,8 @@ usage(char* progname)
        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
@@ -645,12 +649,15 @@ launch_args_parse(int argc, char** argv)
                { "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 },
        };
 
@@ -743,6 +750,55 @@ 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)
@@ -823,15 +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)
+                                       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"))
@@ -1242,6 +1298,8 @@ launch_args_parse(int argc, char** argv)
                                        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]);
@@ -1258,4 +1316,12 @@ launch_args_parse(int argc, char** argv)
        /* 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;
+       }
 }