lkml.org 
[lkml]   [2019]   [Aug]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.2 15/76] ixgbe: fix possible deadlock in ixgbe_service_task()
    Date
    From: Taehee Yoo <ap420073@gmail.com>

    [ Upstream commit 8b6381600d59871fbe44d36522272f961ab42410 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 +----
    1 file changed, 1 insertion(+), 4 deletions(-)

    diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
    index 57fd9ee6de665..f7c049559c1a5 100644
    --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
    +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
    @@ -7893,11 +7893,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;
    }
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-08-29 20:34    [W:8.779 / U:0.464 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site