#include <stdint.h>
#include <unistd.h>
#include <inttypes.h>
-#include <arpa/inet.h>
#include <rte_common.h>
#include <rte_byteorder.h>
static void
usage(char* progname)
{
- printf("usage: %s [EAL options] -- "
-#ifdef RTE_LIB_CMDLINE
- "[--interactive|-i] "
- "[--cmdline-file=FILENAME] "
-#endif
- "[--help|-h] | [--auto-start|-a] | ["
- "--tx-first | --stats-period=PERIOD | "
- "--coremask=COREMASK --portmask=PORTMASK --numa "
- "--portlist=PORTLIST "
- "--mbuf-size= | --total-num-mbufs= | "
- "--nb-cores= | --nb-ports= | "
-#ifdef RTE_LIB_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 | --rss-level-inner | --rss-level-outer |"
- "--rxpt= | --rxht= | --rxwt= |"
- " --rxfreet= | --txpt= | --txht= | --txwt= | --txfreet= | "
- "--txrst= | --tx-offloads= | | --rx-offloads= | "
- "--vxlan-gpe-port= | --geneve-parsed-port= | "
- "--record-core-cycles | --record-burst-stats]\n",
+ printf("\nUsage: %s [EAL options] -- [testpmd options]\n\n",
progname);
#ifdef RTE_LIB_CMDLINE
printf(" --interactive: run in interactive mode.\n");
printf(" --portlist=PORTLIST: list of forwarding ports\n");
printf(" --numa: enable NUMA-aware allocation of RX/TX rings and of "
"RX memory buffers (mbufs).\n");
+ printf(" --no-numa: disable NUMA-aware allocation.\n");
printf(" --port-numa-config=(port,socket)[,(port,socket)]: "
"specify the socket on which the memory pool "
"used by the port will be allocated.\n");
"monitoring on forwarding lcore id N.\n");
#endif
printf(" --disable-crc-strip: disable CRC stripping by hardware.\n");
+ printf(" --enable-scatter: enable scattered Rx.\n");
printf(" --enable-lro: enable large receive offload.\n");
printf(" --enable-rx-cksum: enable rx hardware checksum offload.\n");
printf(" --enable-rx-timestamp: enable rx hardware timestamp offload.\n");
printf(" --hairpinq=N: set the number of hairpin queues per port to "
"N.\n");
printf(" --burst=N: set the number of packets per burst to N.\n");
+ printf(" --flowgen-clones=N: set the number of single packet clones to send in flowgen mode. Should be less than burst value.\n");
+ printf(" --flowgen-flows=N: set the number of flows in flowgen mode to N (1 <= N <= INT32_MAX).\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.\n");
printf(" --rxht=N: set the host threshold register of RX rings to N.\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(" --tx-ip=src,dst: IP addresses in Tx-only mode\n");
+ printf(" --tx-udp=src[,dst]: UDP ports in Tx-only mode\n");
+ printf(" --eth-link-speed: force link speed.\n");
printf(" --disable-link-check: disable check on link status when "
"starting/stopping ports.\n");
printf(" --disable-device-start: do not automatically start port\n");
printf(" --hot-plug: enable hot plug for device.\n");
printf(" --vxlan-gpe-port=N: UPD port of tunnel VXLAN-GPE\n");
printf(" --geneve-parsed-port=N: UPD port to parse GENEVE tunnel protocol\n");
+#ifndef RTE_EXEC_ENV_WINDOWS
printf(" --mlockall: lock all memory\n");
printf(" --no-mlockall: do not lock all memory\n");
+#endif
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"
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(" --noisy-lkup-num-reads-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");
- printf(" --hairpin-mode=0xXX: bitmask set the hairpin port mode.\n "
+ printf(" --hairpin-mode=0xXX: bitmask set the hairpin port mode.\n"
" 0x10 - explicit Tx rule, 0x02 - hairpin ports paired\n"
" 0x01 - hairpin ports loop, 0x00 - hairpin port self\n");
}
#ifdef RTE_LIB_CMDLINE
static int
-init_peer_eth_addrs(char *config_filename)
+init_peer_eth_addrs(const char *config_filename)
{
FILE *config_file;
portid_t i;
break;
if (rte_ether_unformat_addr(buf, &peer_eth_addrs[i]) < 0) {
- printf("Bad MAC address format on line %d\n", i+1);
+ fprintf(stderr, "Bad MAC address format on line %d\n",
+ i + 1);
fclose(config_file);
return -1;
}
{
unsigned int i = 0;
- printf("Invalid socket id, options are: ");
+ fprintf(stderr, "Invalid socket id, options are: ");
for (i = 0; i < num_sockets; i++) {
- printf("%u%s", socket_ids[i],
- (i == num_sockets - 1) ? "\n" : ",");
+ fprintf(stderr, "%u%s", socket_ids[i],
+ (i == num_sockets - 1) ? "\n" : ",");
}
}
}
ring_flag = (uint8_t)int_fld[FLD_FLAG];
if ((ring_flag < RX_RING_ONLY) || (ring_flag > RXTX_RING)) {
- printf("Invalid ring-flag=%d config for port =%d\n",
+ fprintf(stderr,
+ "Invalid ring-flag=%d config for port =%d\n",
ring_flag,port_id);
return -1;
}
txring_numa[port_id] = socket_id;
break;
default:
- printf("Invalid ring-flag=%d config for port=%d\n",
+ fprintf(stderr,
+ "Invalid ring-flag=%d config for port=%d\n",
ring_flag,port_id);
break;
}
return 0;
}
+static int
+parse_link_speed(int n)
+{
+ uint32_t speed = ETH_LINK_SPEED_FIXED;
+
+ switch (n) {
+ case 1000:
+ speed |= ETH_LINK_SPEED_1G;
+ break;
+ case 10000:
+ speed |= ETH_LINK_SPEED_10G;
+ break;
+ case 25000:
+ speed |= ETH_LINK_SPEED_25G;
+ break;
+ case 40000:
+ speed |= ETH_LINK_SPEED_40G;
+ break;
+ case 50000:
+ speed |= ETH_LINK_SPEED_50G;
+ break;
+ case 100000:
+ speed |= ETH_LINK_SPEED_100G;
+ break;
+ case 200000:
+ speed |= ETH_LINK_SPEED_200G;
+ break;
+ case 100:
+ case 10:
+ default:
+ fprintf(stderr, "Unsupported fixed speed\n");
+ return 0;
+ }
+
+ return speed;
+}
+
void
launch_args_parse(int argc, char** argv)
{
+#define PARAM_PROC_ID "proc-id"
+#define PARAM_NUM_PROCS "num-procs"
+
int n, opt;
char **argvopt;
int opt_idx;
#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 },
{ "portlist", 1, 0, 0 },
{ "numa", 0, 0, 0 },
{ "no-numa", 0, 0, 0 },
- { "mp-anon", 0, 0, 0 },
+ { "mp-anon", 0, 0, 0 }, /* deprecated */
{ "port-numa-config", 1, 0, 0 },
{ "ring-numa-config", 1, 0, 0 },
{ "socket-num", 1, 0, 0 },
{ "hairpinq", 1, 0, 0 },
{ "hairpin-mode", 1, 0, 0 },
{ "burst", 1, 0, 0 },
+ { "flowgen-clones", 1, 0, 0 },
+ { "flowgen-flows", 1, 0, 0 },
{ "mbcache", 1, 0, 0 },
{ "txpt", 1, 0, 0 },
{ "txht", 1, 0, 0 },
{ "rxpkts", 1, 0, 0 },
{ "txpkts", 1, 0, 0 },
{ "txonly-multi-flow", 0, 0, 0 },
+ { "eth-link-speed", 1, 0, 0 },
{ "disable-link-check", 0, 0, 0 },
{ "disable-device-start", 0, 0, 0 },
{ "no-lsc-interrupt", 0, 0, 0 },
{ "hot-plug", 0, 0, 0 },
{ "vxlan-gpe-port", 1, 0, 0 },
{ "geneve-parsed-port", 1, 0, 0 },
+#ifndef RTE_EXEC_ENV_WINDOWS
{ "mlockall", 0, 0, 0 },
{ "no-mlockall", 0, 0, 0 },
+#endif
{ "mp-alloc", 1, 0, 0 },
{ "tx-ip", 1, 0, 0 },
{ "tx-udp", 1, 0, 0 },
{ "rx-mq-mode", 1, 0, 0 },
{ "record-core-cycles", 0, 0, 0 },
{ "record-burst-stats", 0, 0, 0 },
+ { PARAM_NUM_PROCS, 1, 0, 0 },
+ { PARAM_PROC_ID, 1, 0, 0 },
{ 0, 0, 0, 0 },
};
case 0: /*long options */
if (!strcmp(lgopts[opt_idx].name, "help")) {
usage(argv[0]);
- rte_exit(EXIT_SUCCESS, "Displayed help\n");
+ exit(EXIT_SUCCESS);
}
#ifdef RTE_LIB_CMDLINE
if (!strcmp(lgopts[opt_idx].name, "interactive")) {
"Invalid tx-ip: %s", optarg);
*end++ = 0;
- if (inet_aton(optarg, &in) == 0)
+ if (inet_pton(AF_INET, 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)
+ if (inet_pton(AF_INET, end, &in) == 0)
rte_exit(EXIT_FAILURE,
"Invalid destination IP address: %s\n",
optarg);
}
if (!strcmp(lgopts[opt_idx].name, "max-pkt-len")) {
n = atoi(optarg);
- if (n >= RTE_ETHER_MIN_LEN) {
+ if (n >= RTE_ETHER_MIN_LEN)
rx_mode.max_rx_pkt_len = (uint32_t) n;
- if (n > RTE_ETHER_MAX_LEN)
- rx_offloads |=
- DEV_RX_OFFLOAD_JUMBO_FRAME;
- } else
+ else
rte_exit(EXIT_FAILURE,
"Invalid max-pkt-len=%d - should be > %d\n",
n, RTE_ETHER_MIN_LEN);
else
nb_pkt_per_burst = (uint16_t) n;
}
+ if (!strcmp(lgopts[opt_idx].name, "flowgen-clones")) {
+ n = atoi(optarg);
+ if (n >= 0)
+ nb_pkt_flowgen_clones = (uint16_t) n;
+ else
+ rte_exit(EXIT_FAILURE,
+ "clones must be >= 0 and <= current burst\n");
+ }
+ if (!strcmp(lgopts[opt_idx].name, "flowgen-flows")) {
+ n = atoi(optarg);
+ if (n > 0)
+ nb_flows_flowgen = (int) n;
+ else
+ rte_exit(EXIT_FAILURE,
+ "flows must be >= 1\n");
+ }
if (!strcmp(lgopts[opt_idx].name, "mbcache")) {
n = atoi(optarg);
if ((n >= 0) &&
txonly_multi_flow = 1;
if (!strcmp(lgopts[opt_idx].name, "no-flush-rx"))
no_flush_rx = 1;
+ if (!strcmp(lgopts[opt_idx].name, "eth-link-speed")) {
+ n = atoi(optarg);
+ if (n >= 0 && parse_link_speed(n) > 0)
+ eth_link_speed = parse_link_speed(n);
+ }
if (!strcmp(lgopts[opt_idx].name, "disable-link-check"))
no_link_check = 1;
if (!strcmp(lgopts[opt_idx].name, "disable-device-start"))
"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;
+ mempool_flags = RTE_MEMPOOL_F_NO_IOVA_CONTIG;
if (!strcmp(lgopts[opt_idx].name, "rx-mq-mode")) {
char *end = NULL;
record_core_cycles = 1;
if (!strcmp(lgopts[opt_idx].name, "record-burst-stats"))
record_burst_stats = 1;
+ if (!strcmp(lgopts[opt_idx].name, PARAM_NUM_PROCS))
+ num_procs = atoi(optarg);
+ if (!strcmp(lgopts[opt_idx].name, PARAM_PROC_ID))
+ proc_id = atoi(optarg);
break;
case 'h':
usage(argv[0]);
- rte_exit(EXIT_SUCCESS, "Displayed help\n");
+ exit(EXIT_SUCCESS);
break;
default:
usage(argv[0]);
- printf("Invalid option: %s\n", argv[optind]);
+ fprintf(stderr, "Invalid option: %s\n", argv[optind]);
rte_exit(EXIT_FAILURE,
"Command line is incomplete or incorrect\n");
break;
if (optind != argc) {
usage(argv[0]);
- printf("Invalid parameter: %s\n", argv[optind]);
+ fprintf(stderr, "Invalid parameter: %s\n", argv[optind]);
rte_exit(EXIT_FAILURE, "Command line is incorrect\n");
}
rx_mode.offloads = rx_offloads;
tx_mode.offloads = tx_offloads;
- if (mempool_flags & MEMPOOL_F_NO_IOVA_CONTIG &&
+ if (mempool_flags & RTE_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 "