From d8e4370021680c9bd7803161c27cdeb3999c2d83 Mon Sep 17 00:00:00 2001
From: Keith Busch <kbusch@kernel.org>
Date: Fri, 20 Aug 2021 17:30:31 +0800
Subject: [PATCH] nvme: force complete cancelled requests

mainline inclusion
from mainline-5.8-rc1
commit 3382a567efd4015697f087f2e91ac08b90577876
category: bugfix
bugzilla: 175150
CVE: NA

---------------------------

Use blk_mq_foce_complete_rq() to bypass fake timeout error injection so
that request reclaim may proceed.

Signed-off-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Daniel Wagner <dwagner@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

Conflicts:
	drivers/nvme/host/core.c
	[ 7baa85727d04("blk-mq-tag: change busy_iter_fn to return
	  whether to continue or not") is not applied. ]

Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
Reviewed-by: Hou Tao <houtao1@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 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 7d0c4f2e6fe9..798281876383 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -299,7 +299,7 @@ void nvme_cancel_request(struct request *req, void *data, bool reserved)
 		return;
 
 	nvme_req(req)->status = NVME_SC_HOST_ABORTED_CMD;
-	blk_mq_complete_request(req);
+	blk_mq_force_complete_rq(req);
 
 }
 EXPORT_SYMBOL_GPL(nvme_cancel_request);
-- 
GitLab