lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bonding: simplify bond_3ad_update_lacp_rate and use RTNL for sync

Browse Source 
We can drop the use of bond->lock for mutual exclusion in
bond_3ad_update_lacp_rate and use RTNL in the sysfs store function
instead. This way we'll prevent races with mode change and interface
up/down as well as simplify update_lacp_rate by removing the check for
port->slave because it'll always be initialized (done while enslaving
with RTNL). This change will also help in the future removal of reader
bond->lock from bond_enslave.

Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
nikolay@redhat.com
2013-09-02 13:51:40 +02:00
committed by David S. Miller
parent ee8487c0e1
commit c509316b5b
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/bonding/bond_3ad.c
View File

@@ -2514,17 +2514,13 @@ int bond_3ad_lacpdu_recv(const struct sk_buff *skb, struct bonding *bond,
*/ */
void bond_3ad_update_lacp_rate(struct bonding *bond) void bond_3ad_update_lacp_rate(struct bonding *bond)
{ {
struct slave *slave;
struct port *port = NULL; struct port *port = NULL;
struct slave *slave;
int lacp_fast; int lacp_fast;
write_lock_bh(&bond->lock);
lacp_fast = bond->params.lacp_fast; lacp_fast = bond->params.lacp_fast;
bond_for_each_slave(bond, slave) { bond_for_each_slave(bond, slave) {
port = &(SLAVE_AD_INFO(slave).port); port = &(SLAVE_AD_INFO(slave).port);
if (port->slave == NULL)
continue;
__get_state_machine_lock(port); __get_state_machine_lock(port);
if (lacp_fast) if (lacp_fast)
port->actor_oper_port_state |= AD_STATE_LACP_TIMEOUT; port->actor_oper_port_state |= AD_STATE_LACP_TIMEOUT;
@@ -2532,6 +2528,4 @@ void bond_3ad_update_lacp_rate(struct bonding *bond)
port->actor_oper_port_state &= ~AD_STATE_LACP_TIMEOUT; port->actor_oper_port_state &= ~AD_STATE_LACP_TIMEOUT;
__release_state_machine_lock(port); __release_state_machine_lock(port);
} }
write_unlock_bh(&bond->lock);
} }

7
drivers/net/bonding/bond_sysfs.c
View File

@@ -852,8 +852,11 @@ static ssize_t bonding_store_lacp(struct device *d,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
int new_value, ret = count;
struct bonding *bond = to_bond(d); struct bonding *bond = to_bond(d);
int new_value, ret = count;
if (!rtnl_trylock())
return restart_syscall();
if (bond->dev->flags & IFF_UP) { if (bond->dev->flags & IFF_UP) {
pr_err("%s: Unable to update LACP rate because interface is up.\n", pr_err("%s: Unable to update LACP rate because interface is up.\n",
@@ -883,6 +886,8 @@ static ssize_t bonding_store_lacp(struct device *d,
ret = -EINVAL; ret = -EINVAL;
} }
out: out:
rtnl_unlock();
return ret; return ret;
} }
static DEVICE_ATTR(lacp_rate, S_IRUGO | S_IWUSR, static DEVICE_ATTR(lacp_rate, S_IRUGO | S_IWUSR,