Skip to contentSkip to conversation

Patch "team: Replace rcu_read_lock with a mutex in team_vlan_rx_kill_vid" has been added to the 4.1-stable tree

PATCH [email protected] 1 participant 1 message Jan 27, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

team: Replace rcu_read_lock with a mutex in team_vlan_rx_kill_vid

to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
team-replace-rcu_read_lock-with-a-mutex-in-team_vlan_rx_kill_vid.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Tue Jan 26 21:37:04 PST 2016

From: Ido Schimmel <[email protected]>
Date: Mon, 18 Jan 2016 17:30:22 +0200
Subject: team: Replace rcu_read_lock with a mutex in team_vlan_rx_kill_vid

From: Ido Schimmel <[email protected]>

[ Upstream commit 60a6531bfe49555581ccd65f66a350cc5693fcde ]

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")
---
 drivers/net/team/team.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/team/team.c +3 -3
@@ -1845,10 +1845,10 @@ static int team_vlan_rx_kill_vid(struct
 	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;
 }

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/team-replace-rcu_read_lock-with-a-mutex-in-team_vlan_rx_kill_vid.patch