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

Commit fb051339 authored by Sagi Grimberg's avatar Sagi Grimberg
Browse files

nvme-rdma: quiesce/unquiesce admin_q instead of start/stop its hw queues 



unlike blk_mq_stop_hw_queues and blk_mq_start_stopped_hw_queues
quiescing/unquiescing respects the submission path rcu grace.
Also make sure to kick the requeue list when appropriate.

Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
parent 5e599d73

drivers/nvme/host/rdma.c

+4 −3
Original line number Diff line number Diff line
@@ -779,7 +779,7 @@ static void nvme_rdma_error_recovery_work(struct work_struct *work) 


	if (ctrl->ctrl.queue_count > 1)

		nvme_stop_queues(&ctrl->ctrl);

	blk_mq_stop_hw_queues(ctrl->ctrl.admin_q);

	blk_mq_quiesce_queue(ctrl->ctrl.admin_q);



	/* We must take care of fastfail/requeue all our inflight requests */

	if (ctrl->ctrl.queue_count > 1)
@@ -792,7 +792,7 @@ static void nvme_rdma_error_recovery_work(struct work_struct *work) 
	 * queues are not a live anymore, so restart the queues to fail fast

	 * new IO

	 */

	blk_mq_start_stopped_hw_queues(ctrl->ctrl.admin_q, true);

	blk_mq_unquiesce_queue(ctrl->ctrl.admin_q);

	nvme_start_queues(&ctrl->ctrl);



	nvme_rdma_reconnect_or_remove(ctrl);
@@ -1636,9 +1636,10 @@ static void nvme_rdma_shutdown_ctrl(struct nvme_rdma_ctrl *ctrl) 
	if (test_bit(NVME_RDMA_Q_LIVE, &ctrl->queues[0].flags))

		nvme_shutdown_ctrl(&ctrl->ctrl);



	blk_mq_stop_hw_queues(ctrl->ctrl.admin_q);

	blk_mq_quiesce_queue(ctrl->ctrl.admin_q);

	blk_mq_tagset_busy_iter(&ctrl->admin_tag_set,

				nvme_cancel_request, &ctrl->ctrl);

	blk_mq_unquiesce_queue(ctrl->ctrl.admin_q);

	nvme_rdma_destroy_admin_queue(ctrl);

}