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

app/testpmd: fix config due to RSS offload check

Browse Source 
After add RSS hash offload check, default rss_hf  will fail on
devices that not support all bits, the patch take rss_hf as
a suggest value and only set bits that device supported base on
rte_eth_dev_get_info, also rss_hf will only be updated when new
rss offload is successfully updated on all ports by
"port config all rss [!default]" command.

Fixes: 8863a1fbfc66 ("ethdev: add supported hash function check")
Fixes: d9aa619c60b6 ("app/testpmd: new parameter for port config all RSS command")

Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
Tested-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
This commit is contained in:
Qi Zhang 2018-04-25 21:38:16 +08:00 committed by Ferruh Yigit
parent 01764b20c2
commit 9089296206
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2010,6 +2010,8 @@ cmd_config_rss_parsed(void *parsed_result,
struct cmd_config_rss *res = parsed_result;
struct rte_eth_rss_conf rss_conf = { .rss_key_len = 0, };
struct rte_eth_dev_info dev_info = { .flow_type_rss_offloads = 0, };
int use_default = 0;
int all_updated = 1;
int diag;
uint16_t i;
@ -2035,8 +2037,10 @@ cmd_config_rss_parsed(void *parsed_result,
rss_conf.rss_hf = ETH_RSS_GENEVE;
else if (!strcmp(res->value, "nvgre"))
rss_conf.rss_hf = ETH_RSS_NVGRE;
else if (!strcmp(res->value, "none") || !strcmp(res->value, "default"))
else if (!strcmp(res->value, "none"))
rss_conf.rss_hf = 0;
else if (!strcmp(res->value, "default"))
use_default = 1;
else if (isdigit(res->value[0]) && atoi(res->value) > 0 &&
atoi(res->value) < 64)
rss_conf.rss_hf = 1ULL << atoi(res->value);
@ -2046,18 +2050,21 @@ cmd_config_rss_parsed(void *parsed_result,
}
rss_conf.rss_key = NULL;
/* Update global configuration for RSS types. */
rss_hf = rss_conf.rss_hf;
RTE_ETH_FOREACH_DEV(i) {
if (!strcmp(res->value, "default")) {
if (use_default) {
rte_eth_dev_info_get(i, &dev_info);
rss_conf.rss_hf = dev_info.flow_type_rss_offloads;
}
diag = rte_eth_dev_rss_hash_update(i, &rss_conf);
if (diag < 0)
if (diag < 0) {
all_updated = 0;
printf("Configuration of RSS hash at ethernet port %d "
"failed with error (%d): %s.\n",
i, -diag, strerror(-diag));
}
}
if (all_updated && !use_default)
rss_hf = rss_conf.rss_hf;
}
cmdline_parse_token_string_t cmd_config_rss_port =

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

@ -2290,13 +2290,16 @@ init_port_config(void)
{
portid_t pid;
struct rte_port *port;
struct rte_eth_dev_info dev_info;
RTE_ETH_FOREACH_DEV(pid) {
port = &ports[pid];
port->dev_conf.fdir_conf = fdir_conf;
if (nb_rxq > 1) {
rte_eth_dev_info_get(pid, &dev_info);
port->dev_conf.rx_adv_conf.rss_conf.rss_key = NULL;
port->dev_conf.rx_adv_conf.rss_conf.rss_hf = rss_hf;
port->dev_conf.rx_adv_conf.rss_conf.rss_hf =
rss_hf & dev_info.flow_type_rss_offloads;
} else {
port->dev_conf.rx_adv_conf.rss_conf.rss_key = NULL;
port->dev_conf.rx_adv_conf.rss_conf.rss_hf = 0;