| From 6242b25954d84a3089b7293e650e62f36c0d6c76 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 28 Aug 2018 10:16:03 -0700 |
| Subject: i40e: hold the rtnl lock on clearing interrupt scheme |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Patryk Małek <patryk.malek@intel.com> |
| |
| [ Upstream commit 5cba17b14182696d6bb0ec83a1d087933f252241 ] |
| |
| Hold the rtnl lock when we're clearing interrupt scheme |
| in i40e_shutdown and in i40e_remove. |
| |
| Signed-off-by: Patryk Małek <patryk.malek@intel.com> |
| Tested-by: Andrew Bowers <andrewx.bowers@intel.com> |
| Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/intel/i40e/i40e_main.c | 8 ++++++++ |
| 1 file changed, 8 insertions(+) |
| |
| diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c |
| index 1577dbaab7425..1a66373184d62 100644 |
| --- a/drivers/net/ethernet/intel/i40e/i40e_main.c |
| +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c |
| @@ -14208,6 +14208,7 @@ static void i40e_remove(struct pci_dev *pdev) |
| mutex_destroy(&hw->aq.asq_mutex); |
| |
| /* Clear all dynamic memory lists of rings, q_vectors, and VSIs */ |
| + rtnl_lock(); |
| i40e_clear_interrupt_scheme(pf); |
| for (i = 0; i < pf->num_alloc_vsi; i++) { |
| if (pf->vsi[i]) { |
| @@ -14216,6 +14217,7 @@ static void i40e_remove(struct pci_dev *pdev) |
| pf->vsi[i] = NULL; |
| } |
| } |
| + rtnl_unlock(); |
| |
| for (i = 0; i < I40E_MAX_VEB; i++) { |
| kfree(pf->veb[i]); |
| @@ -14427,7 +14429,13 @@ static void i40e_shutdown(struct pci_dev *pdev) |
| wr32(hw, I40E_PFPM_WUFC, |
| (pf->wol_en ? I40E_PFPM_WUFC_MAG_MASK : 0)); |
| |
| + /* 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_clear_interrupt_scheme(pf); |
| + rtnl_unlock(); |
| |
| if (system_state == SYSTEM_POWER_OFF) { |
| pci_wake_from_d3(pdev, pf->wol_en); |
| -- |
| 2.20.1 |
| |