d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

app/testpmd: support unidirectional configuration

Browse Source 
Added testpmd support to validate zero nb_rxq/nb_txq
changes of ethdev (d505ba8).

Signed-off-by: Reshma Pattan <reshma.pattan@intel.com>
Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
This commit is contained in:
Reshma Pattan 2016-03-11 15:16:55 +00:00 committed by Thomas Monjalon
parent e04f6a64f1
commit 5a8fb55c48
3 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/test-pmd/cmdline.c
View File

@ -1,7 +1,7 @@
/*-
* BSD LICENSE
*
* Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
* Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
* Copyright(c) 2014 6WIND S.A.
* All rights reserved.
*
@ -1190,17 +1190,16 @@ cmd_config_rx_tx_parsed(void *parsed_result,
printf("Please stop all ports first\n");
return;
}
if (!strcmp(res->name, "rxq")) {
if (res->value <= 0) {
printf("rxq %d invalid - must be > 0\n", res->value);
if (!res->value && !nb_txq) {
printf("Warning: Either rx or tx queues should be non zero\n");
return;
}
nb_rxq = res->value;
}
else if (!strcmp(res->name, "txq")) {
if (res->value <= 0) {
printf("txq %d invalid - must be > 0\n", res->value);
if (!res->value && !nb_rxq) {
printf("Warning: Either rx or tx queues should be non zero\n");
return;
}
nb_txq = res->value;

14
app/test-pmd/parameters.c
View File

@ -1,7 +1,7 @@
/*-
* BSD LICENSE
*
* Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
* Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -810,22 +810,26 @@ 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 && n <= (int) MAX_QUEUE_ID)
nb_rxq = (queueid_t) n;
else
rte_exit(EXIT_FAILURE, "rxq %d invalid - must be"
" >= 1 && <= %d\n", n,
" >= 0 && <= %d\n", n,
(int) MAX_QUEUE_ID);
}
if (!strcmp(lgopts[opt_idx].name, "txq")) {
n = atoi(optarg);
if (n >= 1 && n <= (int) MAX_QUEUE_ID)
if (n >= 0 && n <= (int) MAX_QUEUE_ID)
nb_txq = (queueid_t) n;
else
rte_exit(EXIT_FAILURE, "txq %d invalid - must be"
" >= 1 && <= %d\n", n,
" >= 0 && <= %d\n", n,
(int) MAX_QUEUE_ID);
}
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))

28
app/test-pmd/testpmd.c
View File

@ -1,7 +1,7 @@
/*-
* BSD LICENSE
*
* Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
* Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -608,6 +608,7 @@ init_fwd_streams(void)
portid_t pid;
struct rte_port *port;
streamid_t sm_id, nb_fwd_streams_new;
queueid_t q;
/* set socket id according to numa or not */
FOREACH_PORT(pid, ports) {
@ -643,7 +644,12 @@ init_fwd_streams(void)
}
}
nb_fwd_streams_new = (streamid_t)(nb_ports * nb_rxq);
q = RTE_MAX(nb_rxq, nb_txq);
if (q == 0) {
printf("Fail: Cannot allocate fwd streams as number of queues is 0\n");
return -1;
}
nb_fwd_streams_new = (streamid_t)(nb_ports * q);
if (nb_fwd_streams_new == nb_fwd_streams)
return 0;
/* clear the old */
@ -955,6 +961,19 @@ start_packet_forwarding(int with_tx_first)
portid_t pt_id;
streamid_t sm_id;
if (strcmp(cur_fwd_eng->fwd_mode_name, "rxonly") == 0 && !nb_rxq)
rte_exit(EXIT_FAILURE, "rxq are 0, cannot use rxonly fwd mode\n");
if (strcmp(cur_fwd_eng->fwd_mode_name, "txonly") == 0 && !nb_txq)
rte_exit(EXIT_FAILURE, "txq are 0, cannot use txonly fwd mode\n");
if ((strcmp(cur_fwd_eng->fwd_mode_name, "rxonly") != 0 &&
strcmp(cur_fwd_eng->fwd_mode_name, "txonly") != 0) &&
(!nb_rxq || !nb_txq))
rte_exit(EXIT_FAILURE,
"Either rxq or txq are 0, cannot use %s fwd mode\n",
cur_fwd_eng->fwd_mode_name);
if (all_ports_started() == 0) {
printf("Not all ports were started\n");
return;
@ -2037,7 +2056,10 @@ main(int argc, char** argv)
if (argc > 1)
launch_args_parse(argc, argv);
if (nb_rxq > nb_txq)
if (!nb_rxq && !nb_txq)
printf("Warning: Either rx or tx queues should be non-zero\n");
if (nb_rxq > 1 && nb_rxq > nb_txq)
printf("Warning: nb_rxq=%d enables RSS configuration, "
"but nb_txq=%d will prevent to fully test it.\n",
nb_rxq, nb_txq);