| From 7dcdebaab2113d7f2ed2ca383eb42678f4c931b2 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 22 Oct 2020 10:15:23 +0800 |
| Subject: nvme-rdma: avoid repeated request completion |
| |
| From: Sagi Grimberg <sagi@grimberg.me> |
| |
| [ Upstream commit fdf58e02adecbef4c7cbb2073d8ea225e6fd5f26 ] |
| |
| The request may be executed asynchronously, and rq->state may be |
| changed to IDLE. To avoid repeated request completion, only |
| MQ_RQ_COMPLETE of rq->state is checked in nvme_rdma_complete_timed_out. |
| It is not safe, so need adding check IDLE for rq->state. |
| |
| Signed-off-by: Sagi Grimberg <sagi@grimberg.me> |
| Signed-off-by: Chao Leng <lengchao@huawei.com> |
| Signed-off-by: Christoph Hellwig <hch@lst.de> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/nvme/host/rdma.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c |
| index 73961cc1e9799..f91c20e3daf7b 100644 |
| --- a/drivers/nvme/host/rdma.c |
| +++ b/drivers/nvme/host/rdma.c |
| @@ -1974,7 +1974,7 @@ static void nvme_rdma_complete_timed_out(struct request *rq) |
| struct nvme_rdma_queue *queue = req->queue; |
| |
| nvme_rdma_stop_queue(queue); |
| - if (!blk_mq_request_completed(rq)) { |
| + if (blk_mq_request_started(rq) && !blk_mq_request_completed(rq)) { |
| nvme_req(rq)->status = NVME_SC_HOST_ABORTED_CMD; |
| blk_mq_complete_request(rq); |
| } |
| -- |
| 2.27.0 |
| |
