From: Wenchao Hao <haowenchao@huawei.com>
To: "James E . J . Bottomley" <jejb@linux.ibm.com>,
"Martin K . Petersen" <martin.petersen@oracle.com>,
Doug Gilbert <dgilbert@interlog.com>
Cc: <linux-scsi@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Wenchao Hao <haowenchao@huawei.com>
Subject: [RFC PATCH 3/5] scsi:scsi_debug: make command timeout if timeout error is injected
Date: Wed, 9 Nov 2022 10:59:48 -0500 [thread overview]
Message-ID: <20221109155950.3536976-4-haowenchao@huawei.com> (raw)
In-Reply-To: <20221109155950.3536976-1-haowenchao@huawei.com>
If a timeout error is injected for specific scsi command, just return
0 in queuecommand to make it timeout.
For example, the following command would inject timeout error for
inquiry(0x12) command for 10 times:
echo "0 -10 0x12" >/sys/block/sdb/device/error_inject/error
Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
---
drivers/scsi/scsi_debug.c | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 06e3150812fa..761e1e3bcb9a 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -7784,6 +7784,30 @@ const struct attribute_group *sdebug_sdev_groups[] = {
NULL
};
+static int sdebug_timeout_cmd(struct scsi_cmnd *cmnd)
+{
+ struct scsi_device *sdp = cmnd->device;
+ struct sdebug_dev_info *devip = (struct sdebug_dev_info *)sdp->hostdata;
+ struct sdebug_err_inject *err;
+ unsigned char *cmd = cmnd->cmnd;
+ int ret = 0;
+
+ if (devip == NULL)
+ return 0;
+
+ list_for_each_entry(err, &devip->inject_err_list, list) {
+ if (err->type == ERR_TMOUT_CMD &&
+ (err->cmd == cmd[0] || err->cmd == 0xff)) {
+ ret = !!err->cnt;
+ if (err->cnt < 0)
+ err->cnt++;
+ return ret;
+ }
+ }
+
+ return 0;
+}
+
static int scsi_debug_queuecommand(struct Scsi_Host *shost,
struct scsi_cmnd *scp)
{
@@ -7842,6 +7866,12 @@ static int scsi_debug_queuecommand(struct Scsi_Host *shost,
if (NULL == devip)
goto err_out;
}
+
+ if (sdebug_timeout_cmd(scp)) {
+ scmd_printk(KERN_INFO, scp, "timeout command 0x%x\n", opcode);
+ return 0;
+ }
+
if (unlikely(inject_now && !atomic_read(&sdeb_inject_pending)))
atomic_set(&sdeb_inject_pending, 1);
--
2.35.3
next prev parent reply other threads:[~2022-11-09 2:44 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-09 15:59 [RFC PATCH 0/5] scsi:scsi_debug:Add error injection for single lun Wenchao Hao
2022-11-09 15:59 ` [RFC PATCH 1/5] scsi:scsi_debug: Add sysfs interface to manager single devices' error inject Wenchao Hao
2022-11-09 15:59 ` [RFC PATCH 2/5] scsi:scsi_debug: Add interface to remove injection which has been added Wenchao Hao
2022-11-09 15:59 ` Wenchao Hao [this message]
2022-11-09 15:59 ` [RFC PATCH 4/5] scsi:scsi_debug: Return failed value for specific command's queuecommand Wenchao Hao
2022-11-09 15:59 ` [RFC PATCH 5/5] scsi:scsi_debug: fail specific scsi command with result and sense data Wenchao Hao
2022-11-13 21:48 ` [RFC PATCH 0/5] scsi:scsi_debug:Add error injection for single lun Douglas Gilbert
2022-11-14 0:30 ` Damien Le Moal
2022-11-14 2:54 ` Douglas Gilbert
2022-11-14 2:55 ` Damien Le Moal
2022-11-21 14:26 ` Wenchao Hao
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=20221109155950.3536976-4-haowenchao@huawei.com \
--to=haowenchao@huawei.com \
--cc=dgilbert@interlog.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
all inboxes | Powered by JetHome®