| Message ID | 1307243793-31007-1-git-send-email-panweiping3@gmail.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
On Sun, Jun 5, 2011 at 11:16 AM, Weiping Pan <panweiping3@gmail.com> wrote: > There is a bug that when you modify lacp_rate via sysfs, > 802.3ad won't use the new value of lacp_rate to transmit packets. > That is because port->actor_oper_port_state isn't changed. > > Change Notes: > v2) > 1 Hold read_lock(&bond->lock) when iterate slaves, suggested by Jiri Pirko. > 2 Modify actor_oper_port_state via a helper function in bond_3ad.c, > suggested by Jay Vosburgh. > 3 Hold slave->state_machine_lock, > so we can modify port->actor_oper_port_state, no matter bond is up or down. > > Signed-off-by: Weiping Pan <panweiping3@gmail.com> > --- > drivers/net/bonding/bond_3ad.c | 27 +++++++++++++++++++++++++++ > drivers/net/bonding/bond_3ad.h | 1 + > drivers/net/bonding/bond_sysfs.c | 1 + > 3 files changed, 29 insertions(+), 0 deletions(-) > > diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c > index c7537abc..5111e0d 100644 > --- a/drivers/net/bonding/bond_3ad.c > +++ b/drivers/net/bonding/bond_3ad.c > @@ -2473,3 +2473,30 @@ void bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond, > bond_3ad_rx_indication((struct lacpdu *) skb->data, slave, skb->len); > read_unlock(&bond->lock); > } > + > +/* > + * When modify lacp_rate parameter via sysfs, > + * update actor_oper_port_state of each port. > + * > + * Hold slave->state_machine_lock, > + * so we can modify port->actor_oper_port_state, > + * no matter bond is up or down. > + */ > +void bond_3ad_update_lacp_rate(struct bonding *bond) > +{ > + int i; > + struct slave *slave; > + struct port *port = NULL; > + > + read_lock(&bond->lock); > + bond_for_each_slave(bond, slave, i) { > + port = &(slave->ad_info.port); Please use SLAVE_AD_INFO(). Other than this, it looks good to me, Reviewed-by: WANG Cong <xiyou.wangcong@gmail.com> Thanks! -- 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_3ad.c b/drivers/net/bonding/bond_3ad.c index c7537abc..5111e0d 100644 --- a/drivers/net/bonding/bond_3ad.c +++ b/drivers/net/bonding/bond_3ad.c @@ -2473,3 +2473,30 @@ void bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond, bond_3ad_rx_indication((struct lacpdu *) skb->data, slave, skb->len); read_unlock(&bond->lock); } + +/* + * When modify lacp_rate parameter via sysfs, + * update actor_oper_port_state of each port. + * + * Hold slave->state_machine_lock, + * so we can modify port->actor_oper_port_state, + * no matter bond is up or down. + */ +void bond_3ad_update_lacp_rate(struct bonding *bond) +{ + int i; + struct slave *slave; + struct port *port = NULL; + + read_lock(&bond->lock); + bond_for_each_slave(bond, slave, i) { + port = &(slave->ad_info.port); + __get_state_machine_lock(port); + if (bond->params.lacp_fast) + port->actor_oper_port_state |= AD_STATE_LACP_TIMEOUT; + else + port->actor_oper_port_state &= ~AD_STATE_LACP_TIMEOUT; + __release_state_machine_lock(port); + } + read_unlock(&bond->lock); +} diff --git a/drivers/net/bonding/bond_3ad.h b/drivers/net/bonding/bond_3ad.h index 0ee3f16..e466faf 100644 --- a/drivers/net/bonding/bond_3ad.h +++ b/drivers/net/bonding/bond_3ad.h @@ -282,5 +282,6 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev); void bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond, struct slave *slave); int bond_3ad_set_carrier(struct bonding *bond); +void bond_3ad_update_lacp_rate(struct bonding *bond); #endif //__BOND_3AD_H__ diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c index 88fcb25..03d1196 100644 --- a/drivers/net/bonding/bond_sysfs.c +++ b/drivers/net/bonding/bond_sysfs.c @@ -804,6 +804,7 @@ static ssize_t bonding_store_lacp(struct device *d, if ((new_value == 1) || (new_value == 0)) { bond->params.lacp_fast = new_value; + bond_3ad_update_lacp_rate(bond); pr_info("%s: Setting LACP rate to %s (%d).\n", bond->dev->name, bond_lacp_tbl[new_value].modename, new_value);
There is a bug that when you modify lacp_rate via sysfs, 802.3ad won't use the new value of lacp_rate to transmit packets. That is because port->actor_oper_port_state isn't changed. Change Notes: v2) 1 Hold read_lock(&bond->lock) when iterate slaves, suggested by Jiri Pirko. 2 Modify actor_oper_port_state via a helper function in bond_3ad.c, suggested by Jay Vosburgh. 3 Hold slave->state_machine_lock, so we can modify port->actor_oper_port_state, no matter bond is up or down. Signed-off-by: Weiping Pan <panweiping3@gmail.com> --- drivers/net/bonding/bond_3ad.c | 27 +++++++++++++++++++++++++++ drivers/net/bonding/bond_3ad.h | 1 + drivers/net/bonding/bond_sysfs.c | 1 + 3 files changed, 29 insertions(+), 0 deletions(-)