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 09/22] scsi: hp_sw: Have scsi-ml retry scsi_exec_req errors
Date: Mon, 23 Jan 2023 16:10:33 -0600 [thread overview]
Message-ID: <20230123221046.125483-10-michael.christie@oracle.com> (raw)
In-Reply-To: <20230123221046.125483-1-michael.christie@oracle.com>
This has hp_sw have scsi-ml retry scsi_exec_req errors instead of driving
them itself.
Signed-off-by: Mike Christie <michael.christie@oracle.com>
---
drivers/scsi/device_handler/scsi_dh_hp_sw.c | 42 +++++++++++++--------
1 file changed, 27 insertions(+), 15 deletions(-)
diff --git a/drivers/scsi/device_handler/scsi_dh_hp_sw.c b/drivers/scsi/device_handler/scsi_dh_hp_sw.c
index 5f2f943d926c..6789ccfbf4f7 100644
--- a/drivers/scsi/device_handler/scsi_dh_hp_sw.c
+++ b/drivers/scsi/device_handler/scsi_dh_hp_sw.c
@@ -46,9 +46,6 @@ static int tur_done(struct scsi_device *sdev, struct hp_sw_dh_data *h,
int ret = SCSI_DH_IO;
switch (sshdr->sense_key) {
- case UNIT_ATTENTION:
- ret = SCSI_DH_IMM_RETRY;
- break;
case NOT_READY:
if (sshdr->asc == 0x04 && sshdr->ascq == 2) {
/*
@@ -85,11 +82,21 @@ static int hp_sw_tur(struct scsi_device *sdev, struct hp_sw_dh_data *h)
int ret = SCSI_DH_OK, res;
blk_opf_t opf = REQ_OP_DRV_IN | 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 = SCMD_FAILURE_NO_LIMIT,
+ .result = SAM_STAT_CHECK_CONDITION,
+ },
+ {},
+ };
const struct scsi_exec_args exec_args = {
.sshdr = &sshdr,
+ .failures = failures,
};
-retry:
res = scsi_execute_cmd(sdev, cmd, opf, NULL, 0, HP_SW_TIMEOUT,
HP_SW_RETRIES, &exec_args);
if (res) {
@@ -105,8 +112,6 @@ static int hp_sw_tur(struct scsi_device *sdev, struct hp_sw_dh_data *h)
h->path_state = HP_SW_PATH_ACTIVE;
ret = SCSI_DH_OK;
}
- if (ret == SCSI_DH_IMM_RETRY)
- goto retry;
return ret;
}
@@ -123,14 +128,28 @@ static int hp_sw_start_stop(struct hp_sw_dh_data *h)
struct scsi_sense_hdr sshdr;
struct scsi_device *sdev = h->sdev;
int res, rc = SCSI_DH_OK;
- int retry_cnt = HP_SW_RETRIES;
blk_opf_t opf = REQ_OP_DRV_IN | REQ_FAILFAST_DEV |
REQ_FAILFAST_TRANSPORT | REQ_FAILFAST_DRIVER;
+ struct scsi_failure failures[] = {
+ {
+ /*
+ * LUN not ready - manual intervention required
+ *
+ * Switch-over in progress, retry.
+ */
+ .sense = NOT_READY,
+ .asc = 0x04,
+ .ascq = 0x03,
+ .allowed = HP_SW_RETRIES,
+ .result = SAM_STAT_CHECK_CONDITION,
+ },
+ {},
+ };
const struct scsi_exec_args exec_args = {
.sshdr = &sshdr,
+ .failures = failures,
};
-retry:
res = scsi_execute_cmd(sdev, cmd, opf, NULL, 0, HP_SW_TIMEOUT,
HP_SW_RETRIES, &exec_args);
if (res) {
@@ -143,13 +162,6 @@ static int hp_sw_start_stop(struct hp_sw_dh_data *h)
switch (sshdr.sense_key) {
case NOT_READY:
if (sshdr.asc == 0x04 && sshdr.ascq == 3) {
- /*
- * LUN not ready - manual intervention required
- *
- * Switch-over in progress, retry.
- */
- if (--retry_cnt)
- goto retry;
rc = SCSI_DH_RETRY;
break;
}
--
2.25.1
next prev parent reply other threads:[~2023-01-23 22:14 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 ` Mike Christie [this message]
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 ` [PATCH v7 11/22] scsi: spi: Have scsi-ml retry spi_execute errors Mike Christie
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-10-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).