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

nvme: prepare for pairing quiescing and unquiescing 



Add two helpers so that we can prepare for pairing quiescing and
unquiescing which will be done in next patch.

Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20211014081710.1871747-4-ming.lei@redhat.com


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

drivers/nvme/host/core.c

+31 −21
Original line number Diff line number Diff line
@@ -119,25 +119,6 @@ static void nvme_remove_invalid_namespaces(struct nvme_ctrl *ctrl, 
static void nvme_update_keep_alive(struct nvme_ctrl *ctrl,

				   struct nvme_command *cmd);



/*

 * Prepare a queue for teardown.

 *

 * This must forcibly unquiesce queues to avoid blocking dispatch, and only set

 * the capacity to 0 after that to avoid blocking dispatchers that may be

 * holding bd_butex.  This will end buffered writers dirtying pages that can't

 * be synced.

 */

static void nvme_set_queue_dying(struct nvme_ns *ns)

{

	if (test_and_set_bit(NVME_NS_DEAD, &ns->flags))

		return;



	blk_set_queue_dying(ns->queue);

	blk_mq_unquiesce_queue(ns->queue);



	set_capacity_and_notify(ns->disk, 0);

}



void nvme_queue_scan(struct nvme_ctrl *ctrl)

{

	/*
@@ -4485,6 +4466,35 @@ int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct device *dev, 
}

EXPORT_SYMBOL_GPL(nvme_init_ctrl);



static void nvme_start_ns_queue(struct nvme_ns *ns)

{

	blk_mq_unquiesce_queue(ns->queue);

}



static void nvme_stop_ns_queue(struct nvme_ns *ns)

{

	blk_mq_quiesce_queue(ns->queue);

}



/*

 * Prepare a queue for teardown.

 *

 * This must forcibly unquiesce queues to avoid blocking dispatch, and only set

 * the capacity to 0 after that to avoid blocking dispatchers that may be

 * holding bd_butex.  This will end buffered writers dirtying pages that can't

 * be synced.

 */

static void nvme_set_queue_dying(struct nvme_ns *ns)

{

	if (test_and_set_bit(NVME_NS_DEAD, &ns->flags))

		return;



	blk_set_queue_dying(ns->queue);

	nvme_start_ns_queue(ns);



	set_capacity_and_notify(ns->disk, 0);

}



/**

 * nvme_kill_queues(): Ends all namespace queues

 * @ctrl: the dead controller that needs to end
@@ -4563,7 +4573,7 @@ void nvme_stop_queues(struct nvme_ctrl *ctrl) 


	down_read(&ctrl->namespaces_rwsem);

	list_for_each_entry(ns, &ctrl->namespaces, list)

		blk_mq_quiesce_queue(ns->queue);

		nvme_stop_ns_queue(ns);

	up_read(&ctrl->namespaces_rwsem);

}

EXPORT_SYMBOL_GPL(nvme_stop_queues);
@@ -4574,7 +4584,7 @@ void nvme_start_queues(struct nvme_ctrl *ctrl) 


	down_read(&ctrl->namespaces_rwsem);

	list_for_each_entry(ns, &ctrl->namespaces, list)

		blk_mq_unquiesce_queue(ns->queue);

		nvme_start_ns_queue(ns);

	up_read(&ctrl->namespaces_rwsem);

}

EXPORT_SYMBOL_GPL(nvme_start_queues);