Skip to content

Commit

Permalink
i40e: hold the RTNL lock while changing interrupt schemes
Browse files Browse the repository at this point in the history
When we suspend and resume, we need to clear and re-enable the interrupt
scheme. This was previously not done while holding the RTNL lock, which
could be problematic, because we are actually destroying and re-creating
queues.

Hold the RTNL lock for the entire sequence of preparing for reset, and
when resuming. This additionally protects the flags related to interrupt
scheme under RTNL lock so that their modification is properly threaded.

This is part of a larger effort to remove the need for cmpxchg64 in
i40e_set_priv_flags().

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>
  • Loading branch information
Jacob Keller authored and Jeff Kirsher committed Mar 26, 2018
1 parent 5f76a70 commit f0ee70a
Showing 1 changed file with 17 additions and 2 deletions.
19 changes: 17 additions & 2 deletions drivers/net/ethernet/intel/i40e/i40e_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -14348,7 +14348,13 @@ static int __maybe_unused i40e_suspend(struct device *dev)
if (pf->wol_en && (pf->hw_features & I40E_HW_WOL_MC_MAGIC_PKT_WAKE))
i40e_enable_mc_magic_wake(pf);

i40e_prep_for_reset(pf, false);
/* Since we're going to destroy queues during the
* i40e_clear_interrupt_scheme() we should hold the RTNL lock for this
* whole section
*/
rtnl_lock();

i40e_prep_for_reset(pf, true);

wr32(hw, I40E_PFPM_APM, (pf->wol_en ? I40E_PFPM_APM_APME_MASK : 0));
wr32(hw, I40E_PFPM_WUFC, (pf->wol_en ? I40E_PFPM_WUFC_MAG_MASK : 0));
Expand All @@ -14360,6 +14366,8 @@ static int __maybe_unused i40e_suspend(struct device *dev)
*/
i40e_clear_interrupt_scheme(pf);

rtnl_unlock();

return 0;
}

Expand All @@ -14377,6 +14385,11 @@ static int __maybe_unused i40e_resume(struct device *dev)
if (!test_bit(__I40E_SUSPENDED, pf->state))
return 0;

/* We need to hold the RTNL lock prior to restoring interrupt schemes,
* since we're going to be restoring queues
*/
rtnl_lock();

/* We cleared the interrupt scheme when we suspended, so we need to
* restore it now to resume device functionality.
*/
Expand All @@ -14387,7 +14400,9 @@ static int __maybe_unused i40e_resume(struct device *dev)
}

clear_bit(__I40E_DOWN, pf->state);
i40e_reset_and_rebuild(pf, false, false);
i40e_reset_and_rebuild(pf, false, true);

rtnl_unlock();

/* Clear suspended state last after everything is recovered */
clear_bit(__I40E_SUSPENDED, pf->state);
Expand Down

0 comments on commit f0ee70a

Please sign in to comment.