Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1cbd20e authored by Wenchao Hao's avatar Wenchao Hao Committed by Greg Kroah-Hartman
Browse files

scsi: core: Decrease scsi_device's iorequest_cnt if dispatch failed 



[ Upstream commit 09e797c8641f6ad435c33ae24c223351197ea29a ]

If scsi_dispatch_cmd() failed, the SCSI command was not sent to the target,
scsi_queue_rq() would return BLK_STS_RESOURCE and the related request would
be requeued. The timeout of this request would not fire, no one would
increase iodone_cnt.

The above flow would result the iodone_cnt smaller than iorequest_cnt.  So
decrease the iorequest_cnt if dispatch failed to workaround the issue.

Signed-off-by: default avatarWenchao Hao <haowenchao2@huawei.com>
Reported-by: default avatarMing Lei <ming.lei@redhat.com>
Closes: https://lore.kernel.org/r/ZF+zB+bB7iqe0wGd@ovpn-8-17.pek2.redhat.com
Link: https://lore.kernel.org/r/20230515070156.1790181-3-haowenchao2@huawei.com


Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 90e68775

drivers/scsi/scsi_lib.c

+2 −0
Original line number Diff line number Diff line
@@ -1804,6 +1804,7 @@ static int scsi_dispatch_cmd(struct scsi_cmnd *cmd) 
		 */

		SCSI_LOG_MLQUEUE(3, scmd_printk(KERN_INFO, cmd,

			"queuecommand : device blocked\n"));

		atomic_dec(&cmd->device->iorequest_cnt);

		return SCSI_MLQUEUE_DEVICE_BUSY;

	}
@@ -1836,6 +1837,7 @@ static int scsi_dispatch_cmd(struct scsi_cmnd *cmd) 
	trace_scsi_dispatch_cmd_start(cmd);

	rtn = host->hostt->queuecommand(host, cmd);

	if (rtn) {

		atomic_dec(&cmd->device->iorequest_cnt);

		trace_scsi_dispatch_cmd_error(cmd, rtn);

		if (rtn != SCSI_MLQUEUE_DEVICE_BUSY &&

		    rtn != SCSI_MLQUEUE_TARGET_BUSY)