mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
synced 2026-11-16 23:20:03 +01:00
ixgbe: fix possible race in reset subtask
Similar to ixgbevf, the same possibility for race exists. Extend the RTNL lock in ixgbe_reset_subtask() to protect the state bits; this is to make sure that we get the most up-to-date values for the bits and avoid a possible race when going down. Signed-off-by: Tony Nguyen <[email protected]> Tested-by: Andrew Bowers <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]>
This commit is contained in:
1 parent
cc5b114dcf
commit
88adce4ea8
1 file changed
+4
-2
@@ -7621,17 +7621,19 @@ static void ixgbe_reset_subtask(struct ixgbe_adapter *adapter)
|
||||
if (!test_and_clear_bit(__IXGBE_RESET_REQUESTED, &adapter->state))
|
||||
return;
|
||||
|
||||
rtnl_lock();
|
||||
/* If we're already down, removing or resetting, just bail */
|
||||
if (test_bit(__IXGBE_DOWN, &adapter->state) ||
|
||||
test_bit(__IXGBE_REMOVING, &adapter->state) ||
|
||||
test_bit(__IXGBE_RESETTING, &adapter->state))
|
||||
test_bit(__IXGBE_RESETTING, &adapter->state)) {
|
||||
rtnl_unlock();
|
||||
return;
|
||||
}
|
||||
|
||||
ixgbe_dump(adapter);
|
||||
netdev_err(adapter->netdev, "Reset adapter\n");
|
||||
adapter->tx_timeout_count++;
|
||||
|
||||
rtnl_lock();
|
||||
ixgbe_reinit_locked(adapter);
|
||||
rtnl_unlock();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user