From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44431C433DB for ; Tue, 5 Jan 2021 07:20:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 01382224F9 for ; Tue, 5 Jan 2021 07:20:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726133AbhAEHUr (ORCPT ); Tue, 5 Jan 2021 02:20:47 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:9672 "EHLO szxga04-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725894AbhAEHUr (ORCPT ); Tue, 5 Jan 2021 02:20:47 -0500 Received: from DGGEMS413-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4D93l34T5hz15pCL; Tue, 5 Jan 2021 15:18:55 +0800 (CST) Received: from huawei.com (10.29.88.127) by DGGEMS413-HUB.china.huawei.com (10.3.19.213) with Microsoft SMTP Server id 14.3.498.0; Tue, 5 Jan 2021 15:19:40 +0800 From: Chao Leng To: CC: , , , , , , Subject: [PATCH 6/6] nvme-fc: avoid IO error and repeated request completion Date: Tue, 5 Jan 2021 15:19:36 +0800 Message-ID: <20210105071936.25097-7-lengchao@huawei.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20210105071936.25097-1-lengchao@huawei.com> References: <20210105071936.25097-1-lengchao@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.29.88.127] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org When a request is queued failed, blk_status_t is directly returned to the blk-mq. If blk_status_t is not BLK_STS_RESOURCE, BLK_STS_DEV_RESOURCE, BLK_STS_ZONE_RESOURCE, blk-mq call blk_mq_end_request to complete the request with BLK_STS_IOERR. In two scenarios, the request should be retried and may succeed. First, if work with nvme multipath, the request may be retried successfully in another path, because the error is probably related to the path. Second, if work without multipath software, the request may be retried successfully after error recovery. If the request is completed with BLK_STS_IOERR in blk_mq_dispatch_rq_list. The state of request may be changed to MQ_RQ_IN_FLIGHT. If free the request asynchronously such as in nvme_submit_user_cmd, in extreme scenario the request will be repeated freed in tear down. If a non-resource error occurs when queue_rq, should directly call nvme_complete_rq to complete request and set the state of request to MQ_RQ_COMPLETE. nvme_complete_rq will decide to retry, fail over or end the request. Signed-off-by: Chao Leng --- drivers/nvme/host/fc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index 38373a0e86ef..f6a5758ef1ea 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -2761,7 +2761,7 @@ nvme_fc_queue_rq(struct blk_mq_hw_ctx *hctx, ret = nvme_setup_cmd(ns, rq, sqe); if (ret) - return ret; + goto fail; /* * nvme core doesn't quite treat the rq opaquely. Commands such @@ -2781,7 +2781,9 @@ nvme_fc_queue_rq(struct blk_mq_hw_ctx *hctx, } - return nvme_fc_start_fcp_op(ctrl, queue, op, data_len, io_dir); + ret = nvme_fc_start_fcp_op(ctrl, queue, op, data_len, io_dir); +fail: + return nvme_try_complete_failed_req(rq, ret); } static void -- 2.16.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 692A3C433E6 for ; Tue, 5 Jan 2021 07:20:16 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0256F225AB for ; Tue, 5 Jan 2021 07:20:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0256F225AB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=V/2MMoVxG6s9t+9rML4hy8M+3tuDKBsS8WAIdxvt1fo=; b=RbfWOYErpySohBsClH8Nv7foh O97jTlkWNKWOyf4yL3+6Rx3DoXp6fxqN7HBW/bgGW1rWsnnv6+jnKwsnUx4IIlGoKBNrXZbZY5hI4 kHy2Bc11DsHnENIfEBfekl9kRc63S8U4h2tveOsSI5bV8WynbEM5m2AiYqVCSy9WXP8WiedtH66i5 UmEWJu9nEUsBzddEEYZk1zd84ArCQ5Zbg0pGmRdDWXP6NWLMgAlTgWWUsE+DmMblhfm01MiMzgcLq uIx/Y+MViMdKKGTvKR1b7G4qfxqtutrJttvYgad/5NJHUO1BCYGUlXM9Yjn1jrYewV0XmDxj+sFgW OwK88NtzA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kwgdQ-00074B-4c; Tue, 05 Jan 2021 07:20:04 +0000 Received: from szxga04-in.huawei.com ([45.249.212.190]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kwgdL-0006y2-Rs for linux-nvme@lists.infradead.org; Tue, 05 Jan 2021 07:20:02 +0000 Received: from DGGEMS413-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4D93l34T5hz15pCL; Tue, 5 Jan 2021 15:18:55 +0800 (CST) Received: from huawei.com (10.29.88.127) by DGGEMS413-HUB.china.huawei.com (10.3.19.213) with Microsoft SMTP Server id 14.3.498.0; Tue, 5 Jan 2021 15:19:40 +0800 From: Chao Leng To: Subject: [PATCH 6/6] nvme-fc: avoid IO error and repeated request completion Date: Tue, 5 Jan 2021 15:19:36 +0800 Message-ID: <20210105071936.25097-7-lengchao@huawei.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20210105071936.25097-1-lengchao@huawei.com> References: <20210105071936.25097-1-lengchao@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.29.88.127] X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210105_022001_358442_51CF9524 X-CRM114-Status: GOOD ( 13.27 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: axboe@kernel.dk, linux-block@vger.kernel.org, sagi@grimberg.me, axboe@fb.com, lengchao@huawei.com, kbusch@kernel.org, hch@lst.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org When a request is queued failed, blk_status_t is directly returned to the blk-mq. If blk_status_t is not BLK_STS_RESOURCE, BLK_STS_DEV_RESOURCE, BLK_STS_ZONE_RESOURCE, blk-mq call blk_mq_end_request to complete the request with BLK_STS_IOERR. In two scenarios, the request should be retried and may succeed. First, if work with nvme multipath, the request may be retried successfully in another path, because the error is probably related to the path. Second, if work without multipath software, the request may be retried successfully after error recovery. If the request is completed with BLK_STS_IOERR in blk_mq_dispatch_rq_list. The state of request may be changed to MQ_RQ_IN_FLIGHT. If free the request asynchronously such as in nvme_submit_user_cmd, in extreme scenario the request will be repeated freed in tear down. If a non-resource error occurs when queue_rq, should directly call nvme_complete_rq to complete request and set the state of request to MQ_RQ_COMPLETE. nvme_complete_rq will decide to retry, fail over or end the request. Signed-off-by: Chao Leng --- drivers/nvme/host/fc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index 38373a0e86ef..f6a5758ef1ea 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -2761,7 +2761,7 @@ nvme_fc_queue_rq(struct blk_mq_hw_ctx *hctx, ret = nvme_setup_cmd(ns, rq, sqe); if (ret) - return ret; + goto fail; /* * nvme core doesn't quite treat the rq opaquely. Commands such @@ -2781,7 +2781,9 @@ nvme_fc_queue_rq(struct blk_mq_hw_ctx *hctx, } - return nvme_fc_start_fcp_op(ctrl, queue, op, data_len, io_dir); + ret = nvme_fc_start_fcp_op(ctrl, queue, op, data_len, io_dir); +fail: + return nvme_try_complete_failed_req(rq, ret); } static void -- 2.16.4 _______________________________________________ Linux-nvme mailing list Linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme