This adds the core code to allow users to specify what errors they want
scsi-ml to retry. We can then convert users to drop their sense parsing
and retry handling.
Signed-off-by: Mike Christie <michael.christie@xxxxxxxxxx>
---
drivers/scsi/scsi_error.c | 63 +++++++++++++++++++++++++++++++++++++++
drivers/scsi/scsi_lib.c | 1 +
include/scsi/scsi_cmnd.h | 24 ++++++++++++++-
3 files changed, 87 insertions(+), 1 deletion(-)
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 5fed56b6b7c5..059c5f40d236 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1830,6 +1830,63 @@ bool scsi_noretry_cmd(struct scsi_cmnd *scmd)
return false;
}
+static enum scsi_disposition scsi_check_passthrough(struct scsi_cmnd *scmd)
+{
+ struct scsi_failure *failure;
+ struct scsi_sense_hdr sshdr;
+ enum scsi_disposition ret;
+ int i = 0;
+
+ if (!scmd->failures)
+ return SCSI_RETURN_NOT_HANDLED;
+
+ while ((failure = &scmd->failures[i++])) {
+ if (!failure->result)
+ break;
+
+ if (host_byte(scmd->result) & host_byte(failure->result)) {
+ goto maybe_retry;
+ } else if (get_status_byte(scmd) &
+ __get_status_byte(failure->result)) {
+
+ if (failure->result == SCMD_FAILURE_ANY)
+ goto maybe_retry;
+
+ if (get_status_byte(scmd) != SAM_STAT_CHECK_CONDITION)
+ goto maybe_retry;
+
+ ret = scsi_prep_sense(scmd, &sshdr);
+ if (ret == NEEDS_RETRY)
+ goto maybe_retry;
+ else if (ret != SUCCESS)
+ return ret;
+
+ if (failure->sense != sshdr.sense_key)
+ continue;
+
+ if (failure->asc == SCMD_FAILURE_ASC_ANY)
+ goto maybe_retry;
+
+ if (failure->asc != sshdr.asc)
+ continue;
+
+ if (failure->ascq == SCMD_FAILURE_ASCQ_ANY)
+ goto maybe_retry;
+
+ if (failure->ascq != sshdr.ascq)
+ continue;
+ }
+ }
+
+ return SCSI_RETURN_NOT_HANDLED;
+
+maybe_retry:
+ if (++failure->retries <= failure->allowed)
+ return NEEDS_RETRY;
+
+ return SUCCESS;
+}
+
/**
* scsi_decide_disposition - Disposition a cmd on return from LLD.
* @scmd: SCSI cmd to examine.
@@ -1858,6 +1915,12 @@ enum scsi_disposition scsi_decide_disposition(struct scsi_cmnd *scmd)
return SUCCESS;
}
+ if (blk_rq_is_passthrough(scsi_cmd_to_rq(scmd))) {
+ rtn = scsi_check_passthrough(scmd);
+ if (rtn != SCSI_RETURN_NOT_HANDLED)
+ return rtn;
+ }
+
/*
* first check the host byte, to see if there is anything in there
* that would indicate what we need to do.
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 497efc0da259..56aefe38d69b 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1608,6 +1608,7 @@ static blk_status_t scsi_prepare_cmd(struct request *req)
/* Usually overridden by the ULP */
cmd->allowed = 0;
+ cmd->failures = NULL;
memset(cmd->cmnd, 0, sizeof(cmd->cmnd));
return scsi_cmd_to_driver(cmd)->init_command(cmd);
}
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index bac55decf900..ee3986401f52 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -65,6 +65,21 @@ enum scsi_cmnd_submitter {
SUBMITTED_BY_SCSI_RESET_IOCTL = 2,
} __packed;
+#define SCMD_FAILURE_NONE 0
+#define SCMD_FAILURE_ANY 0xffffffff
+#define SCMD_FAILURE_ASC_ANY 0xff
+#define SCMD_FAILURE_ASCQ_ANY 0xff
+
+struct scsi_failure {
+ u8 sense;
+ u8 asc;
+ u8 ascq;
+ int result;
+
+ s8 allowed;
+ u8 retries;
+};
+
struct scsi_cmnd {
struct scsi_device *device;
struct list_head eh_entry; /* entry for the host eh_abort_list/eh_cmd_q */
@@ -85,6 +100,8 @@ struct scsi_cmnd {
int retries;
int allowed;
+ /* optional array of failures that passthrough users want retried */
+ struct scsi_failure *failures;
unsigned char prot_op;
unsigned char prot_type;
@@ -330,9 +347,14 @@ static inline void set_status_byte(struct scsi_cmnd *cmd, char status)
cmd->result = (cmd->result & 0xffffff00) | status;
}
+static inline u8 __get_status_byte(int result)
+{
+ return result & 0xff;
+}
+
static inline u8 get_status_byte(struct scsi_cmnd *cmd)
{
- return cmd->result & 0xff;
+ return __get_status_byte(cmd->result);
}
static inline void set_host_byte(struct scsi_cmnd *cmd, char status)
--
2.25.1
