Skip to content

Commit d4f1d5f

Browse files
yinlei-githubChristoph Hellwig
authored andcommitted
nvme: fix double blk_mq_complete_request for timeout request with low probability
When nvme_cancel_tagset traverses all tagsets and executes nvme_cancel_request, this request may be executing blk_mq_free_request that is called by nvme_rdma_complete_timed_out/nvme_tcp_complete_timed_out. When blk_mq_free_request executes to WRITE_ONCE(rq->state, MQ_RQ_IDLE) and __blk_mq_free_request(rq), it will cause double blk_mq_complete_request for this request, and it will cause a null pointer error in the second execution of this function because rq->mq_hctx has set to NULL in first execution. Signed-off-by: Lei Yin <yinlei2@lenovo.com> Reviewed-by: Keith Busch <kbusch@kernel.org> Reviewed-by: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Christoph Hellwig <hch@lst.de>
1 parent 6622b76 commit d4f1d5f

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/nvme/host/core.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,8 +450,8 @@ bool nvme_cancel_request(struct request *req, void *data)
450450
dev_dbg_ratelimited(((struct nvme_ctrl *) data)->device,
451451
"Cancelling I/O %d", req->tag);
452452

453-
/* don't abort one completed request */
454-
if (blk_mq_request_completed(req))
453+
/* don't abort one completed or idle request */
454+
if (blk_mq_rq_state(req) != MQ_RQ_IN_FLIGHT)
455455
return true;
456456

457457
nvme_req(req)->status = NVME_SC_HOST_ABORTED_CMD;

0 commit comments

Comments
 (0)