| From a204788bbb102a32defa0a07a3685fb4b3c9603b Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 28 Aug 2018 10:16:08 -0700 |
| Subject: i40evf: cancel workqueue sync for adminq when a VF is removed |
| |
| From: Lihong Yang <lihong.yang@intel.com> |
| |
| [ Upstream commit babbcc60040abfb7a9e3caa1c58fe182ae73762a ] |
| |
| If a VF is being removed, there is no need to continue with the |
| workqueue sync for the adminq task, thus cancel it. Without this call, |
| when VFs are created and removed right away, there might be a chance for |
| the driver to crash with events stuck in the adminq. |
| |
| Signed-off-by: Lihong Yang <lihong.yang@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/i40evf/i40evf_main.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c |
| index 3fc46d2adc087..f50c19b833686 100644 |
| --- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c |
| +++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c |
| @@ -3884,6 +3884,8 @@ static void i40evf_remove(struct pci_dev *pdev) |
| if (adapter->watchdog_timer.function) |
| del_timer_sync(&adapter->watchdog_timer); |
| |
| + cancel_work_sync(&adapter->adminq_task); |
| + |
| i40evf_free_rss(adapter); |
| |
| if (hw->aq.asq.count) |
| -- |
| 2.20.1 |
| |
