Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 622b8b68 authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe
Browse files

nvme: wait until all completed request's complete fn is called 



When aborting in-flight request for recovering controller, we have
to make sure that queue's complete function is called on completed
request before moving on. Otherwise, for example, the warning of
WARN_ON_ONCE(qp->mrs_used > 0) in ib_destroy_qp_user() may be
triggered on nvme-rdma.

Fix this issue by using blk_mq_tagset_wait_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: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 78ca4072

drivers/nvme/host/fc.c

+2 −0
Original line number Diff line number Diff line
@@ -2774,6 +2774,7 @@ nvme_fc_delete_association(struct nvme_fc_ctrl *ctrl) 
		nvme_stop_queues(&ctrl->ctrl);

		blk_mq_tagset_busy_iter(&ctrl->tag_set,

				nvme_fc_terminate_exchange, &ctrl->ctrl);

		blk_mq_tagset_wait_completed_request(&ctrl->tag_set);

	}



	/*
@@ -2796,6 +2797,7 @@ nvme_fc_delete_association(struct nvme_fc_ctrl *ctrl) 
	blk_mq_quiesce_queue(ctrl->ctrl.admin_q);

	blk_mq_tagset_busy_iter(&ctrl->admin_tag_set,

				nvme_fc_terminate_exchange, &ctrl->ctrl);

	blk_mq_tagset_wait_completed_request(&ctrl->admin_tag_set);



	/* kill the aens as they are a separate path */

	nvme_fc_abort_aen_ops(ctrl);

drivers/nvme/host/pci.c

+2 −0
Original line number Diff line number Diff line
@@ -2401,6 +2401,8 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown) 


	blk_mq_tagset_busy_iter(&dev->tagset, nvme_cancel_request, &dev->ctrl);

	blk_mq_tagset_busy_iter(&dev->admin_tagset, nvme_cancel_request, &dev->ctrl);

	blk_mq_tagset_wait_completed_request(&dev->tagset);

	blk_mq_tagset_wait_completed_request(&dev->admin_tagset);



	/*

	 * The driver will not be starting up queues again if shutting down so

drivers/nvme/host/rdma.c

+6 −2
Original line number Diff line number Diff line
@@ -901,9 +901,11 @@ static void nvme_rdma_teardown_admin_queue(struct nvme_rdma_ctrl *ctrl, 
{

	blk_mq_quiesce_queue(ctrl->ctrl.admin_q);

	nvme_rdma_stop_queue(&ctrl->queues[0]);

	if (ctrl->ctrl.admin_tagset)

	if (ctrl->ctrl.admin_tagset) {

		blk_mq_tagset_busy_iter(ctrl->ctrl.admin_tagset,

			nvme_cancel_request, &ctrl->ctrl);

		blk_mq_tagset_wait_completed_request(ctrl->ctrl.admin_tagset);

	}

	blk_mq_unquiesce_queue(ctrl->ctrl.admin_q);

	nvme_rdma_destroy_admin_queue(ctrl, remove);

}
@@ -914,9 +916,11 @@ static void nvme_rdma_teardown_io_queues(struct nvme_rdma_ctrl *ctrl, 
	if (ctrl->ctrl.queue_count > 1) {

		nvme_stop_queues(&ctrl->ctrl);

		nvme_rdma_stop_io_queues(ctrl);

		if (ctrl->ctrl.tagset)

		if (ctrl->ctrl.tagset) {

			blk_mq_tagset_busy_iter(ctrl->ctrl.tagset,

				nvme_cancel_request, &ctrl->ctrl);

			blk_mq_tagset_wait_completed_request(ctrl->ctrl.tagset);

		}

		if (remove)

			nvme_start_queues(&ctrl->ctrl);

		nvme_rdma_destroy_io_queues(ctrl, remove);

drivers/nvme/host/tcp.c

+6 −2
Original line number Diff line number Diff line
@@ -1748,9 +1748,11 @@ static void nvme_tcp_teardown_admin_queue(struct nvme_ctrl *ctrl, 
{

	blk_mq_quiesce_queue(ctrl->admin_q);

	nvme_tcp_stop_queue(ctrl, 0);

	if (ctrl->admin_tagset)

	if (ctrl->admin_tagset) {

		blk_mq_tagset_busy_iter(ctrl->admin_tagset,

			nvme_cancel_request, ctrl);

		blk_mq_tagset_wait_completed_request(ctrl->admin_tagset);

	}

	blk_mq_unquiesce_queue(ctrl->admin_q);

	nvme_tcp_destroy_admin_queue(ctrl, remove);

}
@@ -1762,9 +1764,11 @@ static void nvme_tcp_teardown_io_queues(struct nvme_ctrl *ctrl, 
		return;

	nvme_stop_queues(ctrl);

	nvme_tcp_stop_io_queues(ctrl);

	if (ctrl->tagset)

	if (ctrl->tagset) {

		blk_mq_tagset_busy_iter(ctrl->tagset,

			nvme_cancel_request, ctrl);

		blk_mq_tagset_wait_completed_request(ctrl->tagset);

	}

	if (remove)

		nvme_start_queues(ctrl);

	nvme_tcp_destroy_io_queues(ctrl, remove);

drivers/nvme/target/loop.c

+2 −0
Original line number Diff line number Diff line
@@ -407,6 +407,7 @@ static void nvme_loop_shutdown_ctrl(struct nvme_loop_ctrl *ctrl) 
		nvme_stop_queues(&ctrl->ctrl);

		blk_mq_tagset_busy_iter(&ctrl->tag_set,

					nvme_cancel_request, &ctrl->ctrl);

		blk_mq_tagset_wait_completed_request(&ctrl->tag_set);

		nvme_loop_destroy_io_queues(ctrl);

	}
@@ -416,6 +417,7 @@ static void nvme_loop_shutdown_ctrl(struct nvme_loop_ctrl *ctrl) 
	blk_mq_quiesce_queue(ctrl->ctrl.admin_q);

	blk_mq_tagset_busy_iter(&ctrl->admin_tag_set,

				nvme_cancel_request, &ctrl->ctrl);

	blk_mq_tagset_wait_completed_request(&ctrl->admin_tag_set);

	blk_mq_unquiesce_queue(ctrl->ctrl.admin_q);

	nvme_loop_destroy_admin_queue(ctrl);

}