Skip to content

Commit b848521

Browse files
hyperenjuanguy11
authored andcommitted
iavf: fix netdev->max_mtu to respect actual hardware limit
iavf sets LIBIE_MAX_MTU as netdev->max_mtu, ignoring vf_res->max_mtu from PF [1]. This allows setting an MTU beyond the actual hardware limit, causing TX queue timeouts [2]. Set correct netdev->max_mtu using vf_res->max_mtu from the PF. Note that currently PF drivers such as ice/i40e set the frame size in vf_res->max_mtu, not MTU. Convert vf_res->max_mtu to MTU before setting netdev->max_mtu. [1] # ip -j -d link show $DEV | jq '.[0].max_mtu' 16356 [2] iavf 0000:00:05.0 enp0s5: NETDEV WATCHDOG: CPU: 1: transmit queue 0 timed out 5692 ms iavf 0000:00:05.0 enp0s5: NIC Link is Up Speed is 10 Gbps Full Duplex iavf 0000:00:05.0 enp0s5: NETDEV WATCHDOG: CPU: 6: transmit queue 3 timed out 5312 ms iavf 0000:00:05.0 enp0s5: NIC Link is Up Speed is 10 Gbps Full Duplex ... Fixes: 5fa4caf ("iavf: switch to Page Pool") Signed-off-by: Kohei Enju <kohei@enjuk.jp> Reviewed-by: Alexander Lobakin <aleksander.lobakin@intel.com> Reviewed-by: Simon Horman <horms@kernel.org> Tested-by: Rafal Romanowski <rafal.romanowski@intel.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
1 parent 636cc3b commit b848521

1 file changed

Lines changed: 16 additions & 1 deletion

File tree

drivers/net/ethernet/intel/iavf/iavf_main.c

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2793,7 +2793,22 @@ static void iavf_init_config_adapter(struct iavf_adapter *adapter)
27932793
netdev->watchdog_timeo = 5 * HZ;
27942794

27952795
netdev->min_mtu = ETH_MIN_MTU;
2796-
netdev->max_mtu = LIBIE_MAX_MTU;
2796+
2797+
/* PF/VF API: vf_res->max_mtu is max frame size (not MTU).
2798+
* Convert to MTU.
2799+
*/
2800+
if (!adapter->vf_res->max_mtu) {
2801+
netdev->max_mtu = LIBIE_MAX_MTU;
2802+
} else if (adapter->vf_res->max_mtu < LIBETH_RX_LL_LEN + ETH_MIN_MTU ||
2803+
adapter->vf_res->max_mtu >
2804+
LIBETH_RX_LL_LEN + LIBIE_MAX_MTU) {
2805+
netdev_warn_once(adapter->netdev,
2806+
"invalid max frame size %d from PF, using default MTU %d",
2807+
adapter->vf_res->max_mtu, LIBIE_MAX_MTU);
2808+
netdev->max_mtu = LIBIE_MAX_MTU;
2809+
} else {
2810+
netdev->max_mtu = adapter->vf_res->max_mtu - LIBETH_RX_LL_LEN;
2811+
}
27972812

27982813
if (!is_valid_ether_addr(adapter->hw.mac.addr)) {
27992814
dev_info(&pdev->dev, "Invalid MAC address %pM, using random\n",

0 commit comments

Comments
 (0)