UPSTREAM: scsi: core: Fix command pass through retry regression

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: 994724e6b3 ("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
Change-Id: I4448b029cec748a1f37450402013bcde60dbbe9c
Signed-off-by: Mike Christie <michael.christie@oracle.com>
Link: https://lore.kernel.org/r/20250107010220.7215-1-michael.christie@oracle.com
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: John Garry <john.g.garry@oracle.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Peter Wang <peter.wang@mediatek.com>
(cherry picked from commit 8604f633f59375687fa115d6f691de95a42520e3)

This commit is contained in:

Mike Christie

2025-01-06 19:02:20 -06:00

committed by

Peter Wang

parent 5d4b8b5d59

commit 83ec70a077

1 changed files with 3 additions and 0 deletions

									
										drivers/scsi/scsi_lib.c
									
		+3
		
												View File
												
				@@ -213,6 +213,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;