Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88adce4e authored by Tony Nguyen's avatar Tony Nguyen Committed by Jeff Kirsher
Browse files

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: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent cc5b114d

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+4 −2
Original line number Diff line number Diff line
@@ -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();

}