From: brookxu <brookxu.cn@gmail.com>
To: jejb@linux.ibm.com, martin.petersen@oracle.com
Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [RESEND PATCH] scsi: core: use eh_timeout to timeout start_unit command
Date: Mon, 8 Nov 2021 10:19:16 +0800 [thread overview]
Message-ID: <1636337956-26088-1-git-send-email-brookxu.cn@gmail.com> (raw)
From: Chunguang Xu <brookxu@tencent.com>
In some abnormal scenarios, STU may timeout. The recovery time
of 30 seconds is relatively long. Now we need to adjusting
rq_timeout to adjust STU timeout value, but it will affect the
actual IO.
ptach 9728c081(make scsi_eh_try_stu use block timeout) uses
rq_timeout to timeout the STU command, but after pathc 0816c92(
Allow error handling timeout to be specified) eh_timeout will
init to SCSI_DEFAULT_EH_TIMEOUT, so it is more reasonable to
use eh_timeout as the timeout value of STU command. In this way,
we can uniformly control the recovery time through eh_timeout.
Signed-off-by: Chunguang Xu <brookxu@tencent.com>
---
drivers/scsi/scsi_error.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index b6c86cc..ec864d1 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1404,7 +1404,7 @@ static int scsi_eh_try_stu(struct scsi_cmnd *scmd)
enum scsi_disposition rtn = NEEDS_RETRY;
for (i = 0; rtn == NEEDS_RETRY && i < 2; i++)
- rtn = scsi_send_eh_cmnd(scmd, stu_command, 6, scmd->device->request_queue->rq_timeout, 0);
+ rtn = scsi_send_eh_cmnd(scmd, stu_command, 6, scmd->device->eh_timeout, 0);
if (rtn == SUCCESS)
return 0;
--
1.8.3.1
next reply other threads:[~2021-11-08 2:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-08 2:19 brookxu [this message]
2021-11-09 10:03 ` [RESEND PATCH] scsi: core: use eh_timeout to timeout start_unit command Christoph Hellwig
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=1636337956-26088-1-git-send-email-brookxu.cn@gmail.com \
--to=brookxu.cn@gmail.com \
--cc=jejb@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.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).