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

Commit b9f60253 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

bonding: make ab_arp select active slaves as other modes 



When I was implementing primary_passive option (formely named primary_lazy) I've
run into troubles with ab_arp. This is the only mode which is not using
bond_select_active_slave() function to select active slave and instead it
selects it itself. This seems to be not the right behaviour and it would be
better to do it in bond_select_active_slave() for all cases. This patch makes
this happen. Please review.

Signed-off-by: default avatarJiri Pirko <jpirko@redhat.com>
Signed-off-by: default avatarJay Vosburgh <fubar@us.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c127bdf9

drivers/net/bonding/bond_main.c

+35 −87
Original line number Diff line number Diff line
@@ -1093,15 +1093,8 @@ static struct slave *bond_find_best_slave(struct bonding *bond) 
			return NULL; /* still no slave, return NULL */

	}



	/*

	 * first try the primary link; if arping, a link must tx/rx

	 * traffic before it can be considered the curr_active_slave.

	 * also, we would skip slaves between the curr_active_slave

	 * and primary_slave that may be up and able to arp

	 */

	if ((bond->primary_slave) &&

	    (!bond->params.arp_interval) &&

	    (IS_UP(bond->primary_slave->dev))) {

	    bond->primary_slave->link == BOND_LINK_UP) {

		new_active = bond->primary_slave;

	}
@@ -1109,10 +1102,10 @@ static struct slave *bond_find_best_slave(struct bonding *bond) 
	old_active = new_active;



	bond_for_each_slave_from(bond, new_active, i, old_active) {

		if (IS_UP(new_active->dev)) {

		if (new_active->link == BOND_LINK_UP) {

			return new_active;

			} else if (new_active->link == BOND_LINK_BACK) {

		} else if (new_active->link == BOND_LINK_BACK &&

			   IS_UP(new_active->dev)) {

			/* link up, but waiting for stabilization */

			if (new_active->delay < mintime) {

				mintime = new_active->delay;
@@ -1120,7 +1113,6 @@ static struct slave *bond_find_best_slave(struct bonding *bond) 
			}

		}

	}

	}



	return bestslave;

}
@@ -2932,18 +2924,6 @@ static int bond_ab_arp_inspect(struct bonding *bond, int delta_in_ticks) 
		}

	}



	read_lock(&bond->curr_slave_lock);



	/*

	 * Trigger a commit if the primary option setting has changed.

	 */

	if (bond->primary_slave &&

	    (bond->primary_slave != bond->curr_active_slave) &&

	    (bond->primary_slave->link == BOND_LINK_UP))

		commit++;



	read_unlock(&bond->curr_slave_lock);



	return commit;

}
@@ -2964,90 +2944,58 @@ static void bond_ab_arp_commit(struct bonding *bond, int delta_in_ticks) 
			continue;



		case BOND_LINK_UP:

			write_lock_bh(&bond->curr_slave_lock);



			if (!bond->curr_active_slave &&

			    time_before_eq(jiffies, dev_trans_start(slave->dev) +

					   delta_in_ticks)) {

			if ((!bond->curr_active_slave &&

			     time_before_eq(jiffies,

					    dev_trans_start(slave->dev) +

					    delta_in_ticks)) ||

			    bond->curr_active_slave != slave) {

				slave->link = BOND_LINK_UP;

				bond_change_active_slave(bond, slave);

				bond->current_arp_slave = NULL;



				pr_info(DRV_NAME

				       ": %s: %s is up and now the "

				       "active interface\n",

					": %s: link status definitely "

					"up for interface %s.\n",

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



			} else if (bond->curr_active_slave != slave) {

				/* this slave has just come up but we

				 * already have a current slave; this can

				 * also happen if bond_enslave adds a new

				 * slave that is up while we are searching

				 * for a new slave

				 */

				slave->link = BOND_LINK_UP;

				bond_set_slave_inactive_flags(slave);

				bond->current_arp_slave = NULL;

				if (!bond->curr_active_slave ||

				    (slave == bond->primary_slave))

					goto do_failover;



				pr_info(DRV_NAME

				       ": %s: backup interface %s is now up\n",

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

			}



			write_unlock_bh(&bond->curr_slave_lock);



			break;

			continue;



		case BOND_LINK_DOWN:

			if (slave->link_failure_count < UINT_MAX)

				slave->link_failure_count++;



			slave->link = BOND_LINK_DOWN;

			bond_set_slave_inactive_flags(slave);



			if (slave == bond->curr_active_slave) {

			pr_info(DRV_NAME

				       ": %s: link status down for active "

				": %s: link status definitely down for "

				"interface %s, disabling it\n",

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



				bond_set_slave_inactive_flags(slave);



				write_lock_bh(&bond->curr_slave_lock);



				bond_select_active_slave(bond);

				if (bond->curr_active_slave)

					bond->curr_active_slave->jiffies =

						jiffies;



				write_unlock_bh(&bond->curr_slave_lock);



			if (slave == bond->curr_active_slave) {

				bond->current_arp_slave = NULL;



			} else if (slave->state == BOND_STATE_BACKUP) {

				pr_info(DRV_NAME

				       ": %s: backup interface %s is now down\n",

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



				bond_set_slave_inactive_flags(slave);

				goto do_failover;

			}

			break;



			continue;



		default:

			pr_err(DRV_NAME

			       ": %s: impossible: new_link %d on slave %s\n",

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

			       slave->dev->name);

		}

			continue;

		}



	/*

	 * No race with changes to primary via sysfs, as we hold rtnl.

	 */

	if (bond->primary_slave &&

	    (bond->primary_slave != bond->curr_active_slave) &&

	    (bond->primary_slave->link == BOND_LINK_UP)) {

do_failover:

		ASSERT_RTNL();

		write_lock_bh(&bond->curr_slave_lock);

		bond_change_active_slave(bond, bond->primary_slave);

		bond_select_active_slave(bond);

		write_unlock_bh(&bond->curr_slave_lock);

	}