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

scsi: lpfc: Fix error log messages being logged following SCSI task mgnt 

A successful task mgmt command is logging errors, making it look like
problems were encountered.  This is due to log messages for the
device/target and bus reset handlers having the LOG_TRACE_EVENT flag set.

Fix by adjusting the event flag such that the call to the logging routine
only receives a LOG_TRACE_EVENT if a prior call actually failed.

Link: https://lore.kernel.org/r/20210104180240.46824-9-jsmart2021@gmail.com


Co-developed-by: default avatarDick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: default avatarDick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: default avatarJames Smart <jsmart2021@gmail.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f0871ab6

drivers/scsi/lpfc/lpfc_scsi.c

+13 −4
Original line number Diff line number Diff line
@@ -5849,6 +5849,7 @@ lpfc_device_reset_handler(struct scsi_cmnd *cmnd) 
	uint64_t lun_id = cmnd->device->lun;

	struct lpfc_scsi_event_header scsi_event;

	int status;

	u32 logit = LOG_FCP;



	rdata = lpfc_rport_data_from_scsi_device(cmnd->device);

	if (!rdata || !rdata->pnode) {
@@ -5880,8 +5881,10 @@ lpfc_device_reset_handler(struct scsi_cmnd *cmnd) 


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

						FCP_LUN_RESET);

	if (status != SUCCESS)

		logit =  LOG_TRACE_EVENT;



	lpfc_printf_vlog(vport, KERN_ERR, LOG_TRACE_EVENT,

	lpfc_printf_vlog(vport, KERN_ERR, logit,

			 "0713 SCSI layer issued Device Reset (%d, %llu) "

			 "return x%x\n", tgt_id, lun_id, status);
@@ -5920,6 +5923,7 @@ lpfc_target_reset_handler(struct scsi_cmnd *cmnd) 
	uint64_t lun_id = cmnd->device->lun;

	struct lpfc_scsi_event_header scsi_event;

	int status;

	u32 logit = LOG_FCP;



	rdata = lpfc_rport_data_from_scsi_device(cmnd->device);

	if (!rdata || !rdata->pnode) {
@@ -5959,8 +5963,10 @@ lpfc_target_reset_handler(struct scsi_cmnd *cmnd) 


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

					FCP_TARGET_RESET);

	if (status != SUCCESS)

		logit =  LOG_TRACE_EVENT;



	lpfc_printf_vlog(vport, KERN_ERR, LOG_TRACE_EVENT,

	lpfc_printf_vlog(vport, KERN_ERR, logit,

			 "0723 SCSI layer issued Target Reset (%d, %llu) "

			 "return x%x\n", tgt_id, lun_id, status);
@@ -5996,6 +6002,7 @@ lpfc_bus_reset_handler(struct scsi_cmnd *cmnd) 
	struct lpfc_scsi_event_header scsi_event;

	int match;

	int ret = SUCCESS, status, i;

	u32 logit = LOG_FCP;



	scsi_event.event_type = FC_REG_SCSI_EVENT;

	scsi_event.subcategory = LPFC_EVENT_BUSRESET;
@@ -6056,8 +6063,10 @@ lpfc_bus_reset_handler(struct scsi_cmnd *cmnd) 
	status = lpfc_reset_flush_io_context(vport, 0, 0, LPFC_CTX_HOST);

	if (status != SUCCESS)

		ret = FAILED;

	if (ret == FAILED)

		logit =  LOG_TRACE_EVENT;



	lpfc_printf_vlog(vport, KERN_ERR, LOG_TRACE_EVENT,

	lpfc_printf_vlog(vport, KERN_ERR, logit,

			 "0714 SCSI layer issued Bus Reset Data: x%x\n", ret);

	return ret;

}
@@ -6086,7 +6095,7 @@ lpfc_host_reset_handler(struct scsi_cmnd *cmnd) 
	struct lpfc_hba *phba = vport->phba;

	int rc, ret = SUCCESS;



	lpfc_printf_vlog(vport, KERN_ERR, LOG_TRACE_EVENT,

	lpfc_printf_vlog(vport, KERN_ERR, LOG_FCP,

			 "3172 SCSI layer issued Host Reset Data:\n");



	lpfc_offline_prep(phba, LPFC_MBX_WAIT);