]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
scsi: core: Do not retry I/Os during depopulation
authorIgor Pylypiv <ipylypiv@google.com>
Fri, 31 Jan 2025 18:44:07 +0000 (10:44 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 7 Mar 2025 15:56:31 +0000 (16:56 +0100)
[ Upstream commit 9ff7c383b8ac0c482a1da7989f703406d78445c6 ]

Fail I/Os instead of retry to prevent user space processes from being
blocked on the I/O completion for several minutes.

Retrying I/Os during "depopulation in progress" or "depopulation restore in
progress" results in a continuous retry loop until the depopulation
completes or until the I/O retry loop is aborted due to a timeout by the
scsi_cmd_runtime_exceeced().

Depopulation is slow and can take 24+ hours to complete on 20+ TB HDDs.
Most I/Os in the depopulation retry loop end up taking several minutes
before returning the failure to user space.

Cc: stable@vger.kernel.org # 4.18.x: 2bbeb8d scsi: core: Handle depopulation and restoration in progress
Cc: stable@vger.kernel.org # 4.18.x
Fixes: e37c7d9a0341 ("scsi: core: sanitize++ in progress")
Signed-off-by: Igor Pylypiv <ipylypiv@google.com>
Link: https://lore.kernel.org/r/20250131184408.859579-1-ipylypiv@google.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/scsi/scsi_lib.c

index b8d58120badde8cda4c53cedc0aa20ab633d7749..72d31b2267ef49bfd63031f3ebb0cbc921753ffe 100644 (file)
@@ -782,13 +782,18 @@ static void scsi_io_completion_action(struct scsi_cmnd *cmd, int result)
                                case 0x1a: /* start stop unit in progress */
                                case 0x1b: /* sanitize in progress */
                                case 0x1d: /* configuration in progress */
-                               case 0x24: /* depopulation in progress */
-                               case 0x25: /* depopulation restore in progress */
                                        action = ACTION_DELAYED_RETRY;
                                        break;
                                case 0x0a: /* ALUA state transition */
                                        action = ACTION_DELAYED_REPREP;
                                        break;
+                               /*
+                                * Depopulation might take many hours,
+                                * thus it is not worthwhile to retry.
+                                */
+                               case 0x24: /* depopulation in progress */
+                               case 0x25: /* depopulation restore in progress */
+                                       fallthrough;
                                default:
                                        action = ACTION_FAIL;
                                        break;