OSDN Git Service

scsi: lpfc: Fix crash on driver unload in wq free
authorJames Smart <jsmart2021@gmail.com>
Wed, 14 Aug 2019 23:56:34 +0000 (16:56 -0700)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 20 Aug 2019 02:41:08 +0000 (22:41 -0400)
If a timer routine uses workqueues, it could fire before the workqueue is
allocated.

Fix by allocating the workqueue before the timer routines are setup

Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <jsmart2021@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/lpfc/lpfc_init.c

index a109895..f9986ef 100644 (file)
@@ -6413,6 +6413,11 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba)
        if (rc)
                return -ENODEV;
 
+       /* Allocate all driver workqueues here */
+
+       /* The lpfc_wq workqueue for deferred irq use */
+       phba->wq = alloc_workqueue("lpfc_wq", WQ_MEM_RECLAIM, 0);
+
        /*
         * Initialize timers used by driver
         */
@@ -6996,12 +7001,6 @@ lpfc_setup_driver_resource_phase2(struct lpfc_hba *phba)
                return error;
        }
 
-       /* The lpfc_wq workqueue for deferred irq use, is only used for SLI4 */
-       if (phba->sli_rev == LPFC_SLI_REV4)
-               phba->wq = alloc_workqueue("lpfc_wq", WQ_MEM_RECLAIM, 0);
-       else
-               phba->wq = NULL;
-
        return 0;
 }