Commit 26af1cd0 authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe
Browse files

nvme: wait until quiesce is done 



NVMe uses one atomic flag to check if quiesce is needed. If quiesce is
started, the helper returns immediately. This way is wrong, since we
have to wait until quiesce is done.

Fixes: e70feb8b ("blk-mq: support concurrent queue quiesce/unquiesce")
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20211109071144.181581-5-ming.lei@redhat.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 93542fbf

drivers/nvme/host/core.c

+4 −0
Original line number Diff line number Diff line
@@ -4476,6 +4476,8 @@ static void nvme_stop_ns_queue(struct nvme_ns *ns) 
{

	if (!test_and_set_bit(NVME_NS_STOPPED, &ns->flags))

		blk_mq_quiesce_queue(ns->queue);

	else

		blk_mq_wait_quiesce_done(ns->queue);

}



/*
@@ -4595,6 +4597,8 @@ void nvme_stop_admin_queue(struct nvme_ctrl *ctrl) 
{

	if (!test_and_set_bit(NVME_CTRL_ADMIN_Q_STOPPED, &ctrl->flags))

		blk_mq_quiesce_queue(ctrl->admin_q);

	else

		blk_mq_wait_quiesce_done(ctrl->admin_q);

}

EXPORT_SYMBOL_GPL(nvme_stop_admin_queue);