Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp545775rwr; Thu, 27 Apr 2023 05:14:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ70WUmQZsyfOkX9tQwfjiD9a+pK03BkTqD8XHPjbrqUA/XgxbAuIlSNR9oyAtymd6/vtJ56 X-Received: by 2002:a05:6a20:7491:b0:f6:d60d:dbfc with SMTP id p17-20020a056a20749100b000f6d60ddbfcmr1734760pzd.5.1682597676721; Thu, 27 Apr 2023 05:14:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682597676; cv=none; d=google.com; s=arc-20160816; b=HSzDsrDLg5gwHRB/YAVoFbzvUV5l3yPRzSMgjwvojIKjO4fYzs0Oo6H72vI0keKQqK kRTaCCu4bhcrO9cXcK09MFZVgmcmo//hZt3vwNoR/3++EMjHgfgEN/zGPHWyXAqEq0P0 jo5yiod9iVmSmIqLXG5tBb0/qDs+VnWNG3KMYdCOPAZq9oBVAcoM9tP30SeW8uJsO7Th 7fBs59n9XMavYngutN90RL2qFR2P8QgtMO1osEVWdRlgEIyxcG11IvBp+N3ZMarL0TaO qAaq835//kAwfHbtu6jrsHkarrdfM7CbT4n0b35Prh/AOBcyTAUSiYUcatYLXxMko/K5 UEKw== 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=sAq9JkhZiHG+zsrIrelNOJpC+ym0/gaMrq1oyEv/+ZM=; b=kKSu59uydWNEIXFl8Jgj14NTXOKlY2YMLrZlgudJnbTpQdDr2IkeX24Sag5INxlvay 0y87D4TL5qyy4ncQ0OjCk6StYAJDx/amyH7u5aj3ZTM/KvykR9LJN9fSAIL0uNZcaE/8 W2f9vFlDkelpWkMyTrEWu0cuKFBtbwWb6/5MvGiwyxa9o/76tgVcfpvhdZ4iqeEPTlEJ HgqPsHEB/salk17WqNqtSAUiJ4G6hSv8VCU+v6gD/x2/uuvp7EM+qOCdUXXUJ25n0Xke hq1yTuLpN9jeUV6e3ztLW3HqodwqZBUi0qY1RciUIZuxZOuYzbPN4PcYdXqgOv5Ql88K j+3g== 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 n67-20020a632746000000b0051b9938a68esi18429846pgn.128.2023.04.27.05.14.23; Thu, 27 Apr 2023 05:14:36 -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 S243909AbjD0MNB (ORCPT + 99 others); Thu, 27 Apr 2023 08:13:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243806AbjD0MMp (ORCPT ); Thu, 27 Apr 2023 08:12:45 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 48FD1559A; Thu, 27 Apr 2023 05:12:18 -0700 (PDT) Received: from kwepemm600012.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Q6ZLp6VY6zsR61; Thu, 27 Apr 2023 20:10:26 +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.23; Thu, 27 Apr 2023 20:12:05 +0800 From: Wenchao Hao To: "James E . J . Bottomley" , "Martin K . Petersen" , Douglas Gilbert , , CC: , , Wenchao Hao Subject: [PATCH v2 4/6] scsi:scsi_debug: timeout command if the error is injected Date: Fri, 28 Apr 2023 09:33:18 +0800 Message-ID: <20230428013320.347050-5-haowenchao2@huawei.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20230428013320.347050-1-haowenchao2@huawei.com> References: <20230428013320.347050-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: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemm600012.china.huawei.com (7.193.23.74) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_12_24, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no 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 timeout error is injected, return 0 from scsi_debug_queuecommand to make the command timeout. For example, the following command would inject timeout error for inquiry(0x12) command for 10 times: error=/sys/kernel/debug/scsi_debug/0:0:0:1/error echo "0 -10 0x12" > $error Signed-off-by: Wenchao Hao --- drivers/scsi/scsi_debug.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c index 2c380cddcb84..2d31ae15bd97 100644 --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c @@ -7714,6 +7714,30 @@ 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; + + list_for_each_entry(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++; + return ret; + } + } + + return 0; +} + static int scsi_debug_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *scp) { @@ -7772,6 +7796,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