Commit 21990d3d authored by James Smart's avatar James Smart Committed by Martin K. Petersen
Browse files

scsi: lpfc: Fix target reset handler from falsely returning FAILURE 

Previous logic accidentally overrides the status variable to FAILURE when
target reset status is SUCCESS.

Refactor the non-SUCCESS logic of lpfc_vmid_vport_cleanup(), which resolves
the false override.

Link: https://lore.kernel.org/r/20210707184351.67872-7-jsmart2021@gmail.com


Co-developed-by: default avatarJustin Tee <justin.tee@broadcom.com>
Signed-off-by: default avatarJustin Tee <justin.tee@broadcom.com>
Signed-off-by: default avatarJames Smart <jsmart2021@gmail.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent e77803bd

drivers/scsi/lpfc/lpfc_scsi.c

+37 −31
Original line number Diff line number Diff line
@@ -6273,6 +6273,7 @@ lpfc_target_reset_handler(struct scsi_cmnd *cmnd) 
	struct lpfc_scsi_event_header scsi_event;

	int status;

	u32 logit = LOG_FCP;

	u32 dev_loss_tmo = vport->cfg_devloss_tmo;

	unsigned long flags;

	DECLARE_WAIT_QUEUE_HEAD_ONSTACK(waitq);
@@ -6314,11 +6315,12 @@ lpfc_target_reset_handler(struct scsi_cmnd *cmnd) 


	status = lpfc_send_taskmgmt(vport, cmnd, tgt_id, lun_id,

					FCP_TARGET_RESET);

	if (status != SUCCESS)

	if (status != SUCCESS) {

		logit = LOG_TRACE_EVENT;



		/* Issue LOGO, if no LOGO is outstanding */

		spin_lock_irqsave(&pnode->lock, flags);

	if (status != SUCCESS &&

	    (!(pnode->upcall_flags & NLP_WAIT_FOR_LOGO)) &&

		if (!(pnode->upcall_flags & NLP_WAIT_FOR_LOGO) &&

		    !pnode->logo_waitq) {

			pnode->logo_waitq = &waitq;

			pnode->nlp_fcp_info &= ~NLP_FCP_2_DEVICE;
@@ -6327,15 +6329,17 @@ lpfc_target_reset_handler(struct scsi_cmnd *cmnd) 
			spin_unlock_irqrestore(&pnode->lock, flags);

			lpfc_unreg_rpi(vport, pnode);

			wait_event_timeout(waitq,

				   (!(pnode->upcall_flags & NLP_WAIT_FOR_LOGO)),

				    msecs_to_jiffies(vport->cfg_devloss_tmo *

					   (!(pnode->upcall_flags &

					      NLP_WAIT_FOR_LOGO)),

					   msecs_to_jiffies(dev_loss_tmo *

							    1000));



			if (pnode->upcall_flags & NLP_WAIT_FOR_LOGO) {

			lpfc_printf_vlog(vport, KERN_ERR, LOG_TRACE_EVENT,

				"0725 SCSI layer TGTRST failed & LOGO TMO "

				" (%d, %llu) return x%x\n", tgt_id,

				 lun_id, status);

				lpfc_printf_vlog(vport, KERN_ERR, logit,

						 "0725 SCSI layer TGTRST "

						 "failed & LOGO TMO (%d, %llu) "

						 "return x%x\n",

						 tgt_id, lun_id, status);

				spin_lock_irqsave(&pnode->lock, flags);

				pnode->upcall_flags &= ~NLP_WAIT_FOR_LOGO;

			} else {
@@ -6344,9 +6348,11 @@ lpfc_target_reset_handler(struct scsi_cmnd *cmnd) 
			pnode->logo_waitq = NULL;

			spin_unlock_irqrestore(&pnode->lock, flags);

			status = SUCCESS;



		} else {

		status = FAILED;

			spin_unlock_irqrestore(&pnode->lock, flags);

			status = FAILED;

		}

	}



	lpfc_printf_vlog(vport, KERN_ERR, logit,