mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 02:19:51 +00:00
net: generic dev_disable_lro() stacked device handling
Large receive offloading is known to cause problems if received packets are passed to other host. Therefore the kernel disables it by calling dev_disable_lro() whenever a network device is enslaved in a bridge or forwarding is enabled for it (or globally). For virtual devices we need to disable LRO on the underlying physical device (which is actually receiving the packets). Current dev_disable_lro() code handles this propagation for a vlan (including 802.1ad nested vlan), macvlan or a vlan on top of a macvlan. It doesn't handle other stacked devices and their combinations, in particular propagation from a bond to its slaves which often causes problems in virtualization setups. As we now have generic data structures describing the upper-lower device relationship, dev_disable_lro() can be generalized to disable LRO also for all lower devices (if any) once it is disabled for the device itself. For bonding and teaming devices, it is necessary to disable LRO not only on current slaves at the moment when dev_disable_lro() is called but also on any slave (port) added later. v2: use lower device links for all devices (including vlan and macvlan) Signed-off-by: Michal Kubecek <mkubecek@suse.cz> Acked-by: Veaceslav Falico <vfalico@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
b6267d3e80
commit
fbe168ba91
3 changed files with 11 additions and 10 deletions
|
@ -1526,6 +1526,9 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
if (!(bond_dev->features & NETIF_F_LRO))
|
||||||
|
dev_disable_lro(slave_dev);
|
||||||
|
|
||||||
res = netdev_rx_handler_register(slave_dev, bond_handle_frame,
|
res = netdev_rx_handler_register(slave_dev, bond_handle_frame,
|
||||||
new_slave);
|
new_slave);
|
||||||
if (res) {
|
if (res) {
|
||||||
|
|
|
@ -1179,6 +1179,9 @@ static int team_port_add(struct team *team, struct net_device *port_dev)
|
||||||
goto err_enable_netpoll;
|
goto err_enable_netpoll;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!(dev->features & NETIF_F_LRO))
|
||||||
|
dev_disable_lro(port_dev);
|
||||||
|
|
||||||
err = netdev_rx_handler_register(port_dev, team_handle_frame,
|
err = netdev_rx_handler_register(port_dev, team_handle_frame,
|
||||||
port);
|
port);
|
||||||
if (err) {
|
if (err) {
|
||||||
|
|
|
@ -1437,22 +1437,17 @@ EXPORT_SYMBOL(dev_close);
|
||||||
*/
|
*/
|
||||||
void dev_disable_lro(struct net_device *dev)
|
void dev_disable_lro(struct net_device *dev)
|
||||||
{
|
{
|
||||||
/*
|
struct net_device *lower_dev;
|
||||||
* If we're trying to disable lro on a vlan device
|
struct list_head *iter;
|
||||||
* use the underlying physical device instead
|
|
||||||
*/
|
|
||||||
if (is_vlan_dev(dev))
|
|
||||||
dev = vlan_dev_real_dev(dev);
|
|
||||||
|
|
||||||
/* the same for macvlan devices */
|
|
||||||
if (netif_is_macvlan(dev))
|
|
||||||
dev = macvlan_dev_real_dev(dev);
|
|
||||||
|
|
||||||
dev->wanted_features &= ~NETIF_F_LRO;
|
dev->wanted_features &= ~NETIF_F_LRO;
|
||||||
netdev_update_features(dev);
|
netdev_update_features(dev);
|
||||||
|
|
||||||
if (unlikely(dev->features & NETIF_F_LRO))
|
if (unlikely(dev->features & NETIF_F_LRO))
|
||||||
netdev_WARN(dev, "failed to disable LRO!\n");
|
netdev_WARN(dev, "failed to disable LRO!\n");
|
||||||
|
|
||||||
|
netdev_for_each_lower_dev(dev, lower_dev, iter)
|
||||||
|
dev_disable_lro(lower_dev);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(dev_disable_lro);
|
EXPORT_SYMBOL(dev_disable_lro);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue