Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 876254ae authored by Veaceslav Falico's avatar Veaceslav Falico Committed by David S. Miller
Browse files

bonding: don't call update_speed_duplex() under spinlocks 



bond_update_speed_duplex() might sleep while calling underlying slave's
routines. Move it out of atomic context in bond_enslave() and remove it
from bond_miimon_commit() - it was introduced by commit 546add79, however
when the slave interfaces go up/change state it's their responsibility to
fire NETDEV_UP/NETDEV_CHANGE events so that bonding can properly update
their speed.

I've tested it on all combinations of ifup/ifdown, autoneg/speed/duplex
changes, remote-controlled and local, on (not) MII-based cards. All changes
are visible.

Signed-off-by: default avatarVeaceslav Falico <vfalico@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d35162f8

drivers/net/bonding/bond_main.c

+2 −4
Original line number Diff line number Diff line
@@ -1746,6 +1746,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) 


	bond_compute_features(bond);



	bond_update_speed_duplex(new_slave);



	read_lock(&bond->lock);



	new_slave->last_arp_rx = jiffies -
@@ -1798,8 +1800,6 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) 
		new_slave->link == BOND_LINK_DOWN ? "DOWN" :

			(new_slave->link == BOND_LINK_UP ? "UP" : "BACK"));



	bond_update_speed_duplex(new_slave);



	if (USES_PRIMARY(bond->params.mode) && bond->params.primary[0]) {

		/* if there is a primary slave, remember it */

		if (strcmp(bond->params.primary, new_slave->dev->name) == 0) {
@@ -2374,8 +2374,6 @@ static void bond_miimon_commit(struct bonding *bond) 
				bond_set_backup_slave(slave);

			}



			bond_update_speed_duplex(slave);



			pr_info("%s: link status definitely up for interface %s, %u Mbps %s duplex.\n",

				bond->dev->name, slave->dev->name,

				slave->speed, slave->duplex ? "full" : "half");