diff options
| author | Ming Lei <ming.lei@redhat.com> | 2021-11-09 15:11:44 +0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-11-09 08:14:27 -0700 |
| commit | 26af1cd00364ce20dbec66b93ef42f9d42dc6953 (patch) | |
| tree | 0f502ab12e931dd0c84c6ba8432e46b89c80d1f9 | |
| parent | 93542fbfa7b726d053c01a9399577c03968c4f6b (diff) | |
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: e70feb8b3e68 ("blk-mq: support concurrent queue quiesce/unquiesce")
Reviewed-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20211109071144.181581-5-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | drivers/nvme/host/core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index eb284f45fc44..2fc5ea9a7793 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -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); |