Re: [PATCH net-2.6 2/3] bonding: Change active slave quietly when bond is down

[Jay Vosburgh <fubar@us.ibm.com>]

Ben Hutchings <bhutchings@solarflare.com> wrote:

>bond_change_active_slave() may be called when a slave is added, even
>if the bond has not been brought up yet.  It may then attempt to send
>packets, and further it may use mcast_work which is uninitialised
>before the bond is brought up.  Add the necessary checks for
>netif_running(bond->dev).

	I wondered if it would be better to instead arrange for
bond_change_active_slave (and bond_select_active_slave, which calls it)
to not be called when the bond is down, but that would require quite a
bit of change to bond_enslave and bond_open.

	-J

Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>


>Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
>---
> drivers/net/bonding/bond_main.c |   15 +++++++++------
> 1 files changed, 9 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
>index ef370c9..3b16c34 100644
>--- a/drivers/net/bonding/bond_main.c
>+++ b/drivers/net/bonding/bond_main.c
>@@ -1178,11 +1178,13 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active)
> 				bond_do_fail_over_mac(bond, new_active,
> 						      old_active);
>
>-			bond->send_grat_arp = bond->params.num_grat_arp;
>-			bond_send_gratuitous_arp(bond);
>+			if (netif_running(bond->dev)) {
>+				bond->send_grat_arp = bond->params.num_grat_arp;
>+				bond_send_gratuitous_arp(bond);
>
>-			bond->send_unsol_na = bond->params.num_unsol_na;
>-			bond_send_unsolicited_na(bond);
>+				bond->send_unsol_na = bond->params.num_unsol_na;
>+				bond_send_unsolicited_na(bond);
>+			}
>
> 			write_unlock_bh(&bond->curr_slave_lock);
> 			read_unlock(&bond->lock);
>@@ -1196,8 +1198,9 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active)
>
> 	/* resend IGMP joins since active slave has changed or
> 	 * all were sent on curr_active_slave */
>-	if ((USES_PRIMARY(bond->params.mode) && new_active) ||
>-	    bond->params.mode == BOND_MODE_ROUNDROBIN) {
>+	if (((USES_PRIMARY(bond->params.mode) && new_active) ||
>+	     bond->params.mode == BOND_MODE_ROUNDROBIN) &&
>+	    netif_running(bond->dev)) {
> 		bond->igmp_retrans = bond->params.resend_igmp;
> 		queue_delayed_work(bond->wq, &bond->mcast_work, 0);
> 	}
>-- 
>1.7.3.2
>
>
>
>-- 
>Ben Hutchings, Senior Software Engineer, Solarflare Communications
>Not speaking for my employer; that's the marketing department's job.
>They asked us to note that Solarflare product names are trademarked.
>
>--
>To unsubscribe from this list: send the line "unsubscribe netdev" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at  http://vger.kernel.org/majordomo-info.html