diff mbox series

[1/1] scsi: Fix command pass through retry regression

Message ID 20250107010220.7215-1-michael.christie@oracle.com
State New
Headers show
Series [1/1] scsi: Fix command pass through retry regression | expand

Commit Message

Mike Christie Jan. 7, 2025, 1:02 a.m. UTC 
scsi_check_passthrough is always called, but it doesn't check for if a
command completed successfully. As a result, if a command was successful
and the caller used SCMD_FAILURE_RESULT_ANY to indicate what failures it
wanted to retry, we will end up retrying the command. This will cause
delays during device discovery because of the command being sent multiple
times. For some USB devices it can also cause the wrong device size to be
used.

This patch adds a check for if the command was successful. If it is we
return immediately instead of trying to match a failure.

Fixes: 994724e6b3f0 ("scsi: core: Allow passthrough to request midlayer retries")
Reported-by: Kris Karas <bugs-a21@moonlit-rail.com>
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219652
Signed-off-by: Mike Christie <michael.christie@oracle.com>

---
 drivers/scsi/scsi_lib.c | 3 +++
 1 file changed, 3 insertions(+)
diff mbox series

Patch

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index adee6f60c966..0cc6a0f77b09 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -210,6 +210,9 @@  static int scsi_check_passthrough(struct scsi_cmnd *scmd,
 	struct scsi_sense_hdr sshdr;
 	enum sam_status status;
 
+	if (!scmd->result)
+		return 0;
+
 	if (!failures)
 		return 0;