Commit ca6b4fa8 authored by Ido Schimmel's avatar Ido Schimmel Committed by Luis Henriques

team: Replace rcu_read_lock with a mutex in team_vlan_rx_kill_vid

commit 60a6531b upstream.

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: 3d249d4c ("net: introduce ethernet teaming device")
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 76bf30d5
...@@ -1830,10 +1830,10 @@ static int team_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 vid) ...@@ -1830,10 +1830,10 @@ static int team_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 vid)
struct team *team = netdev_priv(dev); struct team *team = netdev_priv(dev);
struct team_port *port; struct team_port *port;
rcu_read_lock(); mutex_lock(&team->lock);
list_for_each_entry_rcu(port, &team->port_list, list) list_for_each_entry(port, &team->port_list, list)
vlan_vid_del(port->dev, proto, vid); vlan_vid_del(port->dev, proto, vid);
rcu_read_unlock(); mutex_unlock(&team->lock);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment