From: Mike Christie <michael.christie@oracle.com>
To: mwilck@suse.com, john.g.garry@oracle.com, bvanassche@acm.org,
hch@lst.de, martin.petersen@oracle.com,
linux-scsi@vger.kernel.org,
james.bottomley@hansenpartnership.com
Cc: Mike Christie <michael.christie@oracle.com>
Subject: [PATCH v12 01/20] scsi: Allow passthrough to request scsi-ml retries
Date: Mon, 13 Nov 2023 19:37:31 -0600 [thread overview]
Message-ID: <20231114013750.76609-2-michael.christie@oracle.com> (raw)
In-Reply-To: <20231114013750.76609-1-michael.christie@oracle.com>
For passthrough we don't retry any error we get a check condition for.
This results in a lot of callers driving their own retries for all UAs,
specific UAs, NOT_READY, specific sense values or any type of failure.
This adds the core code to allow passthrough users to specify what errors
they want scsi-ml to retry for them. We can then convert users to drop
a lot of their sense parsing and retry handling.
Signed-off-by: Mike Christie <michael.christie@oracle.com>
---
drivers/scsi/scsi_lib.c | 92 ++++++++++++++++++++++++++++++++++++++
include/scsi/scsi_device.h | 48 ++++++++++++++++++++
2 files changed, 140 insertions(+)
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index cf3864f72093..dee43c6f7ad0 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -184,6 +184,92 @@ void scsi_queue_insert(struct scsi_cmnd *cmd, int reason)
__scsi_queue_insert(cmd, reason, true);
}
+void scsi_reset_failures(struct scsi_failures *failures)
+{
+ struct scsi_failure *failure;
+
+ failures->total_retries = 0;
+
+ for (failure = failures->failure_definitions; failure->result;
+ failure++)
+ failure->retries = 0;
+}
+EXPORT_SYMBOL_GPL(scsi_reset_failures);
+
+/**
+ * scsi_check_passthrough - Determine if passthrough scsi_cmnd needs a retry.
+ * @scmd: scsi_cmnd to check.
+ * @failures: scsi_failures struct that lists failures to check for.
+ *
+ * Returns -EAGAIN if the caller should retry else 0.
+ */
+static int scsi_check_passthrough(struct scsi_cmnd *scmd,
+ struct scsi_failures *failures)
+{
+ struct scsi_failure *failure;
+ struct scsi_sense_hdr sshdr;
+ enum sam_status status;
+
+ if (!failures)
+ return 0;
+
+ for (failure = failures->failure_definitions; failure->result;
+ failure++) {
+ if (failure->result == SCMD_FAILURE_RESULT_ANY)
+ goto maybe_retry;
+
+ if (host_byte(scmd->result) &&
+ host_byte(scmd->result) == host_byte(failure->result))
+ goto maybe_retry;
+
+ status = status_byte(scmd->result);
+ if (!status)
+ continue;
+
+ if (failure->result == SCMD_FAILURE_STAT_ANY &&
+ !scsi_status_is_good(scmd->result))
+ goto maybe_retry;
+
+ if (status != status_byte(failure->result))
+ continue;
+
+ if (status_byte(failure->result) != SAM_STAT_CHECK_CONDITION ||
+ failure->sense == SCMD_FAILURE_SENSE_ANY)
+ goto maybe_retry;
+
+ if (!scsi_command_normalize_sense(scmd, &sshdr))
+ return 0;
+
+ 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 ||
+ failure->ascq == sshdr.ascq)
+ goto maybe_retry;
+ }
+
+ return 0;
+
+maybe_retry:
+ if (failure->allowed) {
+ if (failure->allowed == SCMD_FAILURE_NO_LIMIT ||
+ ++failure->retries <= failure->allowed)
+ return -EAGAIN;
+ } else {
+ if (failures->total_allowed == SCMD_FAILURE_NO_LIMIT ||
+ ++failures->total_retries <= failures->total_allowed)
+ return -EAGAIN;
+ }
+
+ return 0;
+}
+
/**
* scsi_execute_cmd - insert request and wait for the result
* @sdev: scsi_device
@@ -214,6 +300,7 @@ int scsi_execute_cmd(struct scsi_device *sdev, const unsigned char *cmd,
args->sense_len != SCSI_SENSE_BUFFERSIZE))
return -EINVAL;
+retry:
req = scsi_alloc_request(sdev->request_queue, opf, args->req_flags);
if (IS_ERR(req))
return PTR_ERR(req);
@@ -237,6 +324,11 @@ int scsi_execute_cmd(struct scsi_device *sdev, const unsigned char *cmd,
*/
blk_execute_rq(req, true);
+ if (scsi_check_passthrough(scmd, args->failures) == -EAGAIN) {
+ blk_mq_free_request(req);
+ goto retry;
+ }
+
/*
* Some devices (USB mass-storage in particular) may transfer
* garbage data together with a residue indicating that the data
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 10480eb582b2..c92d6d9e644e 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -483,6 +483,52 @@ extern int scsi_is_sdev_device(const struct device *);
extern int scsi_is_target_device(const struct device *);
extern void scsi_sanitize_inquiry_string(unsigned char *s, int len);
+/*
+ * scsi_execute_cmd users can set scsi_failure.result to have
+ * scsi_check_passthrough fail/retry a command. scsi_failure.result can be a
+ * specific host byte or message code, or SCMD_FAILURE_RESULT_ANY can be used
+ * to match any host or message code.
+ */
+#define SCMD_FAILURE_RESULT_ANY 0x7fffffff
+/*
+ * Set scsi_failure.result to SCMD_FAILURE_STAT_ANY to fail/retry any failure
+ * scsi_status_is_good returns false for.
+ */
+#define SCMD_FAILURE_STAT_ANY 0xff
+/*
+ * The following can be set to the scsi_failure sense, asc and ascq fields to
+ * match on any sense, ASC, or ASCQ value.
+ */
+#define SCMD_FAILURE_SENSE_ANY 0xff
+#define SCMD_FAILURE_ASC_ANY 0xff
+#define SCMD_FAILURE_ASCQ_ANY 0xff
+/* Always retry a matching failure. */
+#define SCMD_FAILURE_NO_LIMIT -1
+
+struct scsi_failure {
+ int result;
+ u8 sense;
+ u8 asc;
+ u8 ascq;
+
+ /*
+ * Number of attempts allowed for this failure. It does not count
+ * for the total_allowed.
+ */
+ s8 allowed;
+ s8 retries;
+};
+
+struct scsi_failures {
+ /*
+ * If the failure does not have a specific limit in the scsi_failure
+ * then this limit is followed.
+ */
+ int total_allowed;
+ int total_retries;
+ struct scsi_failure *failure_definitions;
+};
+
/* Optional arguments to scsi_execute_cmd */
struct scsi_exec_args {
unsigned char *sense; /* sense buffer */
@@ -491,12 +537,14 @@ struct scsi_exec_args {
blk_mq_req_flags_t req_flags; /* BLK_MQ_REQ flags */
int scmd_flags; /* SCMD flags */
int *resid; /* residual length */
+ struct scsi_failures *failures; /* failures to retry */
};
int scsi_execute_cmd(struct scsi_device *sdev, const unsigned char *cmd,
blk_opf_t opf, void *buffer, unsigned int bufflen,
int timeout, int retries,
const struct scsi_exec_args *args);
+void scsi_reset_failures(struct scsi_failures *failures);
extern void sdev_disable_disk_events(struct scsi_device *sdev);
extern void sdev_enable_disk_events(struct scsi_device *sdev);
--
2.34.1
next prev parent reply other threads:[~2023-11-14 1:38 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-14 1:37 [PATCH v12 00/20] scsi: Allow scsi_execute users to request retries Mike Christie
2023-11-14 1:37 ` Mike Christie [this message]
2023-11-16 10:53 ` [PATCH v12 01/20] scsi: Allow passthrough to request scsi-ml retries John Garry
2023-11-14 1:37 ` [PATCH v12 02/20] scsi: Have scsi-ml retry scsi_probe_lun errors Mike Christie
2023-11-16 11:14 ` John Garry
2023-11-16 16:38 ` Mike Christie
2023-11-14 1:37 ` [PATCH v12 03/20] scsi: retry INQUIRY after timeout Mike Christie
2023-11-14 1:37 ` [PATCH v12 04/20] scsi: sd: Have scsi-ml retry read_capacity_16 errors Mike Christie
2023-11-16 11:39 ` John Garry
2023-11-16 17:15 ` Mike Christie
2023-11-16 17:57 ` Martin Wilck
2023-11-14 1:37 ` [PATCH v12 05/20] scsi: Use separate buf for START_STOP in sd_spinup_disk Mike Christie
2023-11-14 1:37 ` [PATCH v12 06/20] scsi: Have scsi-ml retry sd_spinup_disk errors Mike Christie
2023-11-16 12:13 ` John Garry
2023-11-16 16:44 ` Mike Christie
2023-11-14 1:37 ` [PATCH v12 07/20] scsi: hp_sw: Have scsi-ml retry scsi_execute_cmd errors Mike Christie
2023-11-14 1:37 ` [PATCH v12 08/20] scsi: rdac: Have scsi-ml retry send_mode_select errors Mike Christie
2023-11-14 1:37 ` [PATCH v12 09/20] scsi: spi: Have scsi-ml retry spi_execute UAs Mike Christie
2023-11-14 1:37 ` [PATCH v12 10/20] scsi: sd: Have scsi-ml retry sd_sync_cache errors Mike Christie
2023-11-14 1:37 ` [PATCH v12 11/20] scsi: ch: Remove unit_attention Mike Christie
2023-11-14 1:37 ` [PATCH v12 12/20] scsi: ch: Have scsi-ml retry ch_do_scsi UAs Mike Christie
2023-11-14 1:37 ` [PATCH v12 13/20] scsi: Have scsi-ml retry scsi_mode_sense UAs Mike Christie
2023-11-14 1:37 ` [PATCH v12 14/20] scsi: Have scsi-ml retry scsi_report_lun_scan errors Mike Christie
2023-11-14 1:37 ` [PATCH v12 15/20] scsi: sd: Have pr commands retry UAs Mike Christie
2023-11-14 1:37 ` [PATCH v12 16/20] scsi: sd: Have scsi-ml retry read_capacity_10 errors Mike Christie
2023-11-14 1:37 ` [PATCH v12 17/20] scsi: ses: Have scsi-ml retry scsi_execute_cmd errors Mike Christie
2023-11-14 1:37 ` [PATCH v12 18/20] scsi: sr: Have scsi-ml retry get_sectorsize errors Mike Christie
2023-11-14 1:37 ` [PATCH v12 19/20] scsi: ufs: Have scsi-ml retry start stop errors Mike Christie
2023-11-14 1:37 ` [PATCH v12 20/20] scsi: Add kunit tests for scsi_check_passthrough Mike Christie
2023-11-14 18:38 ` Bart Van Assche
2023-11-16 11:02 ` [PATCH v12 00/20] scsi: Allow scsi_execute users to request retries John Garry
2023-11-16 16:29 ` Mike Christie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231114013750.76609-2-michael.christie@oracle.com \
--to=michael.christie@oracle.com \
--cc=bvanassche@acm.org \
--cc=hch@lst.de \
--cc=james.bottomley@hansenpartnership.com \
--cc=john.g.garry@oracle.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=mwilck@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox