Skip to content

Commit 8ebf408

Browse files
ipylypivfloatious
authored andcommitted
ata: libata-scsi: fix requeue of deferred ATA PASS-THROUGH commands
Commit 0ea8408 ("ata: libata-scsi: avoid Non-NCQ command starvation") introduced ata_scsi_requeue_deferred_qc() to handle commands deferred during resets or NCQ failures. This deferral logic completed commands with DID_SOFT_ERROR to trigger a retry in the SCSI mid-layer. However, DID_SOFT_ERROR is subject to scsi_cmd_retry_allowed() checks. ATA PASS-THROUGH commands sent via SG_IO ioctl have scmd->allowed set to zero. This causes the mid-layer to fail the command immediately instead of retrying, even though the command was never actually issued to the hardware. Switch to DID_REQUEUE to ensure these commands are inserted back into the request queue regardless of retry limits. Fixes: 0ea8408 ("ata: libata-scsi: avoid Non-NCQ command starvation") Reviewed-by: Damien Le Moal <dlemoal@kernel.org> Signed-off-by: Igor Pylypiv <ipylypiv@google.com> Signed-off-by: Niklas Cassel <cassel@kernel.org>
1 parent 797f629 commit 8ebf408

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/ata/libata-scsi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1695,12 +1695,12 @@ void ata_scsi_requeue_deferred_qc(struct ata_port *ap)
16951695
/*
16961696
* If we have a deferred qc when a reset occurs or NCQ commands fail,
16971697
* do not try to be smart about what to do with this deferred command
1698-
* and simply retry it by completing it with DID_SOFT_ERROR.
1698+
* and simply requeue it by completing it with DID_REQUEUE.
16991699
*/
17001700
if (qc) {
17011701
ap->deferred_qc = NULL;
17021702
cancel_work(&ap->deferred_qc_work);
1703-
ata_scsi_qc_done(qc, true, DID_SOFT_ERROR << 16);
1703+
ata_scsi_qc_done(qc, true, DID_REQUEUE << 16);
17041704
}
17051705
}
17061706

0 commit comments

Comments
 (0)