From patchwork Fri Oct 21 23:56:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenchao Hao X-Patchwork-Id: 6633 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp622622wrr; Fri, 21 Oct 2022 03:43:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6+skE9PNbdH0573ZCS2t924nKLJyqGjjqBRhA63Mr5hFoMSYCgkMY5ySTVJi88c40X/UCV X-Received: by 2002:aa7:c58e:0:b0:461:77b:7bd with SMTP id g14-20020aa7c58e000000b00461077b07bdmr5832884edq.387.1666349024846; Fri, 21 Oct 2022 03:43:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666349024; cv=none; d=google.com; s=arc-20160816; b=AxDz0z10547bWE8ZlprlwkXbUKZF2ikNmS98u6W7F0K71Rvf7N8PGObDKIFXBEefME itu48QdlCGixfSEtyH+iSZ7XVth1zy/cXOJw73x3z8YYDByquoz4kVLKqQMOSa09tIAY KHgqRviAUiMV9meyI5wXJ2XHrVfk+bG/lUkZCqIf45/H522NF9Dls3cAowcyZp2oafID raG3eyCbhz6Mxhgrm6FO39TvAYlSQdy0svpLfTwzbS5rHS96JPKX0p8LWq0H4WqsoIUs cEqkUED/jMqFiD09y/RLKkJr4vhwK1czEdqnVzSZn/k0Wc6+pYQqpXPUkzAp0VFuX4zC 9HWQ== 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=4M4wAGTaVDIICN3zc2u8ysY0oGRhbASaQlu9xZ9pjtw=; b=oe+Wz1DEt+QTunuimTSAXFW4ew0JcXznDQhe3udAgS8ZF+uSwdOEjh+/8CWJWz4wNa FZsod36Ek+z0DlSYZlqSyO+8d64KEDVC8Fu1oZQU0vlBgKbwxw5p2iqChwEHMtutrh8i 4eE9mVUCQHSn3EafhDIhtvT7zwNTODcjPLKO63OFu9tKJzPeU2mzJL0XJ0D2bk8Dx8mF 6Cc0RbqQOP5eKZV6jVckD+fcYdh2xY9lz13mfRJvAnB6mBk6307q/qHS6juRtsCcbuBz xCXv48T+0r/LU+C/PWb0sorEeoVkfXKotLtov7wRC1m45eA5hqlj9SdsE199dXoOdg8x +5TQ== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sg20-20020a170907a41400b007918f4994f4si15150617ejc.15.2022.10.21.03.43.17; Fri, 21 Oct 2022 03:43:44 -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 S229864AbiJUKkg (ORCPT + 99 others); Fri, 21 Oct 2022 06:40:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53606 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229740AbiJUKkb (ORCPT ); Fri, 21 Oct 2022 06:40:31 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08547FFFB4; Fri, 21 Oct 2022 03:40:24 -0700 (PDT) Received: from dggpemm500023.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Mv18H2j8tzVhxv; Fri, 21 Oct 2022 18:35:43 +0800 (CST) Received: from dggpemm500017.china.huawei.com (7.185.36.178) by dggpemm500023.china.huawei.com (7.185.36.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 21 Oct 2022 18:40:11 +0800 Received: from build.huawei.com (10.175.101.6) by dggpemm500017.china.huawei.com (7.185.36.178) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 21 Oct 2022 18:40:11 +0800 From: Wenchao Hao To: "James E . J . Bottomley" , "Martin K . Petersen" , , CC: Steffen Maier , , , Wenchao Hao Subject: [PATCH v2 2/2] scsi: donot increase scsi_device's iorequest_cnt if dispatch failed Date: Fri, 21 Oct 2022 19:56:38 -0400 Message-ID: <20221021235638.1968832-3-haowenchao@huawei.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20221021235638.1968832-1-haowenchao@huawei.com> References: <20221021235638.1968832-1-haowenchao@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemm500017.china.huawei.com (7.185.36.178) 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 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747293595199572632?= X-GMAIL-MSGID: =?utf-8?q?1747293595199572632?= If scsi_dispatch_cmd() failed, the scsi command did not send to disks, so it would never done from LLDs. scsi scsi_queue_rq() would return BLK_STS_RESOURCE if scsi_dispatch_cmd() failed, the related request would be requeued, and the timeout of this request would not fired any more, so no one would increase iodone_cnt which matches with this increase of iorequest_cnt. Signed-off-by: Wenchao Hao Reviewed-by: Mike Christie --- drivers/scsi/scsi_lib.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 8b89fab7c420..71edb9ffbe16 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -1469,8 +1469,6 @@ static int scsi_dispatch_cmd(struct scsi_cmnd *cmd) struct Scsi_Host *host = cmd->device->host; int rtn = 0; - atomic_inc(&cmd->device->iorequest_cnt); - /* check if the device is still usable */ if (unlikely(cmd->device->sdev_state == SDEV_DEL)) { /* in SDEV_DEL we error all commands. DID_NO_CONNECT @@ -1764,6 +1762,7 @@ static blk_status_t scsi_queue_rq(struct blk_mq_hw_ctx *hctx, goto out_dec_host_busy; } + atomic_inc(&cmd->device->iorequest_cnt); return BLK_STS_OK; out_dec_host_busy: