diff mbox

[net] team: Replace rcu_read_lock with a mutex in team_vlan_rx_kill_vid

Message ID 1453131022-23818-1-git-send-email-idosch@mellanox.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Ido Schimmel Jan. 18, 2016, 3:30 p.m. UTC 
We can't be within an RCU read-side critical section when deleting
VLANs, as underlying drivers might sleep during the hardware operation.
Therefore, replace the RCU critical section with a mutex. This is
consistent with team_vlan_rx_add_vid.

Fixes: 3d249d4ca7d0 ("net: introduce ethernet teaming device")
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
---
 drivers/net/team/team.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

David Miller Jan. 18, 2016, 4:55 p.m. UTC | #1 
From: Ido Schimmel <idosch@mellanox.com>
Date: Mon, 18 Jan 2016 17:30:22 +0200

> We can't be within an RCU read-side critical section when deleting
> VLANs, as underlying drivers might sleep during the hardware operation.
> Therefore, replace the RCU critical section with a mutex. This is
> consistent with team_vlan_rx_add_vid.
> 
> Fixes: 3d249d4ca7d0 ("net: introduce ethernet teaming device")
> Acked-by: Jiri Pirko <jiri@mellanox.com>
> Signed-off-by: Ido Schimmel <idosch@mellanox.com>

Applied and queued up for -stable, thanks.
diff mbox

Patch

diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 2528331..718ceea 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -1872,10 +1872,10 @@  static int team_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 vid)
 	struct team *team = netdev_priv(dev);
 	struct team_port *port;
 
-	rcu_read_lock();
-	list_for_each_entry_rcu(port, &team->port_list, list)
+	mutex_lock(&team->lock);
+	list_for_each_entry(port, &team->port_list, list)
 		vlan_vid_del(port->dev, proto, vid);
-	rcu_read_unlock();
+	mutex_unlock(&team->lock);
 
 	return 0;
 }