Received: by 2002:a05:7412:d8a:b0:e2:908c:2ebd with SMTP id b10csp1033rdg; Tue, 10 Oct 2023 02:21:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFsTmXA9b8RmiBAx5IrnZe+k2GgQV1a0O7oIGFn+Cex/a02AM1lS0RUD8Y8cuFq2BtWbaHC X-Received: by 2002:a05:6808:1799:b0:3aa:86e:2c95 with SMTP id bg25-20020a056808179900b003aa086e2c95mr21812268oib.6.1696929719366; Tue, 10 Oct 2023 02:21:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696929719; cv=none; d=google.com; s=arc-20160816; b=UWqXPbiqnn2svloMBN9ZGY7Tq/+RX0Nc/O4/ag04+gfbVf3JDnGpLecYd4R0yu5phF 1D+YBQ2AIaBrc6EOOVCl86ri6U67l65OTtu2E/ztTYPfpj31Blh6EASjeOOqfZahKl1A c4hf+t+ucZHWP52PO94gBtIfB+x22LwLXk1ll0Nq1bNeXib3DoF3A5EmgWSNvi7VBvA2 cNv+j024JFDEjuGXb9xIkulPRYNAQzTW1jJ5hEB7ugiFR5w0q7ecjfLhpggnTID5tdLA 9CuiUNQOtUg8/9aXlbM8tjVeDaqkvAcH/A01JyxNaiES23HXx6ynvJnjD/75gRiGwxpe OVQw== 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=on/eet4kt7jAn+8IYlNYGEcSHo8d0oRiQCbB7OPszFw=; fh=Bw74vauKC02eaEbQr8FoniTYtc//6dp3BvPBLCS/H3M=; b=s8XH4IUySqY7oeBFNaSLSeGqU/v4QdNcBYp8PkJcyAUk/mp6voje1dWhqDt0wRuSYG oHFb+tRACjltLW9574NLlOO95WalHoAIyQHZuN2o3fqEDTK8X0egrqXrBuftE/hIEUO9 RpSMa7j+KUvhKcVY93mVfQkW3Hb13FDhJMHUqc02gFMhGA4SdhJERPVJAPqU+pmPnvLp u2wxf4kz2Ez3j8pqW8tRk3ZbJj2RX5Ud6U3rAOWJC4aS5qvKpLzaJHijxBk/tKR6Cp1i eUtU6FD0zu4R7TmcU5nlNW8o/EwmcYyvJ6alP9JHcVV9fQVMAzZURUcHcu3T1U1Vwe4D K6GA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id q26-20020a635c1a000000b00564b99f128dsi11479172pgb.656.2023.10.10.02.21.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 02:21:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id EAEAD8025DD1; Tue, 10 Oct 2023 02:21:49 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230174AbjJJJVd (ORCPT + 99 others); Tue, 10 Oct 2023 05:21:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60178 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229999AbjJJJVX (ORCPT ); Tue, 10 Oct 2023 05:21:23 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6DBA59F; Tue, 10 Oct 2023 02:21:22 -0700 (PDT) Received: from kwepemm000012.china.huawei.com (unknown [172.30.72.57]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4S4Vh83gXLz1M9Fk; Tue, 10 Oct 2023 17:18:48 +0800 (CST) Received: from build.huawei.com (10.175.101.6) by kwepemm000012.china.huawei.com (7.193.23.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Tue, 10 Oct 2023 17:21:20 +0800 From: Wenchao Hao To: "Martin K . Petersen" , Douglas Gilbert CC: "James E . J . Bottomley" , , , , Wenchao Hao Subject: [PATCH v6 04/10] scsi: scsi_debug: timeout command if the error is injected Date: Tue, 10 Oct 2023 17:20:45 +0800 Message-ID: <20231010092051.608007-5-haowenchao2@huawei.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20231010092051.608007-1-haowenchao2@huawei.com> References: <20231010092051.608007-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: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm000012.china.huawei.com (7.193.23.142) X-CFilter-Loop: Reflected X-Spam-Status: No, score=2.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Tue, 10 Oct 2023 02:21:50 -0700 (PDT) X-Spam-Level: ** If a timeout error is injected, return 0 from scsi_debug_queuecommand to make the command timeout. Timeout SCSI command format: +--------+------+-------------------------------------------------------+ | Column | Type | Description | +--------+------+-------------------------------------------------------+ | 1 | u8 | Error type, fixed to 0x0 | +--------+------+-------------------------------------------------------+ | 2 | s32 | Error count | | | | 0: this 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 | +--------+------+-------------------------------------------------------+ Examples: error=/sys/kernel/debug/scsi_debug/0:0:0:1/error echo "0 -10 0x12" > ${error} will make the device's inquiry command timeout 10 times. echo "0 1 0x12" > ${error} will make the device's inquiry timeout each time it is invoked on this device. Acked-by: Douglas Gilbert Signed-off-by: Wenchao Hao --- drivers/scsi/scsi_debug.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c index 0d5a179dbd97..9081c9d22882 100644 --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c @@ -7741,6 +7741,34 @@ 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; + + rcu_read_lock(); + list_for_each_entry_rcu(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++; + + rcu_read_unlock(); + return ret; + } + } + rcu_read_unlock(); + + return 0; +} + static int scsi_debug_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *scp) { @@ -7799,6 +7827,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