Message ID | 1396339327-24899-1-git-send-email-zheng.x.li@oracle.com |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
On 04/01/2014 10:02 AM, Zheng Li wrote: > bond_open is not setting the inactive flag correctly for some modes (alb and > tlb), resulting in error behavior if the bond has been administratively set > down and then back up. This effect should not occur when slaves are added while > the bond is up; it's something that only happens after a down/up bounce of the > bond. > > For example, in bond tlb or alb mode, domu send some ARP request which go out > from dom0 bond's active slave, then the ARP broadcast request packets go back to > inactive slave from switch, because the inactive slave's inactive flag is zero, > kernel will receive the packets and pass them to bridge that cause dom0's bridge > map domu's MAC address to port of bond, bridge should map domu's MAC to port of > vif. > > Signed-off-by: Zheng Li <zheng.x.li@oracle.com> > Signed-off-by: Jay Vosburgh <j.vosburgh@gmail.com> > --- > drivers/net/bonding/bond_main.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c > index e5628fc..f97d72e 100644 > --- a/drivers/net/bonding/bond_main.c > +++ b/drivers/net/bonding/bond_main.c > @@ -3058,7 +3058,7 @@ static int bond_open(struct net_device *bond_dev) > if (bond_has_slaves(bond)) { > read_lock(&bond->curr_slave_lock); > bond_for_each_slave(bond, slave, iter) { > - if ((bond->params.mode == BOND_MODE_ACTIVEBACKUP) > + if ((bond->params.mode == BOND_MODE_ACTIVEBACKUP || bond_is_lb(bond)) IIRC, this check is identical to USES_PRIMARY(). > && (slave != bond->curr_active_slave)) { > bond_set_slave_inactive_flags(slave, > BOND_SLAVE_NOTIFY_NOW); > -- 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
From: Zheng Li <zheng.x.li@oracle.com> Date: Tue, 1 Apr 2014 16:02:07 +0800 > - if ((bond->params.mode == BOND_MODE_ACTIVEBACKUP) > + if ((bond->params.mode == BOND_MODE_ACTIVEBACKUP || bond_is_lb(bond)) As has been suggested, please use USES_PRIMARY() for this entire logical test. -- 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
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index e5628fc..f97d72e 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -3058,7 +3058,7 @@ static int bond_open(struct net_device *bond_dev) if (bond_has_slaves(bond)) { read_lock(&bond->curr_slave_lock); bond_for_each_slave(bond, slave, iter) { - if ((bond->params.mode == BOND_MODE_ACTIVEBACKUP) + if ((bond->params.mode == BOND_MODE_ACTIVEBACKUP || bond_is_lb(bond)) && (slave != bond->curr_active_slave)) { bond_set_slave_inactive_flags(slave, BOND_SLAVE_NOTIFY_NOW);