app/testpmd: fix PF/VF check of flow director

Parameters pf & vf are added into most of flow director
filter CLIs.
But mac-vlan and tunnel filters don't have these parameters,
the parameters should not be checked for mac-vlan and tunnel
filters.

Fixes: e6a68c0133 ("app/testpmd: extend commands for flow director in VF")

Reported-by: Frederico Cadete <frederico.cadete-ext@oneaccess-net.com>
Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
This commit is contained in:
Wenzhuo Lu 2016-10-19 09:12:15 +08:00 committed by Thomas Monjalon
parent 479c4af301
commit 1cfde13610

View File

@ -8669,24 +8669,28 @@ cmd_flow_director_filter_parsed(void *parsed_result,
else
entry.action.behavior = RTE_ETH_FDIR_ACCEPT;
if (!strcmp(res->pf_vf, "pf"))
entry.input.flow_ext.is_vf = 0;
else if (!strncmp(res->pf_vf, "vf", 2)) {
struct rte_eth_dev_info dev_info;
if (fdir_conf.mode != RTE_FDIR_MODE_PERFECT_MAC_VLAN &&
fdir_conf.mode != RTE_FDIR_MODE_PERFECT_TUNNEL) {
if (!strcmp(res->pf_vf, "pf"))
entry.input.flow_ext.is_vf = 0;
else if (!strncmp(res->pf_vf, "vf", 2)) {
struct rte_eth_dev_info dev_info;
memset(&dev_info, 0, sizeof(dev_info));
rte_eth_dev_info_get(res->port_id, &dev_info);
errno = 0;
vf_id = strtoul(res->pf_vf + 2, &end, 10);
if (errno != 0 || *end != '\0' || vf_id >= dev_info.max_vfs) {
memset(&dev_info, 0, sizeof(dev_info));
rte_eth_dev_info_get(res->port_id, &dev_info);
errno = 0;
vf_id = strtoul(res->pf_vf + 2, &end, 10);
if (errno != 0 || *end != '\0' ||
vf_id >= dev_info.max_vfs) {
printf("invalid parameter %s.\n", res->pf_vf);
return;
}
entry.input.flow_ext.is_vf = 1;
entry.input.flow_ext.dst_id = (uint16_t)vf_id;
} else {
printf("invalid parameter %s.\n", res->pf_vf);
return;
}
entry.input.flow_ext.is_vf = 1;
entry.input.flow_ext.dst_id = (uint16_t)vf_id;
} else {
printf("invalid parameter %s.\n", res->pf_vf);
return;
}
/* set to report FD ID by default */