From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:42490 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753206AbcA0Gbl (ORCPT ); Wed, 27 Jan 2016 01:31:41 -0500 Subject: Patch "team: Replace rcu_read_lock with a mutex in team_vlan_rx_kill_vid" has been added to the 4.1-stable tree To: idosch@mellanox.com, davem@davemloft.net, gregkh@linuxfoundation.org, jiri@mellanox.com Cc: , From: Date: Tue, 26 Jan 2016 22:28:11 -0800 Message-ID: <1453876091226203@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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 know about it. >>From foo@baz Tue Jan 26 21:37:04 PST 2016 From: Ido Schimmel 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 [ 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") Acked-by: Jiri Pirko Signed-off-by: Ido Schimmel Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/team/team.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -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 idosch@mellanox.com are queue-4.1/team-replace-rcu_read_lock-with-a-mutex-in-team_vlan_rx_kill_vid.patch