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=-10.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,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 EBF62C433E0 for ; Fri, 29 May 2020 14:38:03 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 BE8532072D for ; Fri, 29 May 2020 14:38:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="tzH1gjzf"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="WzAHDExd" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BE8532072D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org 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=bombadil.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=wwZgF6Xj3kCZQmCkEA4/lBDDflWKBK04pjZgbQLOZOs=; b=tzH1gjzfBNyR39 zfPs17RpniC/YzDCPyRpzmk0DYJqZRmr1hT2BfoWZO8qTMOh7uf4ciDWQdAvcOSiPJ8YDjwMTENOh bhiAuOfYLp6EbisUmu79fjDc1TXSDOblozBL1aoCAwOtH6pJCJABDZJiHKgPXSybgRBkQFD7M3/kN gFPOrDK9vpcIxJz+a7mjglJwZT503NeSylUyDlybhZdwl7U8M9Ir7Uegnlghuv45BzepfE3rnsz/q EzhCb8qtqdVKywDRjuZSnrPv/BKH0bs15kMHvXhXhbkNK7gR75iUVRr2bN+o3tzzWd5R+yqUpa6IL n2CUJrFe11Rfrtc+eyBw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jeg90-0003ol-IG; Fri, 29 May 2020 14:37:58 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jeg8q-0003cc-AK for linux-nvme@lists.infradead.org; Fri, 29 May 2020 14:37:49 +0000 Received: from dhcp-10-100-145-180.wdl.wdc.com (unknown [199.255.45.60]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6C6CA20814; Fri, 29 May 2020 14:37:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590763068; bh=H5Holb5ECxic2kwSWoJ+5oUahBN+4rFGAhnvcBXaHvI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WzAHDExdSDIn4DtjuZbGQNoSF7cuYcJOGHDABqhYY54ZK+D8yS64S/rlhGcrjs84v UxAe3kCc54StPfnEuWtDELee0Yjrpv1ZIxtiD/aV+KbopzgkXot11ISztdDZr91M1z BszKZJL4rMLre+5ws4Sx8DIHYaZCglCFLnta4GsQ= From: Keith Busch To: linux-nvme@lists.infradead.org, hch@lst.de, sagi@grimberg.me, linux-block@vger.kernel.org, axboe@kernel.dk Subject: [PATCHv3 2/2] nvme: force complete cancelled requests Date: Fri, 29 May 2020 07:37:44 -0700 Message-Id: <20200529143744.3545429-3-kbusch@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200529143744.3545429-1-kbusch@kernel.org> References: <20200529143744.3545429-1-kbusch@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200529_073748_370847_4E6B0BA0 X-CRM114-Status: GOOD ( 10.15 ) 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: Keith Busch , Johannes Thumshirn , alan.adamson@oracle.com, Ming Lei 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 Use blk_mq_foce_complete_rq() to bypass fake timeout error injection so that request reclaim may proceed. Reviewed-by: Johannes Thumshirn Reviewed-by: Ming Lei Signed-off-by: Keith Busch --- drivers/nvme/host/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index ba860efd250d..891e9461bfae 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -310,7 +310,7 @@ bool nvme_cancel_request(struct request *req, void *data, bool reserved) return true; nvme_req(req)->status = NVME_SC_HOST_ABORTED_CMD; - blk_mq_complete_request(req); + blk_mq_force_complete_rq(req); return true; } EXPORT_SYMBOL_GPL(nvme_cancel_request); -- 2.24.1 _______________________________________________ linux-nvme mailing list linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme