Commit 4cb4f97b authored by dingtianhong's avatar dingtianhong Committed by David S. Miller
Browse files

bonding: rebuild the lock use for bond_mii_monitor() 



The bond_mii_monitor() still use bond lock to protect bond slave list,
it is no effect, I have 2 way to fix the problem, move the RTNL to the
top of the function, or add RCU to protect the bond slave list,
according to the Jay Vosburgh's opinion, 10 times one second is a
truely big performance loss if use RTNL to protect the whole monitor,
so I would take the advice and use RCU to protect the bond slave list.

The bond_has_slave() will not protect by anything, there will no things
happen if the slave list is be changed, unless the bond was free, but
it will not happened before the monitor, the bond will closed before
be freed.

The peers notify for the bond will calling curr_active_slave, so
derefence the slave to make sure we will accessing the same slave
if the curr_active_slave changed, as the rcu dereference need in
read-side critical sector and bond_change_active_slave() will call
it with no RCU hold,  so add peer notify in rcu_read_lock which
will be nested in monitor.

Suggested-by: default avatarJay Vosburgh <fubar@us.ibm.com>
Suggested-by: default avatarVeaceslav Falico <vfalico@redhat.com>
Signed-off-by: default avatarDing Tianhong <dingtianhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b2e7aceb

drivers/net/bonding/bond_main.c

+11 −13
Original line number Original line Diff line number Diff line
@@ -815,7 +815,11 @@ static struct slave *bond_find_best_slave(struct bonding *bond) 




static bool bond_should_notify_peers(struct bonding *bond)

static bool bond_should_notify_peers(struct bonding *bond)

{

{

	struct slave *slave = bond->curr_active_slave;

	struct slave *slave;



	rcu_read_lock();

	slave = rcu_dereference(bond->curr_active_slave);

	rcu_read_unlock();





	pr_debug("bond_should_notify_peers: bond %s slave %s\n",

	pr_debug("bond_should_notify_peers: bond %s slave %s\n",

		 bond->dev->name, slave ? slave->dev->name : "NULL");

		 bond->dev->name, slave ? slave->dev->name : "NULL");
@@ -1919,7 +1923,7 @@ static int bond_miimon_inspect(struct bonding *bond) 




	ignore_updelay = !bond->curr_active_slave ? true : false;

	ignore_updelay = !bond->curr_active_slave ? true : false;





	bond_for_each_slave(bond, slave, iter) {

	bond_for_each_slave_rcu(bond, slave, iter) {

		slave->new_link = BOND_LINK_NOCHANGE;

		slave->new_link = BOND_LINK_NOCHANGE;





		link_state = bond_check_dev_link(bond, slave->dev, 0);

		link_state = bond_check_dev_link(bond, slave->dev, 0);
@@ -2117,41 +2121,35 @@ void bond_mii_monitor(struct work_struct *work) 
	bool should_notify_peers = false;

	bool should_notify_peers = false;

	unsigned long delay;

	unsigned long delay;





	read_lock(&bond->lock);



	delay = msecs_to_jiffies(bond->params.miimon);

	delay = msecs_to_jiffies(bond->params.miimon);





	if (!bond_has_slaves(bond))

	if (!bond_has_slaves(bond))

		goto re_arm;

		goto re_arm;





	rcu_read_lock();



	should_notify_peers = bond_should_notify_peers(bond);

	should_notify_peers = bond_should_notify_peers(bond);





	if (bond_miimon_inspect(bond)) {

	if (bond_miimon_inspect(bond)) {

		read_unlock(&bond->lock);

		rcu_read_unlock();





		/* Race avoidance with bond_close cancel of workqueue */

		/* Race avoidance with bond_close cancel of workqueue */

		if (!rtnl_trylock()) {

		if (!rtnl_trylock()) {

			read_lock(&bond->lock);

			delay = 1;

			delay = 1;

			should_notify_peers = false;

			should_notify_peers = false;

			goto re_arm;

			goto re_arm;

		}

		}





		read_lock(&bond->lock);



		bond_miimon_commit(bond);

		bond_miimon_commit(bond);





		read_unlock(&bond->lock);

		rtnl_unlock();	/* might sleep, hold no other locks */

		rtnl_unlock();	/* might sleep, hold no other locks */

		read_lock(&bond->lock);

	} else

	}

		rcu_read_unlock();





re_arm:

re_arm:

	if (bond->params.miimon)

	if (bond->params.miimon)

		queue_delayed_work(bond->wq, &bond->mii_work, delay);

		queue_delayed_work(bond->wq, &bond->mii_work, delay);





	read_unlock(&bond->lock);



	if (should_notify_peers) {

	if (should_notify_peers) {

		if (!rtnl_trylock())

		if (!rtnl_trylock())

			return;

			return;

CRA Git | Maintained and supported by SUSTech CRA and CCSE