From: Mike Christie <michael.christie@oracle.com>
To: bvanassche@acm.org, mwilck@suse.com, 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 v7 11/22] scsi: spi: Have scsi-ml retry spi_execute errors
Date: Mon, 23 Jan 2023 16:10:35 -0600 [thread overview]
Message-ID: <20230123221046.125483-12-michael.christie@oracle.com> (raw)
In-Reply-To: <20230123221046.125483-1-michael.christie@oracle.com>
This has spi_execute have scsi-ml retry errors instead of driving them.
There is one behavior change where we no longer retry when
scsi_execute_cmd returns < 0, but we should be ok. We don't need to retry
for failures like the queue being removed, and for the case where there
are no tags/reqs the block layer waits/retries for us. For possible memory
allocation failures from blk_rq_map_kern we use GFP_NOIO, so retrying
will probably not help.
Signed-off-by: Mike Christie <michael.christie@oracle.com>
---
drivers/scsi/scsi_transport_spi.c | 35 ++++++++++++++++---------------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c
index 2442d4d2e3f3..b269144dca3e 100644
--- a/drivers/scsi/scsi_transport_spi.c
+++ b/drivers/scsi/scsi_transport_spi.c
@@ -108,29 +108,30 @@ static int spi_execute(struct scsi_device *sdev, const void *cmd,
enum req_op op, void *buffer, unsigned int bufflen,
struct scsi_sense_hdr *sshdr)
{
- int i, result;
- struct scsi_sense_hdr sshdr_tmp;
blk_opf_t opf = op | REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT |
REQ_FAILFAST_DRIVER;
+ struct scsi_failure failures[] = {
+ {
+ .sense = UNIT_ATTENTION,
+ .asc = SCMD_FAILURE_ASC_ANY,
+ .ascq = SCMD_FAILURE_ASCQ_ANY,
+ .allowed = DV_RETRIES,
+ .result = SAM_STAT_CHECK_CONDITION,
+ },
+ {},
+ };
const struct scsi_exec_args exec_args = {
.req_flags = BLK_MQ_REQ_PM,
- .sshdr = sshdr ? : &sshdr_tmp,
+ .sshdr = sshdr,
+ .failures = failures,
};
- sshdr = exec_args.sshdr;
-
- for(i = 0; i < DV_RETRIES; i++) {
- /*
- * The purpose of the RQF_PM flag below is to bypass the
- * SDEV_QUIESCE state.
- */
- result = scsi_execute_cmd(sdev, cmd, opf, buffer, bufflen,
- DV_TIMEOUT, 1, &exec_args);
- if (result < 0 || !scsi_sense_valid(sshdr) ||
- sshdr->sense_key != UNIT_ATTENTION)
- break;
- }
- return result;
+ /*
+ * The purpose of the RQF_PM flag below is to bypass the
+ * SDEV_QUIESCE state.
+ */
+ return scsi_execute_cmd(sdev, cmd, opf, buffer, bufflen, DV_TIMEOUT, 1,
+ &exec_args);
}
static struct {
--
2.25.1
next prev parent reply other threads:[~2023-01-23 22:12 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-23 22:10 [PATCH v7 01/22] scsi: Allow scsi_execute users to control retries Mike Christie
2023-01-23 22:10 ` [PATCH v7 01/22] scsi: Add helper to prep sense during error handling Mike Christie
2023-01-23 22:10 ` [PATCH v7 02/22] scsi: Allow passthrough to override what errors to retry Mike Christie
2023-01-23 22:10 ` [PATCH v7 03/22] scsi: Add scsi_failure field to scsi_exec_args Mike Christie
2023-01-23 22:10 ` [PATCH v7 04/22] scsi: Have scsi-ml retry scsi_probe_lun errors Mike Christie
2023-01-23 22:10 ` [PATCH v7 05/22] scsi: retry INQUIRY after timeout Mike Christie
2023-01-23 22:10 ` [PATCH v7 06/22] scsi: Have scsi-ml retry read_capacity_16 errors Mike Christie
2023-01-23 22:10 ` [PATCH v7 07/22] scsi: Use separate buf for START_STOP in sd_spinup_disk Mike Christie
2023-01-23 22:10 ` [PATCH v7 08/22] scsi: Have scsi-ml retry sd_spinup_disk errors Mike Christie
2023-01-23 22:10 ` [PATCH v7 09/22] scsi: hp_sw: Have scsi-ml retry scsi_exec_req errors Mike Christie
2023-01-23 22:10 ` [PATCH v7 10/22] scsi: rdac: Have scsi-ml retry send_mode_select errors Mike Christie
2023-01-23 22:10 ` Mike Christie [this message]
2023-01-23 22:10 ` [PATCH v7 12/22] scsi: sd: Have scsi-ml retry sd_sync_cache errors Mike Christie
2023-01-23 22:10 ` [PATCH v7 13/22] scsi: ch: Remove unit_attention Mike Christie
2023-01-23 22:10 ` [PATCH v7 14/22] scsi: ch: Have scsi-ml retry ch_do_scsi errors Mike Christie
2023-01-23 22:10 ` [PATCH v7 15/22] scsi: Have scsi-ml retry scsi_mode_sense UAs Mike Christie
2023-01-23 22:10 ` [PATCH v7 16/22] scsi: Have scsi-ml retry scsi_report_lun_scan errors Mike Christie
2023-01-23 22:10 ` [PATCH v7 17/22] scsi: sd: Have sd_pr_command retry UAs Mike Christie
2023-01-23 22:10 ` [PATCH v7 18/22] scsi: sd: Have scsi-ml retry read_capacity_10 errors Mike Christie
2023-01-23 22:10 ` [PATCH v7 19/22] scsi: ses: Have scsi-ml retry scsi_exec_req errors Mike Christie
2023-01-23 22:10 ` [PATCH v7 20/22] scsi: sr: Have scsi-ml retry get_sectorsize errors Mike Christie
2023-01-23 22:10 ` [PATCH v7 21/22] scsi: ufs: Have scsi-ml retry start stop errors Mike Christie
2023-01-23 22:10 ` [PATCH v7 22/22] scsi: Add kunit tests for scsi_check_passthrough 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=20230123221046.125483-12-michael.christie@oracle.com \
--to=michael.christie@oracle.com \
--cc=bvanassche@acm.org \
--cc=hch@lst.de \
--cc=james.bottomley@hansenpartnership.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;
as well as URLs for NNTP newsgroup(s).