| Message ID | 20230922092906.2645265-7-haowenchao2@huawei.com |
|---|---|
| State | New |
| Headers | show |
| Series | scsi:scsi_debug: Add error injection for single device | expand |
Hi Wenchao,
kernel test robot noticed the following build warnings:
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Wenchao-Hao/scsi-scsi_debug-create-scsi_debug-directory-in-the-debugfs-filesystem/20230922-173226
base: https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git for-next
patch link: https://lore.kernel.org/r/20230922092906.2645265-7-haowenchao2%40huawei.com
patch subject: [PATCH v5 06/10] scsi: scsi_debug: set command's result and sense data if the error is injected
config: x86_64-randconfig-161-20231003 (https://download.01.org/0day-ci/archive/20231005/202310050209.VOl6gV40-lkp@intel.com/config)
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce: (https://download.01.org/0day-ci/archive/20231005/202310050209.VOl6gV40-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
| Closes: https://lore.kernel.org/r/202310050209.VOl6gV40-lkp@intel.com/
smatch warnings:
drivers/scsi/scsi_debug.c:7912 scsi_debug_queuecommand() warn: missing error code? 'ret'
vim +/ret +7912 drivers/scsi/scsi_debug.c
fd32119b0deac1 Douglas Gilbert 2016-04-25 7832 static int scsi_debug_queuecommand(struct Scsi_Host *shost,
fd32119b0deac1 Douglas Gilbert 2016-04-25 7833 struct scsi_cmnd *scp)
c2248fc974df7b Douglas Gilbert 2014-11-24 7834 {
c2248fc974df7b Douglas Gilbert 2014-11-24 7835 u8 sdeb_i;
c2248fc974df7b Douglas Gilbert 2014-11-24 7836 struct scsi_device *sdp = scp->device;
c2248fc974df7b Douglas Gilbert 2014-11-24 7837 const struct opcode_info_t *oip;
c2248fc974df7b Douglas Gilbert 2014-11-24 7838 const struct opcode_info_t *r_oip;
c2248fc974df7b Douglas Gilbert 2014-11-24 7839 struct sdebug_dev_info *devip;
c2248fc974df7b Douglas Gilbert 2014-11-24 7840 u8 *cmd = scp->cmnd;
c2248fc974df7b Douglas Gilbert 2014-11-24 7841 int (*r_pfp)(struct scsi_cmnd *, struct sdebug_dev_info *);
f66b85171a0ebd Martin Wilck 2018-02-14 7842 int (*pfp)(struct scsi_cmnd *, struct sdebug_dev_info *) = NULL;
c2248fc974df7b Douglas Gilbert 2014-11-24 7843 int k, na;
c2248fc974df7b Douglas Gilbert 2014-11-24 7844 int errsts = 0;
ad0c7775e745d2 Douglas Gilbert 2020-08-21 7845 u64 lun_index = sdp->lun & 0x3FFF;
c2248fc974df7b Douglas Gilbert 2014-11-24 7846 u32 flags;
c2248fc974df7b Douglas Gilbert 2014-11-24 7847 u16 sa;
c2248fc974df7b Douglas Gilbert 2014-11-24 7848 u8 opcode = cmd[0];
c2248fc974df7b Douglas Gilbert 2014-11-24 7849 bool has_wlun_rl;
3a90a63d02b8b7 Douglas Gilbert 2020-07-12 7850 bool inject_now;
929aad8ff0578d Wenchao Hao 2023-09-22 7851 int ret = 0;
cc36ffafc0f7e6 Wenchao Hao 2023-09-22 7852 struct sdebug_err_inject err;
c2248fc974df7b Douglas Gilbert 2014-11-24 7853
c2248fc974df7b Douglas Gilbert 2014-11-24 7854 scsi_set_resid(scp, 0);
3a90a63d02b8b7 Douglas Gilbert 2020-07-12 7855 if (sdebug_statistics) {
c483739430f107 Douglas Gilbert 2016-05-06 7856 atomic_inc(&sdebug_cmnd_count);
3a90a63d02b8b7 Douglas Gilbert 2020-07-12 7857 inject_now = inject_on_this_cmd();
3a90a63d02b8b7 Douglas Gilbert 2020-07-12 7858 } else {
3a90a63d02b8b7 Douglas Gilbert 2020-07-12 7859 inject_now = false;
3a90a63d02b8b7 Douglas Gilbert 2020-07-12 7860 }
f46eb0e9fc763b Douglas Gilbert 2016-04-25 7861 if (unlikely(sdebug_verbose &&
f46eb0e9fc763b Douglas Gilbert 2016-04-25 7862 !(SDEBUG_OPT_NO_CDB_NOISE & sdebug_opts))) {
c2248fc974df7b Douglas Gilbert 2014-11-24 7863 char b[120];
c2248fc974df7b Douglas Gilbert 2014-11-24 7864 int n, len, sb;
c2248fc974df7b Douglas Gilbert 2014-11-24 7865
c2248fc974df7b Douglas Gilbert 2014-11-24 7866 len = scp->cmd_len;
c2248fc974df7b Douglas Gilbert 2014-11-24 7867 sb = (int)sizeof(b);
c2248fc974df7b Douglas Gilbert 2014-11-24 7868 if (len > 32)
c2248fc974df7b Douglas Gilbert 2014-11-24 7869 strcpy(b, "too long, over 32 bytes");
c2248fc974df7b Douglas Gilbert 2014-11-24 7870 else {
c2248fc974df7b Douglas Gilbert 2014-11-24 7871 for (k = 0, n = 0; k < len && n < sb; ++k)
c2248fc974df7b Douglas Gilbert 2014-11-24 7872 n += scnprintf(b + n, sb - n, "%02x ",
c2248fc974df7b Douglas Gilbert 2014-11-24 7873 (u32)cmd[k]);
c2248fc974df7b Douglas Gilbert 2014-11-24 7874 }
458df78b1c513d Bart Van Assche 2018-01-26 7875 sdev_printk(KERN_INFO, sdp, "%s: tag=%#x, cmd %s\n", my_name,
a6e76e6f2c0efd Bart Van Assche 2021-08-09 7876 blk_mq_unique_tag(scsi_cmd_to_rq(scp)), b);
c2248fc974df7b Douglas Gilbert 2014-11-24 7877 }
3a90a63d02b8b7 Douglas Gilbert 2020-07-12 7878 if (unlikely(inject_now && (sdebug_opts & SDEBUG_OPT_HOST_BUSY)))
7ee6d1b4357ac2 Bart Van Assche 2017-12-07 7879 return SCSI_MLQUEUE_HOST_BUSY;
34d55434ba1f39 Tomas Winkler 2015-07-28 7880 has_wlun_rl = (sdp->lun == SCSI_W_LUN_REPORT_LUNS);
ad0c7775e745d2 Douglas Gilbert 2020-08-21 7881 if (unlikely(lun_index >= sdebug_max_luns && !has_wlun_rl))
f46eb0e9fc763b Douglas Gilbert 2016-04-25 7882 goto err_out;
c2248fc974df7b Douglas Gilbert 2014-11-24 7883
c2248fc974df7b Douglas Gilbert 2014-11-24 7884 sdeb_i = opcode_ind_arr[opcode]; /* fully mapped */
c2248fc974df7b Douglas Gilbert 2014-11-24 7885 oip = &opcode_info_arr[sdeb_i]; /* safe if table consistent */
c2248fc974df7b Douglas Gilbert 2014-11-24 7886 devip = (struct sdebug_dev_info *)sdp->hostdata;
f46eb0e9fc763b Douglas Gilbert 2016-04-25 7887 if (unlikely(!devip)) {
f46eb0e9fc763b Douglas Gilbert 2016-04-25 7888 devip = find_build_dev_info(sdp);
c2248fc974df7b Douglas Gilbert 2014-11-24 7889 if (NULL == devip)
f46eb0e9fc763b Douglas Gilbert 2016-04-25 7890 goto err_out;
c2248fc974df7b Douglas Gilbert 2014-11-24 7891 }
3f07ff40cb2457 Wenchao Hao 2023-09-22 7892
3f07ff40cb2457 Wenchao Hao 2023-09-22 7893 if (sdebug_timeout_cmd(scp)) {
3f07ff40cb2457 Wenchao Hao 2023-09-22 7894 scmd_printk(KERN_INFO, scp, "timeout command 0x%x\n", opcode);
3f07ff40cb2457 Wenchao Hao 2023-09-22 7895 return 0;
3f07ff40cb2457 Wenchao Hao 2023-09-22 7896 }
3f07ff40cb2457 Wenchao Hao 2023-09-22 7897
929aad8ff0578d Wenchao Hao 2023-09-22 7898 ret = sdebug_fail_queue_cmd(scp);
929aad8ff0578d Wenchao Hao 2023-09-22 7899 if (ret) {
929aad8ff0578d Wenchao Hao 2023-09-22 7900 scmd_printk(KERN_INFO, scp, "fail queue command 0x%x with 0x%x\n",
929aad8ff0578d Wenchao Hao 2023-09-22 7901 opcode, ret);
929aad8ff0578d Wenchao Hao 2023-09-22 7902 return ret;
929aad8ff0578d Wenchao Hao 2023-09-22 7903 }
929aad8ff0578d Wenchao Hao 2023-09-22 7904
cc36ffafc0f7e6 Wenchao Hao 2023-09-22 7905 if (sdebug_fail_cmd(scp, &ret, &err)) {
cc36ffafc0f7e6 Wenchao Hao 2023-09-22 7906 scmd_printk(KERN_INFO, scp,
cc36ffafc0f7e6 Wenchao Hao 2023-09-22 7907 "fail command 0x%x with hostbyte=0x%x, "
cc36ffafc0f7e6 Wenchao Hao 2023-09-22 7908 "driverbyte=0x%x, statusbyte=0x%x, "
cc36ffafc0f7e6 Wenchao Hao 2023-09-22 7909 "sense_key=0x%x, asc=0x%x, asq=0x%x\n",
cc36ffafc0f7e6 Wenchao Hao 2023-09-22 7910 opcode, err.host_byte, err.driver_byte,
cc36ffafc0f7e6 Wenchao Hao 2023-09-22 7911 err.status_byte, err.sense_key, err.asc, err.asq);
cc36ffafc0f7e6 Wenchao Hao 2023-09-22 @7912 return ret;
This returns zero but it should be an error code.
cc36ffafc0f7e6 Wenchao Hao 2023-09-22 7913 }
cc36ffafc0f7e6 Wenchao Hao 2023-09-22 7914
3a90a63d02b8b7 Douglas Gilbert 2020-07-12 7915 if (unlikely(inject_now && !atomic_read(&sdeb_inject_pending)))
3a90a63d02b8b7 Douglas Gilbert 2020-07-12 7916 atomic_set(&sdeb_inject_pending, 1);
3a90a63d02b8b7 Douglas Gilbert 2020-07-12 7917
c2248fc974df7b Douglas Gilbert 2014-11-24 7918 na = oip->num_attached;
c2248fc974df7b Douglas Gilbert 2014-11-24 7919 r_pfp = oip->pfp;
c2248fc974df7b Douglas Gilbert 2014-11-24 7920 if (na) { /* multiple commands with this opcode */
c2248fc974df7b Douglas Gilbert 2014-11-24 7921 r_oip = oip;
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c index dea40d983155..fe1f7421f617 100644 --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c @@ -7787,6 +7787,48 @@ 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; + + rcu_read_lock(); + list_for_each_entry_rcu(err, &devip->inject_err_list, list) { + if (err->type == ERR_FAIL_CMD && + (err->cmd == cmd[0] || err->cmd == 0xff)) { + if (!err->cnt) { + rcu_read_unlock(); + return 0; + } + + ret = !!err->cnt; + rcu_read_unlock(); + goto out_handle; + } + } + rcu_read_unlock(); + + 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) { @@ -7807,6 +7849,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) { @@ -7859,6 +7902,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);
If a fail commnd error is injected, set the command's status and sense data then finish this scsi command. Set SCSI command's status and sense data format: +--------+------+-------------------------------------------------------+ | Column | Type | Description | +--------+------+-------------------------------------------------------+ | 1 | u8 | Error type, fixed to 0x2 | +--------+------+-------------------------------------------------------+ | 2 | s32 | Error Count | | | | 0: the 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 | +--------+------+-------------------------------------------------------+ | 4 | x8 | Host byte in scsi_cmd::status | | | | [scsi_cmd::status has 32 bits holding these 3 bytes] | +--------+------+-------------------------------------------------------+ | 5 | x8 | Driver byte in scsi_cmd::status | +--------+------+-------------------------------------------------------+ | 6 | x8 | SCSI Status byte in scsi_cmd::status | +--------+------+-------------------------------------------------------+ | 7 | x8 | SCSI Sense Key in scsi_cmnd | +--------+------+-------------------------------------------------------+ | 8 | x8 | SCSI ASC in scsi_cmnd | +--------+------+-------------------------------------------------------+ | 9 | x8 | SCSI ASCQ in scsi_cmnd | +--------+------+-------------------------------------------------------+ Examples: error=/sys/kernel/debug/scsi_debug/0:0:0:1/error echo "2 -10 0x88 0 0 0x2 0x3 0x11 0x0" >${error} will make device's read command return with media error with additional sense of "Unrecovered read error" (UNC): Acked-by: Douglas Gilbert <dgilbert@interlog.com> Signed-off-by: Wenchao Hao <haowenchao2@huawei.com> --- drivers/scsi/scsi_debug.c | 53 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+)