diff options
| author |   Taehee Yoo <ap420073@gmail.com> | 2019-08-08 09:37:56 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-08-09 13:17:00 -0700 |
| commit | 8b6381600d59871fbe44d36522272f961ab42410 (patch) | |
| tree | 93f7dc1d90dd5fe25befd79f739407f8400acf98 /drivers/net/ethernet/intel/ixgbe | |
| parent | Merge branch 'Fix-collisions-in-socket-cookie-generation' (diff) | |
| download | linux-dev-8b6381600d59871fbe44d36522272f961ab42410.tar.xz linux-dev-8b6381600d59871fbe44d36522272f961ab42410.zip | |
ixgbe: fix possible deadlock in ixgbe_service_task()
ixgbe_service_task() calls unregister_netdev() under rtnl_lock().
But unregister_netdev() internally calls rtnl_lock().
So deadlock would occur.
Fixes: 59dd45d550c5 ("ixgbe: firmware recovery mode")
Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index cbaf712d6529..7882148abb43 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -7897,11 +7897,8 @@ static void ixgbe_service_task(struct work_struct *work) return; } if (ixgbe_check_fw_error(adapter)) { - if (!test_bit(__IXGBE_DOWN, &adapter->state)) { - rtnl_lock(); + if (!test_bit(__IXGBE_DOWN, &adapter->state)) unregister_netdev(adapter->netdev); - rtnl_unlock(); - } ixgbe_service_event_complete(adapter); return; } |