diff mbox series

[v2] scsi: core: use eh_timeout to timeout start_unit command

Message ID 1636507412-21678-1-git-send-email-brookxu.cn@gmail.com
State New
Headers show
Series [v2] scsi: core: use eh_timeout to timeout start_unit command | expand

Commit Message

brookxu Nov. 10, 2021, 1:23 a.m. UTC 
From: Chunguang Xu <brookxu@tencent.com>

In some abnormal scenarios, STU may timeout. The recovery
time of 30 seconds is relatively large. Now we need to modify
rq_timeout to adjust STU timeout value, but it will affect the
actual IO.

commit 9728c0814ecb ("[SCSI] make scsi_eh_try_stu use block
timeout") use rq_timeout to timeout the STU command, but after
commit 0816c9251a71 ("[SCSI] 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 recovery
time through eh_timeout.

Signed-off-by: Chunguang Xu <brookxu@tencent.com>
---
v2: Update commit log and fix some format issues.

 drivers/scsi/scsi_error.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index a531336..a665318 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1404,7 +1404,8 @@  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;