From: Wenchao Hao <haowenchao2@huawei.com>
To: "James E . J . Bottomley" <jejb@linux.ibm.com>,
"Martin K . Petersen" <martin.petersen@oracle.com>,
Douglas Gilbert <dgilbert@interlog.com>,
<linux-scsi@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <linfeilong@huawei.com>, <louhongxiang@huawei.com>,
Wenchao Hao <haowenchao2@huawei.com>
Subject: [PATCH v2 5/6] scsi:scsi_debug: Return failed value if the error is injected
Date: Fri, 28 Apr 2023 09:33:19 +0800 [thread overview]
Message-ID: <20230428013320.347050-6-haowenchao2@huawei.com> (raw)
In-Reply-To: <20230428013320.347050-1-haowenchao2@huawei.com>
If a fail queuecommand error is injected, return the failed value defined
in the rule from queuecommand.
We can make any scsi command's queuecommand return the value we desired,
for example make it return SCSI_MLQUEUE_HOST_BUSY.
error=/sys/kernel/debug/scsi_debug/0:0:0:1/error
echo "1 1 0x12 0x1055" > $error
would make all inquiry(0x12) command's queuecommand return 0x1055:
Signed-off-by: Wenchao Hao <haowenchao2@huawei.com>
---
drivers/scsi/scsi_debug.c | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 2d31ae15bd97..340299e63069 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -7738,6 +7738,30 @@ static int sdebug_timeout_cmd(struct scsi_cmnd *cmnd)
return 0;
}
+static int sdebug_fail_queue_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_FAIL_QUEUE_CMD &&
+ (err->cmd == cmd[0] || err->cmd == 0xff)) {
+ ret = err->cnt ? err->queuecmd_ret : 0;
+ if (err->cnt < 0)
+ err->cnt++;
+ return ret;
+ }
+ }
+
+ return 0;
+}
+
static int scsi_debug_queuecommand(struct Scsi_Host *shost,
struct scsi_cmnd *scp)
{
@@ -7757,6 +7781,7 @@ static int scsi_debug_queuecommand(struct Scsi_Host *shost,
u8 opcode = cmd[0];
bool has_wlun_rl;
bool inject_now;
+ int ret = 0;
scsi_set_resid(scp, 0);
if (sdebug_statistics) {
@@ -7802,6 +7827,13 @@ static int scsi_debug_queuecommand(struct Scsi_Host *shost,
return 0;
}
+ ret = sdebug_fail_queue_cmd(scp);
+ if (ret) {
+ scmd_printk(KERN_INFO, scp, "fail queue command 0x%x with 0x%x\n",
+ opcode, ret);
+ return ret;
+ }
+
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-04-27 12:13 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-28 1:33 [PATCH v2 0/6] scsi:scsi_debug: Add error injection for single device Wenchao Hao
2023-04-28 1:33 ` [PATCH v2 1/6] scsi:scsi_debug: create scsi_debug directory in the debugfs filesystem Wenchao Hao
2023-04-28 1:33 ` [PATCH v2 2/6] scsi:scsi_debug: Add interface to manage single device's error inject Wenchao Hao
2023-05-11 10:57 ` Dan Carpenter
2023-04-28 1:33 ` [PATCH v2 3/6] scsi:scsi_debug: Define grammar to remove added error injection Wenchao Hao
2023-04-28 1:33 ` [PATCH v2 4/6] scsi:scsi_debug: timeout command if the error is injected Wenchao Hao
2023-04-28 1:33 ` Wenchao Hao [this message]
2023-04-28 1:33 ` [PATCH v2 6/6] scsi:scsi_debug: set command's result and sense data " Wenchao Hao
2023-05-11 11:02 ` Dan Carpenter
2023-05-02 23:52 ` [PATCH v2 0/6] scsi:scsi_debug: Add error injection for single device Douglas Gilbert
2023-05-04 12:56 ` haowenchao (C)
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=20230428013320.347050-6-haowenchao2@huawei.com \
--to=haowenchao2@huawei.com \
--cc=dgilbert@interlog.com \
--cc=jejb@linux.ibm.com \
--cc=linfeilong@huawei.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®