lkml.org 
[lkml]   [2016]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 42/53] team: Replace rcu_read_lock with a mutex in team_vlan_rx_kill_vid
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Ido Schimmel <idosch@mellanox.com>

    [ 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 <jiri@mellanox.com>
    Signed-off-by: Ido Schimmel <idosch@mellanox.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    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
    @@ -1636,10 +1636,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;
    }

    \
     
     \ /
      Last update: 2016-01-27 21:21    [W:4.280 / U:0.608 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site