i40e: prevent service task from running while we're suspended (5c499228) · Commits · 戴 / test

Although the service task does check the suspended status before running, it might already be part way through running when we go to suspend. Lets ensure that the service task is stopped and will not be restarted again until we finish resuming. This ensures that service task code does not cause strange interactions with the suspend/resume handlers. Signed-off-by:

Jacob Keller <jacob.e.keller@intel.com> Tested-by:

Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by:

Jeff Kirsher <jeffrey.t.kirsher@intel.com>

drivers/net/ethernet/intel/i40e/i40e_main.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -12065,6 +12065,10 @@ static int i40e_suspend(struct device *dev)

		set_bit(__I40E_DOWN, pf->state);

		/* Ensure service task will not be running */
		del_timer_sync(&pf->service_timer);
		cancel_work_sync(&pf->service_task);

		if (pf->wol_en && (pf->hw_features & I40E_HW_WOL_MC_MAGIC_PKT_WAKE))
		i40e_enable_mc_magic_wake(pf);

		@@ -12097,6 +12101,10 @@ static int i40e_resume(struct device *dev)
		/* Clear suspended state last after everything is recovered */
		clear_bit(__I40E_SUSPENDED, pf->state);

		/* Restart the service task */
		mod_timer(&pf->service_timer,
		round_jiffies(jiffies + pf->service_timer_period));

		return 0;
		}

Admin message