Commit 89533e9b authored by James Smart's avatar James Smart Committed by Martin K. Petersen
Browse files

scsi: lpfc: Correct panics with eh_timeout and eh_deadline 



Correct panics with eh_timeout and eh_deadline

We were having double completions on our SLI-3 version of adapters.
Solved by clearing our command pointer before calling scsi_done.

The eh paths potentially ran simulatenously and would see the non-null
value and invoke scsi_done again.

Signed-off-by: default avatarDick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: default avatarJames Smart <james.smart@broadcom.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 401304cc

drivers/scsi/lpfc/lpfc_scsi.c

+3 −3
Original line number Diff line number Diff line
@@ -4142,13 +4142,13 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn, 


	lpfc_scsi_unprep_dma_buf(phba, lpfc_cmd);



	/* The sdev is not guaranteed to be valid post scsi_done upcall. */

	cmd->scsi_done(cmd);



	spin_lock_irqsave(&phba->hbalock, flags);

	lpfc_cmd->pCmd = NULL;

	spin_unlock_irqrestore(&phba->hbalock, flags);



	/* The sdev is not guaranteed to be valid post scsi_done upcall. */

	cmd->scsi_done(cmd);



	/*

	 * If there is a thread waiting for command completion

	 * wake up the thread.

drivers/scsi/lpfc/lpfc_sli.c

+8 −4
Original line number Diff line number Diff line
@@ -2677,15 +2677,16 @@ lpfc_sli_iocbq_lookup(struct lpfc_hba *phba, 








	if (iotag != 0 && iotag <= phba->sli.last_iotag) {









		cmd_iocb = phba->sli.iocbq_lookup[iotag];









		list_del_init(&cmd_iocb->list);









		if (cmd_iocb->iocb_flag & LPFC_IO_ON_TXCMPLQ) {









			/* remove from txcmpl queue list */









			list_del_init(&cmd_iocb->list);









			cmd_iocb->iocb_flag &= ~LPFC_IO_ON_TXCMPLQ;









		}









			return cmd_iocb;









		}









	}

















	lpfc_printf_log(phba, KERN_ERR, LOG_SLI,









			"0317 iotag x%x is out off "









			"0317 iotag x%x is out of "









			"range: max iotag x%x wd0 x%x\n",









			iotag, phba->sli.last_iotag,









			*(((uint32_t *) &prspiocb->iocb) + 7));










@@ -2720,8 +2721,9 @@ lpfc_sli_iocbq_lookup_by_tag(struct lpfc_hba *phba,







			return cmd_iocb;









		}









	}

















	lpfc_printf_log(phba, KERN_ERR, LOG_SLI,









			"0372 iotag x%x is out off range: max iotag (x%x)\n",









			"0372 iotag x%x is out of range: max iotag (x%x)\n",









			iotag, phba->sli.last_iotag);









	return NULL;









}










@@ -11808,6 +11810,8 @@ lpfc_sli4_els_wcqe_to_rspiocbq(struct lpfc_hba *phba,







	/* Look up the ELS command IOCB and create pseudo response IOCB */









	cmdiocbq = lpfc_sli_iocbq_lookup_by_tag(phba, pring,









				bf_get(lpfc_wcqe_c_request_tag, wcqe));









	/* Put the iocb back on the txcmplq */









	lpfc_sli_ringtxcmpl_put(phba, pring, cmdiocbq);









	spin_unlock_irqrestore(&pring->ring_lock, iflags);

















	if (unlikely(!cmdiocbq)) {