Commit 78ca4072 authored Jul 24, 2019 by Ming Lei Committed by Jens Axboe Aug 04, 2019

nvme: don't abort completed request in nvme_cancel_request



Before aborting in-flight requests, all IO queues and their interrupts
have been shutdown. However, request's completion function may not be
done yet because it can be scheduled to run via IPI.

So don't abort one request if it is marked as completed, otherwise
we may abort one normal completed request.

Cc: Max Gurtovoy <maxg@mellanox.com>
Cc: Sagi Grimberg <sagi@grimberg.me>
Cc: Keith Busch <keith.busch@intel.com>
Cc: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent f9934a80

drivers/nvme/host/core.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -288,6 +288,10 @@ bool nvme_cancel_request(struct request req, void data, bool reserved)
		dev_dbg_ratelimited(((struct nvme_ctrl *) data)->device,
		"Cancelling I/O %d", req->tag);

		/* don't abort one completed request */
		if (blk_mq_request_completed(req))
		return true;

		nvme_req(req)->status = NVME_SC_ABORT_REQ;
		blk_mq_complete_request_sync(req);
		return true;

Admin message