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

Commit 4087df87 authored by Veaceslav Falico's avatar Veaceslav Falico Committed by David S. Miller
Browse files

bonding: rework bond_ab_arp_probe() to use bond_for_each_slave() 



Currently it uses the hard-to-rcuify bond_for_each_slave_from(), and also
it doesn't check every slave for disrepencies between the actual
IS_UP(slave) and the slave->link == BOND_LINK_UP, but only till we find the
next suitable slave.

Fix this by using bond_for_each_slave() and storing the first good slave in
*before till we find the current_arp_slave, after that we store the first good
slave in new_slave. If new_slave is empty - use the slave stored in before,
and if it's also empty - then we didn't find any suitable slave.

Also, in the meanwhile, check for each slave status.

CC: Jay Vosburgh <fubar@us.ibm.com>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: default avatarVeaceslav Falico <vfalico@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 77140d29

drivers/net/bonding/bond_main.c

+24 −14
Original line number Diff line number Diff line
@@ -2761,8 +2761,9 @@ static void bond_ab_arp_commit(struct bonding *bond) 
 */

static void bond_ab_arp_probe(struct bonding *bond)

{

	struct slave *slave, *next_slave;

	int i;

	struct slave *slave, *before = NULL, *new_slave = NULL;

	struct list_head *iter;

	bool found = false;



	read_lock(&bond->curr_slave_lock);
@@ -2792,18 +2793,12 @@ static void bond_ab_arp_probe(struct bonding *bond) 


	bond_set_slave_inactive_flags(bond->current_arp_slave);



	/* search for next candidate */

	next_slave = bond_next_slave(bond, bond->current_arp_slave);

	bond_for_each_slave_from(bond, slave, i, next_slave) {

		if (IS_UP(slave->dev)) {

			slave->link = BOND_LINK_BACK;

			bond_set_slave_active_flags(slave);

			bond_arp_send_all(bond, slave);

			slave->jiffies = jiffies;

			bond->current_arp_slave = slave;

			break;

		}

	bond_for_each_slave(bond, slave, iter) {

		if (!found && !before && IS_UP(slave->dev))

			before = slave;



		if (found && !new_slave && IS_UP(slave->dev))

			new_slave = slave;

		/* if the link state is up at this point, we

		 * mark it down - this can happen if we have

		 * simultaneous link failures and
@@ -2811,7 +2806,7 @@ static void bond_ab_arp_probe(struct bonding *bond) 
		 * one the current slave so it is still marked

		 * up when it is actually down

		 */

		if (slave->link == BOND_LINK_UP) {

		if (!IS_UP(slave->dev) && slave->link == BOND_LINK_UP) {

			slave->link = BOND_LINK_DOWN;

			if (slave->link_failure_count < UINT_MAX)

				slave->link_failure_count++;
@@ -2821,7 +2816,22 @@ static void bond_ab_arp_probe(struct bonding *bond) 
			pr_info("%s: backup interface %s is now down.\n",

				bond->dev->name, slave->dev->name);

		}

		if (slave == bond->current_arp_slave)

			found = true;

	}



	if (!new_slave && before)

		new_slave = before;



	if (!new_slave)

		return;



	new_slave->link = BOND_LINK_BACK;

	bond_set_slave_active_flags(new_slave);

	bond_arp_send_all(bond, new_slave);

	new_slave->jiffies = jiffies;

	bond->current_arp_slave = new_slave;



}



void bond_activebackup_arp_mon(struct work_struct *work)