From: Wenchao Hao <haowenchao2@huawei.com>
To: "Martin K . Petersen" <martin.petersen@oracle.com>,
Douglas Gilbert <dgilbert@interlog.com>
Cc: "James E . J . Bottomley" <jejb@linux.ibm.com>,
<linux-scsi@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<louhongxiang@huawei.com>, Wenchao Hao <haowenchao2@huawei.com>
Subject: [PATCH v6 04/10] scsi: scsi_debug: timeout command if the error is injected
Date: Tue, 10 Oct 2023 17:20:45 +0800 [thread overview]
Message-ID: <20231010092051.608007-5-haowenchao2@huawei.com> (raw)
In-Reply-To: <20231010092051.608007-1-haowenchao2@huawei.com>
If a timeout error is injected, return 0 from scsi_debug_queuecommand to
make the command timeout.
Timeout SCSI command format:
+--------+------+-------------------------------------------------------+
| Column | Type | Description |
+--------+------+-------------------------------------------------------+
| 1 | u8 | Error type, fixed to 0x0 |
+--------+------+-------------------------------------------------------+
| 2 | s32 | Error count |
| | | 0: this rule will be ignored |
| | | positive: the rule will always take effect |
| | | negative: the rule takes effect n times where -n is |
| | | the value given. Ignored after n times |
+--------+------+-------------------------------------------------------+
| 3 | x8 | SCSI command opcode, 0xff for all commands |
+--------+------+-------------------------------------------------------+
Examples:
error=/sys/kernel/debug/scsi_debug/0:0:0:1/error
echo "0 -10 0x12" > ${error}
will make the device's inquiry command timeout 10 times.
echo "0 1 0x12" > ${error}
will make the device's inquiry timeout each time it is invoked on this
device.
Acked-by: Douglas Gilbert <dgilbert@interlog.com>
Signed-off-by: Wenchao Hao <haowenchao2@huawei.com>
---
drivers/scsi/scsi_debug.c | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 0d5a179dbd97..9081c9d22882 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -7741,6 +7741,34 @@ static int sdebug_blk_mq_poll(struct Scsi_Host *shost, unsigned int queue_num)
return num_entries;
}
+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;
+
+ rcu_read_lock();
+ list_for_each_entry_rcu(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++;
+
+ rcu_read_unlock();
+ return ret;
+ }
+ }
+ rcu_read_unlock();
+
+ return 0;
+}
+
static int scsi_debug_queuecommand(struct Scsi_Host *shost,
struct scsi_cmnd *scp)
{
@@ -7799,6 +7827,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.32.0
next prev parent reply other threads:[~2023-10-10 9:21 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-10 9:20 [PATCH v6 00/10] scsi:scsi_debug: Add error injection for single device Wenchao Hao
2023-10-10 9:20 ` [PATCH v6 01/10] scsi: scsi_debug: create scsi_debug directory in the debugfs filesystem Wenchao Hao
2023-10-10 9:20 ` [PATCH v6 02/10] scsi: scsi_debug: Add interface to manage single device's error inject Wenchao Hao
2023-10-10 9:20 ` [PATCH v6 03/10] scsi: scsi_debug: Define grammar to remove added error injection Wenchao Hao
2023-10-10 9:20 ` Wenchao Hao [this message]
2023-10-10 9:20 ` [PATCH v6 05/10] scsi: scsi_debug: Return failed value if the error is injected Wenchao Hao
2023-10-10 9:20 ` [PATCH v6 06/10] scsi: scsi_debug: set command's result and sense data " Wenchao Hao
2023-10-10 9:20 ` [PATCH v6 07/10] scsi: scsi_debug: Add new error injection abort failed Wenchao Hao
2023-10-10 9:20 ` [PATCH v6 08/10] scsi: scsi_debug: Add new error injection reset lun failed Wenchao Hao
2023-10-10 9:20 ` [PATCH v6 09/10] scsi: scsi_debug: Add debugfs interface to fail target reset Wenchao Hao
2023-10-10 9:20 ` [PATCH v6 10/10] scsi: scsi_debug: Add param to control sdev's allow_restart Wenchao Hao
2023-10-16 2:09 ` [PATCH v6 00/10] scsi:scsi_debug: Add error injection for single device Wenchao Hao
2023-10-17 0:53 ` Martin K. Petersen
2023-10-25 2:19 ` 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=20231010092051.608007-5-haowenchao2@huawei.com \
--to=haowenchao2@huawei.com \
--cc=dgilbert@interlog.com \
--cc=jejb@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=louhongxiang@huawei.com \
--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®