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 v2 04/12] scsi: rdac: Fix send_mode_select retry handling
Date: Wed, 4 Oct 2023 16:00:05 -0500 [thread overview]
Message-ID: <20231004210013.5601-5-michael.christie@oracle.com> (raw)
In-Reply-To: <20231004210013.5601-1-michael.christie@oracle.com>
If send_mode_select retries scsi_execute_cmd it will leave err set to
SCSI_DH_RETRY/SCSI_DH_IMM_RETRY. If on the retry, the command is
successful, then SCSI_DH_RETRY/SCSI_DH_IMM_RETRY will be returned to
the scsi_dh activation caller. On the retry, we will then detect the
previous MODE SELECT had worked, and so we will return success.
This patch has us return the correct return value, so we can avoid the
extra scsi_dh activation call and to avoid failures if the caller had
hit its activation retry limit and does not end up retrying.
Signed-off-by: Mike Christie <michael.christie@oracle.com>
Reviewed-by: Martin Wilck <mwilck@suse.com>
---
drivers/scsi/device_handler/scsi_dh_rdac.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/scsi/device_handler/scsi_dh_rdac.c b/drivers/scsi/device_handler/scsi_dh_rdac.c
index c5538645057a..b65586d6649c 100644
--- a/drivers/scsi/device_handler/scsi_dh_rdac.c
+++ b/drivers/scsi/device_handler/scsi_dh_rdac.c
@@ -530,7 +530,7 @@ static void send_mode_select(struct work_struct *work)
container_of(work, struct rdac_controller, ms_work);
struct scsi_device *sdev = ctlr->ms_sdev;
struct rdac_dh_data *h = sdev->handler_data;
- int err = SCSI_DH_OK, retry_cnt = RDAC_RETRY_COUNT;
+ int err, retry_cnt = RDAC_RETRY_COUNT;
struct rdac_queue_data *tmp, *qdata;
LIST_HEAD(list);
unsigned char cdb[MAX_COMMAND_SIZE];
@@ -558,20 +558,20 @@ static void send_mode_select(struct work_struct *work)
(char *) h->ctlr->array_name, h->ctlr->index,
(retry_cnt == RDAC_RETRY_COUNT) ? "queueing" : "retrying");
- if (scsi_execute_cmd(sdev, cdb, opf, &h->ctlr->mode_select, data_size,
- RDAC_TIMEOUT * HZ, RDAC_RETRIES, &exec_args)) {
+ if (!scsi_execute_cmd(sdev, cdb, opf, &h->ctlr->mode_select, data_size,
+ RDAC_TIMEOUT * HZ, RDAC_RETRIES, &exec_args)) {
+ h->state = RDAC_STATE_ACTIVE;
+ RDAC_LOG(RDAC_LOG_FAILOVER, sdev, "array %s, ctlr %d, "
+ "MODE_SELECT completed",
+ (char *) h->ctlr->array_name, h->ctlr->index);
+ err = SCSI_DH_OK;
+ } else {
err = mode_select_handle_sense(sdev, &sshdr);
if (err == SCSI_DH_RETRY && retry_cnt--)
goto retry;
if (err == SCSI_DH_IMM_RETRY)
goto retry;
}
- if (err == SCSI_DH_OK) {
- h->state = RDAC_STATE_ACTIVE;
- RDAC_LOG(RDAC_LOG_FAILOVER, sdev, "array %s, ctlr %d, "
- "MODE_SELECT completed",
- (char *) h->ctlr->array_name, h->ctlr->index);
- }
list_for_each_entry_safe(qdata, tmp, &list, entry) {
list_del(&qdata->entry);
--
2.34.1
next prev parent reply other threads:[~2023-10-04 21:02 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-04 21:00 [PATCH v2 00/12] scsi: sshdr and retry fixes Mike Christie
2023-10-04 21:00 ` [PATCH v2 01/12] scsi: sd: Fix sshdr use in read_capacity_16 Mike Christie
2023-10-04 21:00 ` [PATCH v2 02/12] scsi: sd: Fix sshdr use in sd_spinup_disk Mike Christie
2023-10-04 21:00 ` [PATCH v2 03/12] scsi: hp_sw: Fix sshdr use Mike Christie
2023-10-04 21:00 ` Mike Christie [this message]
2023-10-04 21:00 ` [PATCH v2 05/12] scsi: rdac: " Mike Christie
2023-10-04 21:12 ` Bart Van Assche
2023-10-04 21:00 ` [PATCH v2 06/12] scsi: spi: " Mike Christie
2023-10-04 21:00 ` [PATCH v2 07/12] scsi: sd: Fix sshdr use in sd_suspend_common Mike Christie
2023-10-04 21:15 ` Bart Van Assche
2023-10-04 21:00 ` [PATCH v2 08/12] scsi: sd: Fix scsi_mode_sense caller's sshdr use Mike Christie
2023-10-04 22:37 ` Damien Le Moal
2023-10-06 0:36 ` Mike Christie
2023-10-06 1:12 ` Damien Le Moal
2023-10-06 22:39 ` Mike Christie
2023-10-04 21:00 ` [PATCH v2 09/12] scsi: Fix sshdr use in scsi_test_unit_ready Mike Christie
2023-10-04 21:00 ` [PATCH v2 10/12] scsi: Fix sshdr use in scsi_cdl_enable Mike Christie
2023-10-04 21:00 ` [PATCH v2 11/12] scsi: sd: Fix sshdr use in cache_type_store Mike Christie
2023-10-04 21:00 ` [PATCH v2 12/12] scsi: sr: Fix sshdr use in sr_get_events Mike Christie
2023-10-13 20:54 ` [PATCH v2 00/12] scsi: sshdr and retry fixes Martin K. Petersen
2023-10-17 1:11 ` Martin K. Petersen
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=20231004210013.5601-5-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