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>,
<haowenchao2@huawei.com>
Subject: [PATCH 5/5] scsi:scsi_debug: set command's result and sense data if the error is injected
Date: Thu, 23 Mar 2023 19:56:01 +0800 [thread overview]
Message-ID: <20230323115601.178494-6-haowenchao2@huawei.com> (raw)
In-Reply-To: <20230323115601.178494-1-haowenchao2@huawei.com>
If a fail commnd error is injected, set the command's status and sense
data then finish this scsi command.
For example, the following command would make read(0x88) command finished
with UNC for 8 times:
error=/sys/class/scsi_device/0:0:0:1/device/error_inject/error
echo "2 -8 0x88 0 0 0x2 0x3 0x11 0x0" >$error
Signed-off-by: Wenchao Hao <haowenchao2@huawei.com>
---
drivers/scsi/scsi_debug.c | 46 +++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 1deccf8dfc90..863e1a23c055 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -7788,6 +7788,41 @@ static int sdebug_fail_queue_cmd(struct scsi_cmnd *cmnd)
return 0;
}
+static int sdebug_fail_cmd(struct scsi_cmnd *cmnd, int *retval,
+ struct sdebug_err_inject *info)
+{
+ 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;
+ int result;
+
+ if (devip == NULL)
+ return 0;
+
+ list_for_each_entry(err, &devip->inject_err_list, list) {
+ if (err->type == ERR_FAIL_CMD &&
+ (err->cmd == cmd[0] || err->cmd == 0xff)) {
+ if (!err->cnt)
+ return 0;
+ ret = !!err->cnt;
+ goto out_handle;
+ }
+ }
+ return 0;
+
+out_handle:
+ if (err->cnt < 0)
+ err->cnt++;
+ mk_sense_buffer(cmnd, err->sense_key, err->asc, err->asq);
+ result = err->status_byte | err->host_byte << 16 | err->driver_byte << 24;
+ *info = *err;
+ *retval = schedule_resp(cmnd, devip, result, NULL, 0, 0);
+
+ return ret;
+}
+
static int scsi_debug_queuecommand(struct Scsi_Host *shost,
struct scsi_cmnd *scp)
{
@@ -7808,6 +7843,7 @@ static int scsi_debug_queuecommand(struct Scsi_Host *shost,
bool has_wlun_rl;
bool inject_now;
int ret = 0;
+ struct sdebug_err_inject err;
scsi_set_resid(scp, 0);
if (sdebug_statistics) {
@@ -7860,6 +7896,16 @@ static int scsi_debug_queuecommand(struct Scsi_Host *shost,
return ret;
}
+ if (sdebug_fail_cmd(scp, &ret, &err)) {
+ scmd_printk(KERN_INFO, scp,
+ "fail command 0x%x with hostbyte=0x%x, "
+ "driverbyte=0x%x, statusbyte=0x%x, "
+ "sense_key=0x%x, asc=0x%x, asq=0x%x\n",
+ opcode, err.host_byte, err.driver_byte,
+ err.status_byte, err.sense_key, err.asc, err.asq);
+ return ret;
+ }
+
if (unlikely(inject_now && !atomic_read(&sdeb_inject_pending)))
atomic_set(&sdeb_inject_pending, 1);
--
2.35.3
next prev parent reply other threads:[~2023-03-23 11:57 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-23 11:55 [PATCH 0/5]scsi:scsi_debug: Add error injection for single device Wenchao Hao
2023-03-23 11:55 ` [PATCH 1/5] scsi:scsi_debug: Add sysfs interface to manage scsi devices' error injection Wenchao Hao
2023-03-23 11:55 ` [PATCH 2/5] scsi:scsi_debug: Define grammar to remove added " Wenchao Hao
2023-03-23 11:55 ` [PATCH 3/5] scsi:scsi_debug: timeout command if the error is injected Wenchao Hao
2023-03-23 11:56 ` [PATCH 4/5] scsi:scsi_debug: Return failed value " Wenchao Hao
2023-03-23 11:56 ` Wenchao Hao [this message]
2023-03-23 12:40 ` [PATCH 0/5]scsi:scsi_debug: Add error injection for single device John Garry
2023-03-23 13:13 ` haowenchao (C)
2023-03-23 16:25 ` John Garry
2023-03-23 17:24 ` Douglas Gilbert
2023-03-24 3:42 ` haowenchao (C)
2023-03-24 17:31 ` Douglas Gilbert
2023-03-25 3:23 ` haowenchao (C)
2023-03-24 3:42 ` haowenchao (C)
2023-03-24 16:01 ` Bart Van Assche
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=20230323115601.178494-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