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

app/testpmd: check vlan filter configuration

Browse Source 
This patch modifies testpmd behavior when setting:
rx_vlan add all vf_port (enabling all vlanids
to be passed thru rx filter on VF).
Rx_vlan_all_filter_set() function,
checks if the next vlanid can be enabled by the driver.
Number of vlanids is limited by the NIC and thus the NIC
do not allow to enable more vlanids than it can allocate
in VFTA table.

Signed-off-by: Michal Jastrzebski <michalx.k.jastrzebski@intel.com>
Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
This commit is contained in:
Michal Jastrzebski 2015-02-20 11:26:12 +01:00 committed by Thomas Monjalon
parent a7dde4ff0d
commit 64b01ee0b2
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1679,21 +1679,22 @@ rx_vlan_filter_set(portid_t port_id, int on)
"diag=%d\n", port_id, on, diag);
}
void
int
rx_vft_set(portid_t port_id, uint16_t vlan_id, int on)
{
int diag;
if (port_id_is_invalid(port_id, ENABLED_WARN))
return;
return 1;
if (vlan_id_is_invalid(vlan_id))
return;
return 1;
diag = rte_eth_dev_vlan_filter(port_id, vlan_id, on);
if (diag == 0)
return;
return 0;
printf("rte_eth_dev_vlan_filter(port_pi=%d, vlan_id=%d, on=%d) failed "
"diag=%d\n",
port_id, vlan_id, on, diag);
return -1;
}
void
@ -1703,8 +1704,10 @@ rx_vlan_all_filter_set(portid_t port_id, int on)
if (port_id_is_invalid(port_id, ENABLED_WARN))
return;
for (vlan_id = 0; vlan_id < 4096; vlan_id++)
rx_vft_set(port_id, vlan_id, on);
for (vlan_id = 0; vlan_id < 4096; vlan_id++) {
if (rx_vft_set(port_id, vlan_id, on))
break;
}
}
void

2
app/test-pmd/testpmd.h
View File

@ -508,7 +508,7 @@ void rx_vlan_strip_set_on_queue(portid_t port_id, uint16_t queue_id, int on);
void rx_vlan_filter_set(portid_t port_id, int on);
void rx_vlan_all_filter_set(portid_t port_id, int on);
void rx_vft_set(portid_t port_id, uint16_t vlan_id, int on);
int rx_vft_set(portid_t port_id, uint16_t vlan_id, int on);
void vlan_extend_set(portid_t port_id, int on);
void vlan_tpid_set(portid_t port_id, uint16_t tp_id);
void tx_vlan_set(portid_t port_id, uint16_t vlan_id);

4
lib/librte_ether/rte_ethdev.c
View File

@ -2002,8 +2002,8 @@ rte_eth_dev_vlan_filter(uint8_t port_id, uint16_t vlan_id, int on)
return (-EINVAL);
}
FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_filter_set, -ENOTSUP);
(*dev->dev_ops->vlan_filter_set)(dev, vlan_id, on);
return (0);
return (*dev->dev_ops->vlan_filter_set)(dev, vlan_id, on);
}
int