nvme: core: switch to non_owner variant of start_freeze/unfreeze queue

nvme_start_freeze() and nvme_unfreeze() may be called from same context,
so switch them to call non_owner variant of start_freeze/unfreeze queue.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20241025003722.3630252-3-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 84cb859a911d09dbe71b2f1ac473ae687c4dc687..3de7555a7de74b0c469df89dfed14bcb47872263 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -4864,7 +4864,7 @@ void nvme_unfreeze(struct nvme_ctrl *ctrl)
 
        srcu_idx = srcu_read_lock(&ctrl->srcu);
        list_for_each_entry_rcu(ns, &ctrl->namespaces, list)
-               blk_mq_unfreeze_queue(ns->queue);
+               blk_mq_unfreeze_queue_non_owner(ns->queue);
        srcu_read_unlock(&ctrl->srcu, srcu_idx);
        clear_bit(NVME_CTRL_FROZEN, &ctrl->flags);
 }
@@ -4906,7 +4906,12 @@ void nvme_start_freeze(struct nvme_ctrl *ctrl)
        set_bit(NVME_CTRL_FROZEN, &ctrl->flags);
        srcu_idx = srcu_read_lock(&ctrl->srcu);
        list_for_each_entry_rcu(ns, &ctrl->namespaces, list)
-               blk_freeze_queue_start(ns->queue);
+               /*
+                * Typical non_owner use case is from pci driver, in which
+                * start_freeze is called from timeout work function, but
+                * unfreeze is done in reset work context
+                */
+               blk_freeze_queue_start_non_owner(ns->queue);
        srcu_read_unlock(&ctrl->srcu, srcu_idx);
 }
 EXPORT_SYMBOL_GPL(nvme_start_freeze);