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

Commit 09f40aed authored by Mark Rustad's avatar Mark Rustad Committed by David S. Miller
Browse files

ixgbe: Indicate removal state explicitly 



Add a bit, __IXGBE_REMOVING, to indicate that the module is being
removed. The __IXGBE_DOWN bit had been overloaded for this purpose,
but that leads to trouble. A few places now check both __IXGBE_DOWN
and __IXGBE_REMOVE. Notably, setting either bit will prevent service
task execution.

Signed-off-by: default avatarMark Rustad <mark.d.rustad@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e1f7dedc

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+1 −0
Original line number Diff line number Diff line
@@ -798,6 +798,7 @@ enum ixgbe_state_t { 
	__IXGBE_TESTING,

	__IXGBE_RESETTING,

	__IXGBE_DOWN,

	__IXGBE_REMOVING,

	__IXGBE_SERVICE_SCHED,

	__IXGBE_IN_SFP_INIT,

	__IXGBE_PTP_RUNNING,

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

+8 −4
Original line number Diff line number Diff line
@@ -278,6 +278,7 @@ static void ixgbe_check_minimum_link(struct ixgbe_adapter *adapter, 
static void ixgbe_service_event_schedule(struct ixgbe_adapter *adapter)

{

	if (!test_bit(__IXGBE_DOWN, &adapter->state) &&

	    !test_bit(__IXGBE_REMOVING, &adapter->state) &&

	    !test_and_set_bit(__IXGBE_SERVICE_SCHED, &adapter->state))

		schedule_work(&adapter->service_task);

}
@@ -5874,8 +5875,9 @@ static void ixgbe_check_hang_subtask(struct ixgbe_adapter *adapter) 
	u64 eics = 0;

	int i;



	/* If we're down or resetting, just bail */

	/* If we're 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))

		return;
@@ -6122,8 +6124,9 @@ static void ixgbe_spoof_check(struct ixgbe_adapter *adapter) 
 **/

static void ixgbe_watchdog_subtask(struct ixgbe_adapter *adapter)

{

	/* if interface is down do nothing */

	/* if interface is down, removing or resetting, do nothing */

	if (test_bit(__IXGBE_DOWN, &adapter->state) ||

	    test_bit(__IXGBE_REMOVING, &adapter->state) ||

	    test_bit(__IXGBE_RESETTING, &adapter->state))

		return;
@@ -6341,8 +6344,9 @@ static void ixgbe_reset_subtask(struct ixgbe_adapter *adapter) 


	adapter->flags2 &= ~IXGBE_FLAG2_RESET_REQUESTED;



	/* If we're already down or resetting, just bail */

	/* 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))

		return;
@@ -8210,7 +8214,7 @@ static void ixgbe_remove(struct pci_dev *pdev) 


	ixgbe_dbg_adapter_exit(adapter);



	set_bit(__IXGBE_DOWN, &adapter->state);

	set_bit(__IXGBE_REMOVING, &adapter->state);

	cancel_work_sync(&adapter->service_task);