]> git.baikalelectronics.ru Git - kernel.git/commit
team: Fix possible deadlock during team enslave
authorIdo Schimmel <idosch@mellanox.com>
Mon, 20 Jun 2016 08:53:20 +0000 (11:53 +0300)
committerDavid S. Miller <davem@davemloft.net>
Wed, 22 Jun 2016 20:31:03 +0000 (16:31 -0400)
commit6a4933af7ed3fa861364108b6ba1e1d23a65860a
tree368b4821032c4965e23338627a0257b37a398f9d
parentd5644e898749b2032036686347789b80bb3ad740
team: Fix possible deadlock during team enslave

Both dev_uc_sync_multiple() and dev_mc_sync_multiple() require the
source device to be locked by netif_addr_lock_bh(), but this is missing
in team's enslave function, so add it.

This fixes the following lockdep warning:

Possible interrupt unsafe locking scenario:

        CPU0                    CPU1
        ----                    ----
   lock(_xmit_ETHER/1);
                                local_irq_disable();
                                lock(&(&mc->mca_lock)->rlock);
                                lock(&team_netdev_addr_lock_key);
   <Interrupt>
     lock(&(&mc->mca_lock)->rlock);

  *** DEADLOCK ***

Fixes: 08d197e2489f ("team: team should sync the port's uc/mc addrs when add a port")
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/team/team.c