sd: Retry START STOP UNIT commands
PATCH v3 1/1 sd: Retry START STOP UNIT commands
During system resume, sd_start_stop_device() submits a START STOP UNIT command to the SCSI device that is being resumed. That command is not retried in case of a unit attention and hence may fail. An example:
[16575.983359] sd 0:0:0:3: [sdd] Starting disk [16575.983693] sd 0:0:0:3: [sdd] Start/Stop Unit failed: Result: hostbyte=0x00 driverbyte=DRIVER_OK [16575.983712] sd 0:0:0:3: [sdd] Sense Key : 0x6 [16575.983730] sd 0:0:0:3: [sdd] ASC=0x29 ASCQ=0x0 [16575.983738] sd 0:0:0:3: PM: dpm_run_callback(): scsi_bus_resume+0x0/0xa0 returns -5 [16575.983783] sd 0:0:0:3: PM: failed to resume async: error -5
Make the SCSI core retry the START STOP UNIT command if the device reports that it has been powered on or that it has been reset.
---
Changes compared to v2:
- Dropped the SCMD_RETRY_PASSTHROUGH flag and use the SCSI failure mechanism instead.
Changes compared to v1:
- Renamed SCMD_RETRY_PASST_ON_UA into SCMD_RETRY_PASSTHROUGH.
drivers/scsi/sd.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
drivers/scsi/sd.c +29 -0
@@ -4093,9 +4093,38 @@ static int sd_start_stop_device(struct scsi_disk *sdkp, int start) {unsigned char cmd[6 ] = {START_STOP };/* START_VALID */ struct scsi_sense_hdr sshdr; +struct scsi_failure failure_defs[] = { + { +/* Power on, reset, or bus device reset occurred */ + .sense =UNIT_ATTENTION , + .asc =0x29 , + .ascq =0 , + .result =SAM_STAT_CHECK_CONDITION , + }, + { +/* Power on occurred */ + .sense =UNIT_ATTENTION , + .asc =0x29 , + .ascq =1 , + .result =SAM_STAT_CHECK_CONDITION , + }, + { +/* SCSI bus reset */ + .sense =UNIT_ATTENTION , + .asc =0x29 , + .ascq =2 , + .result =SAM_STAT_CHECK_CONDITION , + }, + {} + }; +struct scsi_failures failures = { + .total_allowed =3 , + .failure_definitions = failure_defs, + };const struct scsi_exec_args exec_args = { .sshdr = &sshdr, .req_flags =BLK_MQ_REQ_PM , + .failures = &failures, };struct scsi_device *sdp = sdkp->device;int res;
Quoted 11 lines · Bart Van Assche
During system resume,
sd_start_stop_device()submits a START STOP UNIT command to the SCSI device that is being resumed. That command is not retried in case of a unit attention and hence may fail. An example:[16575.983359] sd 0:0:0:3: [sdd] Starting disk [16575.983693] sd 0:0:0:3: [sdd] Start/Stop Unit failed: Result: hostbyte=0x00 driverbyte=DRIVER_OK [16575.983712] sd 0:0:0:3: [sdd] Sense Key : 0x6 [16575.983730] sd 0:0:0:3: [sdd] ASC=0x29 ASCQ=0x0 [16575.983738] sd 0:0:0:3: PM: dpm_run_callback(): scsi_bus_resume+0x0/0xa0 returns -5 [16575.983783] sd 0:0:0:3: PM: failed to resume async: error -5
Quoted 6 lines
Make the SCSI core retry the START STOP UNIT command if the device reports that it has been powered on or that it has been reset.
Cc Damien Le Moal <[email protected]>Cc Mike Christie <[email protected]>Signed-off-by Bart Van Assche <[email protected]>
Looks OK to me.
Signature · 2 lines
Damien Le Moal Western Digital Research
Bart,
Quoted 3 lines
During system resume,
sd_start_stop_device()submits a START STOP UNIT command to the SCSI device that is being resumed. That command is not retried in case of a unit attention and hence may fail. An example:
Thanks for making this change! Applied to 6.12/scsi-staging.
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering