Commit 4eb01535 authored Apr 03, 2019 by James Smart Committed by Martin K. Petersen Apr 03, 2019

scsi: lpfc: Fix missing wakeups on abort threads



Abort thread wakeups, on some wqe types, are not happening.  The thread
wakeup logic is dependent upon the LPFC_DRIVER_ABORTED flag. However, on
these wqes, the completion handler running prior to the io completion
routine ends up clearing the flag.

Rework the wakeup logic to look at a non-null waitq element which must be
set if the abort thread is waiting. This is reverting the change in the
indicated patch.

Fixes: c2017260 ("scsi: lpfc: Rework locking on SCSI io completion")
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>

parent ed2e63aa

drivers/scsi/lpfc/lpfc_scsi.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -3878,9 +3878,8 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba phba, struct lpfc_iocbq pIocbIn,
		* wake up the thread.
		*/
		spin_lock(&lpfc_cmd->buf_lock);
		if (unlikely(lpfc_cmd->cur_iocbq.iocb_flag & LPFC_DRIVER_ABORTED)) {
		lpfc_cmd->cur_iocbq.iocb_flag &= ~LPFC_DRIVER_ABORTED;
		if (lpfc_cmd->waitq)
		if (lpfc_cmd->waitq) {
		wake_up(lpfc_cmd->waitq);
		lpfc_cmd->waitq = NULL;
		}