diff mbox

[next,S30,v3,07/13] i40e: Remove timer and task only if created

Message ID 1457650791-100229-8-git-send-email-avinash.dayanand@intel.com
State Accepted
Delegated to: Jeff Kirsher
Headers show

Commit Message

Dayanand, Avinash March 10, 2016, 10:59 p.m. UTC 
From: Shannon Nelson <shannon.nelson@intel.com>

In some error scenarios, we may find ourselves trying to remove a
non-existent timer or worktask.  This causes the kernel some bit
of consternation, so don't do it.

Testing Hints: Inject an error into the i40e_probe before these are
created and see if you can get a clean remove.

Signed-off-by: Nelson, Shannon <shannon.nelson@intel.com>
---
 drivers/net/ethernet/intel/i40e/i40e_main.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Bowers, AndrewX March 15, 2016, 6:37 p.m. UTC | #1 
> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces@lists.osuosl.org] On
> Behalf Of ajdayana
> Sent: Thursday, March 10, 2016 3:00 PM
> To: intel-wired-lan@lists.osuosl.org
> Subject: [Intel-wired-lan] [next PATCH S30 v3 07/13] i40e: Remove timer and
> task only if created
> 
> From: Shannon Nelson <shannon.nelson@intel.com>
> 
> In some error scenarios, we may find ourselves trying to remove a non-
> existent timer or worktask.  This causes the kernel some bit of consternation,
> so don't do it.
> 
> Testing Hints: Inject an error into the i40e_probe before these are created
> and see if you can get a clean remove.
> 
> Signed-off-by: Nelson, Shannon <shannon.nelson@intel.com>
> ---
>  drivers/net/ethernet/intel/i40e/i40e_main.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)

Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Driver will remove cleanly in error state
diff mbox

Patch

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 5d2dba2..298a73c 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -11212,8 +11212,10 @@  static void i40e_remove(struct pci_dev *pdev)
 	/* no more scheduling of any task */
 	set_bit(__I40E_SUSPENDED, &pf->state);
 	set_bit(__I40E_DOWN, &pf->state);
-	del_timer_sync(&pf->service_timer);
-	cancel_work_sync(&pf->service_task);
+	if (pf->service_timer.data)
+		del_timer_sync(&pf->service_timer);
+	if (pf->service_task.func)
+		cancel_work_sync(&pf->service_task);
 
 	if (pf->flags & I40E_FLAG_SRIOV_ENABLED) {
 		i40e_free_vfs(pf);