Skip to content

Commit

Permalink
app/testpmd: fix MTU after device configure
Browse files Browse the repository at this point in the history
[ upstream commit 1c21ee9 ]

In 'rte_eth_dev_configure()', if 'DEV_RX_OFFLOAD_JUMBO_FRAME' is not set
the max frame size is limited to 'RTE_ETHER_MAX_LEN' (1518).
This is mistake because for the PMDs that has frame size bigger than
"RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN" (18 bytes), the MTU becomes
less than 1500, causing a valid frame with 1500 bytes payload to be
dropped.

Since 'rte_eth_dev_set_mtu()' works as expected, it is called after
'rte_eth_dev_configure()' to fix the MTU.
It may look redundant to set MTU after 'rte_eth_dev_configure()', both
with default values, but it is not, the resulting MTU config can be
different in the device based on frame overhead of the PMD.

And instead of setting the MTU to default value, it is first get via
'rte_eth_dev_get_mtu()' and set again, this is to cover cases MTU
changed from testpmd command line.

'rte_eth_dev_set_mtu()', '-ENOTSUP' error is ignored to prevent
irrelevant warning messages for the virtual PMDs.

Fixes: af75078 ("first public release")

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Reviewed-by: Qi Zhang <qi.z.zhang@intel.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Tested-by: Igor Romanov <igor.romanov@oktetlabs.ru>
  • Loading branch information
Ferruh Yigit authored and bluca committed Nov 16, 2020
1 parent 4089c1d commit 3c70f73
Showing 1 changed file with 19 additions and 0 deletions.
19 changes: 19 additions & 0 deletions app/test-pmd/testpmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -2334,6 +2334,8 @@ start_port(portid_t pid)
}

if (port->need_reconfig > 0) {
uint16_t mtu = RTE_ETHER_MTU;

port->need_reconfig = 0;

if (flow_isolate_all) {
Expand Down Expand Up @@ -2367,6 +2369,23 @@ start_port(portid_t pid)
port->need_reconfig = 1;
return -1;
}

/*
* Workaround for rte_eth_dev_configure(), max_rx_pkt_len
* set MTU wrong for the PMDs that have frame overhead
* bigger than RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN.
* For a PMD that has 26 bytes overhead, rte_eth_dev_configure()
* can set MTU to max 1492, not to expected 1500 bytes.
* Using rte_eth_dev_set_mtu() to be able to set MTU correctly,
* default MTU value is 1500.
*/
diag = rte_eth_dev_get_mtu(pi, &mtu);
if (diag)
printf("Failed to get MTU for port %d\n", pi);
diag = rte_eth_dev_set_mtu(pi, mtu);
if (diag != 0 && diag != -ENOTSUP)
printf("Failed to set MTU to %u for port %d\n",
mtu, pi);
}
if (port->need_reconfig_queues > 0) {
port->need_reconfig_queues = 0;
Expand Down

0 comments on commit 3c70f73

Please sign in to comment.