diff options
| author | James Smart | 2018-06-26 17:24:25 +0200 |
|---|---|---|
| committer | Martin K. Petersen | 2018-07-11 04:15:09 +0200 |
| commit | 68c9b55deea51151d9da3d45ecc9a5ef72f9dfb1 (patch) | |
| tree | 2cc8e7734d3b083b99c6ca0f51c385c8b286eb24 /drivers/scsi/lpfc/lpfc_init.c | |
| parent | scsi: lpfc: Fix panic if driver unloaded when port is offline (diff) | |
| download | kernel-qcow2-linux-68c9b55deea51151d9da3d45ecc9a5ef72f9dfb1.tar.gz kernel-qcow2-linux-68c9b55deea51151d9da3d45ecc9a5ef72f9dfb1.tar.xz kernel-qcow2-linux-68c9b55deea51151d9da3d45ecc9a5ef72f9dfb1.zip | |
scsi: lpfc: Fix abort error path for NVMET
rmmod of driver hangs
As driver instances were being unloaded, the NVME target port was unloaded
first. During the unload, the NVME initiator port sent a heartbeat
IO. Because of the target port state, that IO was scheduled for an Abort;
however, that abort subsequently failed. The failure was not cleaned up
properly and lpfc_sli4_xri_exchange_busy_wait silently hung forever.
Clean failed abort properly and make lpfc_sli4_xri_exchange_busy_wait not
hangs silently while waiting for aborts to complete.
Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <james.smart@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_init.c')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_init.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index 52cae87da0d2..150562b79eaa 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c @@ -10387,6 +10387,11 @@ lpfc_sli4_xri_exchange_busy_wait(struct lpfc_hba *phba) while (!fcp_xri_cmpl || !els_xri_cmpl || !nvme_xri_cmpl || !nvmet_xri_cmpl) { if (wait_time > LPFC_XRI_EXCH_BUSY_WAIT_TMO) { + if (!nvmet_xri_cmpl) + lpfc_printf_log(phba, KERN_ERR, LOG_INIT, + "6424 NVMET XRI exchange busy " + "wait time: %d seconds.\n", + wait_time/1000); if (!nvme_xri_cmpl) lpfc_printf_log(phba, KERN_ERR, LOG_INIT, "6100 NVME XRI exchange busy " |