Received: by 2002:ac8:156:0:b0:3e0:cd10:60c8 with SMTP id f22csp2499990qtg; Thu, 23 Mar 2023 04:59:24 -0700 (PDT) X-Google-Smtp-Source: AK7set/MXjn45pw5aS9bpKHj7607f9j/pG3s9BKBNeMh4674/xCRRokHgltM96x7fbQJHcT2lFGU X-Received: by 2002:a05:6a20:8518:b0:d6:df31:8ac2 with SMTP id t24-20020a056a20851800b000d6df318ac2mr2507408pzd.42.1679572764575; Thu, 23 Mar 2023 04:59:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679572764; cv=none; d=google.com; s=arc-20160816; b=CjxGuEArZ3qMlp3DBYKD71yaZI6j2UwNqWop83FACwzPHq1pJRyls0nYDT8W2Cc4eH 9Iq9BE9cVR+N1QfK/WwAGw3e47tRBXnipnhPJ1/ts2w4gQBjmFS7Q8CnC6YSEGnXIsIN NPl5vITpTHD5veOc3s+mRXSrdDLdnZJ7jQwrbYGFhv4GkeyPmL4rO/gTbBWJYWE8yaEN XyuUScBKAHETYAxukfaUEORkZDgxP9Tt86Jh0aPq4fIiN2zBhGAUqAwJ3kg/odC8WgbD f5BNpXF8QdNzc+5wZnyRuiiIuX+Nip+ro/EutPSy30fS3p7OtRboLQ4TL+0qDneq7EPa jaLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=EJgip8+W6rPJRBeExOGPOZq2XLG5p5s4eBwuFx5ELf4=; b=tH7T6le6UnN2pr35jUmSYNggwxjyglYKtA6OKZb+/EZYU3CDK1wmuqJJAIozfDdRUS rjgZGLcqs3aYICwSdIYupQP/OswhlXS7/Ostyos8VnLVgHdm2MqZaSP4/yy1MvXkoeFc T/2Sn05Ohn4t+jQQ8LoIBTf6nYg3BWNtcT8BGTihzJeeQi3yLcfI8PPxY+4pT/9wPUJj Z9gwfJ92H8QGpCvdiCJnRUD/YRHj75HJeaDdqIQ7TENsG10Qbf9IXRBy2Osetk0dHHBe WQuINsD/V86rmIHkkl70M9bfbwsi1fzg6CCxuHxbiJkz4DhuLtj1qhGbt5DXBV8bzqhr LBpA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y4-20020a056a00190400b006261813566dsi18640125pfi.223.2023.03.23.04.59.12; Thu, 23 Mar 2023 04:59:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231611AbjCWL6E (ORCPT + 99 others); Thu, 23 Mar 2023 07:58:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231220AbjCWL5W (ORCPT ); Thu, 23 Mar 2023 07:57:22 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBF44366A5; Thu, 23 Mar 2023 04:56:58 -0700 (PDT) Received: from kwepemm600012.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Pj3dm2qw1zbcQg; Thu, 23 Mar 2023 19:53:48 +0800 (CST) Received: from build.huawei.com (10.175.101.6) by kwepemm600012.china.huawei.com (7.193.23.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Thu, 23 Mar 2023 19:56:56 +0800 From: Wenchao Hao To: "James E . J . Bottomley" , "Martin K . Petersen" , Douglas Gilbert , , CC: , , 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 Message-ID: <20230323115601.178494-6-haowenchao2@huawei.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20230323115601.178494-1-haowenchao2@huawei.com> References: <20230323115601.178494-1-haowenchao2@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemm600012.china.huawei.com (7.193.23.74) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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