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

app/testpmd: fix max Rx packet length for VLAN packets

Browse Source 
When the max rx packet length is smaller than the sum of mtu size and
ether overhead size, it should be enlarged, otherwise the VLAN packets
will be dropped.

Removed the rx_offloads assignment for jumbo frame during command line
parsing, and set the correct jumbo frame flag if MTU size is larger than
the default value 'RTE_ETHER_MTU' within 'init_config()'.

Fixes: 384161e006 ("app/testpmd: adjust on the fly VLAN configuration")
Fixes: 35b2d13fd6 ("net: add rte prefix to ether defines")
Fixes: ce17eddefc ("ethdev: introduce Rx queue offloads API")
Fixes: 150c9ac2df ("app/testpmd: update Rx offload after setting MTU")
Cc: stable@dpdk.org

Signed-off-by: Steve Yang <stevex.yang@intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
This commit is contained in:
Steve Yang 2021-01-18 07:04:08 +00:00 committed by Ferruh Yigit
parent bf0f90d92d
commit 761c4d6690
4 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1886,7 +1886,6 @@ cmd_config_max_pkt_len_parsed(void *parsed_result,
RTE_ETH_FOREACH_DEV(pid) {
struct rte_port *port = &ports[pid];
uint64_t rx_offloads = port->dev_conf.rxmode.offloads;
if (!strcmp(res->name, "max-pkt-len")) {
if (res->value < RTE_ETHER_MIN_LEN) {
@ -1898,11 +1897,6 @@ cmd_config_max_pkt_len_parsed(void *parsed_result,
return;
port->dev_conf.rxmode.max_rx_pkt_len = res->value;
if (res->value > RTE_ETHER_MAX_LEN)
rx_offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME;
else
rx_offloads &= ~DEV_RX_OFFLOAD_JUMBO_FRAME;
port->dev_conf.rxmode.offloads = rx_offloads;
} else {
printf("Unknown parameter\n");
return;

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

@ -1434,7 +1434,7 @@ port_mtu_set(portid_t port_id, uint16_t mtu)
* device supports jumbo frame.
*/
eth_overhead = dev_info.max_rx_pktlen - dev_info.max_mtu;
if (mtu > RTE_ETHER_MAX_LEN - eth_overhead) {
if (mtu > RTE_ETHER_MTU) {
rte_port->dev_conf.rxmode.offloads |=
DEV_RX_OFFLOAD_JUMBO_FRAME;
rte_port->dev_conf.rxmode.max_rx_pkt_len =

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

@ -834,12 +834,9 @@ launch_args_parse(int argc, char** argv)
}
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);

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

@ -1410,6 +1410,7 @@ init_config(void)
struct rte_gro_param gro_param;
uint32_t gso_types;
uint16_t data_size;
uint16_t eth_overhead;
bool warning = 0;
int k;
int ret;
@ -1446,6 +1447,23 @@ init_config(void)
rte_exit(EXIT_FAILURE,
"rte_eth_dev_info_get() failed\n");
/* Update the max_rx_pkt_len to have MTU as RTE_ETHER_MTU */
if (port->dev_info.max_mtu != UINT16_MAX &&
port->dev_info.max_rx_pktlen > port->dev_info.max_mtu)
eth_overhead = port->dev_info.max_rx_pktlen -
port->dev_info.max_mtu;
else
eth_overhead =
RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN;
if (port->dev_conf.rxmode.max_rx_pkt_len <=
(uint32_t)(RTE_ETHER_MTU + eth_overhead))
port->dev_conf.rxmode.max_rx_pkt_len =
RTE_ETHER_MTU + eth_overhead;
else
port->dev_conf.rxmode.offloads |=
DEV_RX_OFFLOAD_JUMBO_FRAME;
if (!(port->dev_info.tx_offload_capa &
DEV_TX_OFFLOAD_MBUF_FAST_FREE))
port->dev_conf.txmode.offloads &=