bonding:reset backup and inactive flag of slave
Eduard Sinelnikov (eduard.sinelnikov@gmail.com) found that if we change bonding mode from active backup to round robin, some slaves are still keeping "backup", and won't transmit packets. As Jay Vosburgh(fubar@us.ibm.com) pointed out that we can work around that by removing the bond_is_active_slave() check, because the "backup" flag is only meaningful for active backup mode. But if we just simply ignore the bond_is_active_slave() check, the transmission will work fine, but we can't maintain the correct value of "backup" flag for each slaves, though it is meaningless for other mode than active backup. I'd like to reset "backup" and "inactive" flag in bond_open, thus we can keep the correct value of them. As for bond_is_active_slave(), I'd like to prepare another patch to handle it. V2: Use C style comment. Move read_lock(&bond->curr_slave_lock). Replace restore with reset, for active backup mode, it means "restore", but for other modes, it means "reset". Signed-off-by: Weiping Pan <panweiping3@gmail.com> Reviewed-by: WANG Cong <xiyou.wangcong@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
8919bc13e8
Коммит
ba3211ccd0
|
@ -3419,9 +3419,27 @@ static int bond_xmit_hash_policy_l2(struct sk_buff *skb, int count)
|
||||||
static int bond_open(struct net_device *bond_dev)
|
static int bond_open(struct net_device *bond_dev)
|
||||||
{
|
{
|
||||||
struct bonding *bond = netdev_priv(bond_dev);
|
struct bonding *bond = netdev_priv(bond_dev);
|
||||||
|
struct slave *slave;
|
||||||
|
int i;
|
||||||
|
|
||||||
bond->kill_timers = 0;
|
bond->kill_timers = 0;
|
||||||
|
|
||||||
|
/* reset slave->backup and slave->inactive */
|
||||||
|
read_lock(&bond->lock);
|
||||||
|
if (bond->slave_cnt > 0) {
|
||||||
|
read_lock(&bond->curr_slave_lock);
|
||||||
|
bond_for_each_slave(bond, slave, i) {
|
||||||
|
if ((bond->params.mode == BOND_MODE_ACTIVEBACKUP)
|
||||||
|
&& (slave != bond->curr_active_slave)) {
|
||||||
|
bond_set_slave_inactive_flags(slave);
|
||||||
|
} else {
|
||||||
|
bond_set_slave_active_flags(slave);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
read_unlock(&bond->curr_slave_lock);
|
||||||
|
}
|
||||||
|
read_unlock(&bond->lock);
|
||||||
|
|
||||||
INIT_DELAYED_WORK(&bond->mcast_work, bond_resend_igmp_join_requests_delayed);
|
INIT_DELAYED_WORK(&bond->mcast_work, bond_resend_igmp_join_requests_delayed);
|
||||||
|
|
||||||
if (bond_is_lb(bond)) {
|
if (bond_is_lb(bond)) {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче