Commit 334b4f98 authored by Javed Hasan's avatar Javed Hasan Committed by Martin K. Petersen
Browse files

scsi: qedf: Acquire rport_lock for resetting the delay_timestamp 

Retry delay timestamp is updated in queuecommand as well as in
qedf_scsi_completion routine. Protect it using lock.

Link: https://lore.kernel.org/r/20200416084314.18851-4-skashyap@marvell.com


Signed-off-by: default avatarJaved Hasan <jhasan@marvell.com>
Signed-off-by: default avatarSaurav Kashyap <skashyap@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent b0c4187e

drivers/scsi/qedf/qedf_io.c

+4 −0
Original line number Diff line number Diff line
@@ -1021,14 +1021,18 @@ qedf_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *sc_cmd) 
	atomic_inc(&fcport->ios_to_queue);



	if (fcport->retry_delay_timestamp) {

		/* Take fcport->rport_lock for resetting the delay_timestamp */

		spin_lock_irqsave(&fcport->rport_lock, flags);

		if (time_after(jiffies, fcport->retry_delay_timestamp)) {

			fcport->retry_delay_timestamp = 0;

		} else {

			spin_unlock_irqrestore(&fcport->rport_lock, flags);

			/* If retry_delay timer is active, flow off the ML */

			rc = SCSI_MLQUEUE_TARGET_BUSY;

			atomic_dec(&fcport->ios_to_queue);

			goto exit_qcmd;

		}

		spin_unlock_irqrestore(&fcport->rport_lock, flags);

	}



	io_req = qedf_alloc_cmd(fcport, QEDF_SCSI_CMD);