net/i40e/base: replace license text with SPDX tag

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

diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index 6489bf4..565bea7 100644 (file)
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -190,6 +190,11 @@ usage(char* progname)
        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");
 }
 
 #ifdef RTE_LIBRTE_CMDLINE
@@ -377,7 +382,6 @@ parse_portnuma_config(const char *q_arg)
        };
        unsigned long int_fld[_NUM_FLD];
        char *str_fld[_NUM_FLD];
-       portid_t pid;
 
        /* reset from value set at definition */
        while ((p = strchr(p0,'(')) != NULL) {
@@ -401,10 +405,7 @@ parse_portnuma_config(const char *q_arg)
                port_id = (portid_t)int_fld[FLD_PORT];
                if (port_id_is_invalid(port_id, ENABLED_WARN) ||
                        port_id == (portid_t)RTE_PORT_ALL) {
-                       printf("Valid port range is [0");
-                       RTE_ETH_FOREACH_DEV(pid)
-                               printf(", %d", pid);
-                       printf("]\n");
+                       print_valid_ports();
                        return -1;
                }
                socket_id = (uint8_t)int_fld[FLD_SOCKET];
@@ -435,7 +436,6 @@ parse_ringnuma_config(const char *q_arg)
        };
        unsigned long int_fld[_NUM_FLD];
        char *str_fld[_NUM_FLD];
-       portid_t pid;
        #define RX_RING_ONLY 0x1
        #define TX_RING_ONLY 0x2
        #define RXTX_RING    0x3
@@ -462,10 +462,7 @@ parse_ringnuma_config(const char *q_arg)
                port_id = (portid_t)int_fld[FLD_PORT];
                if (port_id_is_invalid(port_id, ENABLED_WARN) ||
                        port_id == (portid_t)RTE_PORT_ALL) {
-                       printf("Valid port range is [0");
-                       RTE_ETH_FOREACH_DEV(pid)
-                               printf(", %d", pid);
-                       printf("]\n");
+                       print_valid_ports();
                        return -1;
                }
                socket_id = (uint8_t)int_fld[FLD_SOCKET];
@@ -633,6 +630,7 @@ launch_args_parse(int argc, char** argv)
                { "vxlan-gpe-port",             1, 0, 0 },
                { "mlockall",                   0, 0, 0 },
                { "no-mlockall",                0, 0, 0 },
+               { "mp-alloc",                   1, 0, 0 },
                { 0, 0, 0, 0 },
        };
 
@@ -751,7 +749,22 @@ launch_args_parse(int argc, char** argv)
                        if (!strcmp(lgopts[opt_idx].name, "numa"))
                                numa_support = 1;
                        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))
@@ -887,7 +900,7 @@ launch_args_parse(int argc, char** argv)
                        }
 #endif
                        if (!strcmp(lgopts[opt_idx].name, "disable-crc-strip"))
-                               rx_offloads &= ~DEV_RX_OFFLOAD_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"))