Commit 4733b65d authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Keith Busch
Browse files

nvme: start keep-alive after admin queue setup 



Setting up I/O queues might take quite some time on larger and/or
busy setups, so KATO might expire before all I/O queues could be
set up.
Fix this by start keep alive from the ->init_ctrl_finish() callback,
and stopping it when calling nvme_cancel_admin_tagset().

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Tested-by: default avatarMark O'Donovan <shiftee@posteo.net>
[fixed nvme-fc compile error]
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent 55adcdbb

drivers/nvme/host/core.c

+3 −3
Original line number Diff line number Diff line
@@ -483,6 +483,7 @@ EXPORT_SYMBOL_GPL(nvme_cancel_tagset); 


void nvme_cancel_admin_tagset(struct nvme_ctrl *ctrl)

{

	nvme_stop_keep_alive(ctrl);

	if (ctrl->admin_tagset) {

		blk_mq_tagset_busy_iter(ctrl->admin_tagset,

				nvme_cancel_request, ctrl);
@@ -3200,6 +3201,8 @@ int nvme_init_ctrl_finish(struct nvme_ctrl *ctrl, bool was_suspended) 
	clear_bit(NVME_CTRL_DIRTY_CAPABILITY, &ctrl->flags);

	ctrl->identified = true;



	nvme_start_keep_alive(ctrl);



	return 0;

}

EXPORT_SYMBOL_GPL(nvme_init_ctrl_finish);
@@ -4346,7 +4349,6 @@ void nvme_stop_ctrl(struct nvme_ctrl *ctrl) 
{

	nvme_mpath_stop(ctrl);

	nvme_auth_stop(ctrl);

	nvme_stop_keep_alive(ctrl);

	nvme_stop_failfast_work(ctrl);

	flush_work(&ctrl->async_event_work);

	cancel_work_sync(&ctrl->fw_act_work);
@@ -4357,8 +4359,6 @@ EXPORT_SYMBOL_GPL(nvme_stop_ctrl); 


void nvme_start_ctrl(struct nvme_ctrl *ctrl)

{

	nvme_start_keep_alive(ctrl);



	nvme_enable_aen(ctrl);



	/*

drivers/nvme/host/fc.c

+6 −0
Original line number Diff line number Diff line
@@ -2530,6 +2530,12 @@ __nvme_fc_abort_outstanding_ios(struct nvme_fc_ctrl *ctrl, bool start_queues) 
	 * clean up the admin queue. Same thing as above.

	 */

	nvme_quiesce_admin_queue(&ctrl->ctrl);



	/*

	 * Open-coding nvme_cancel_admin_tagset() as fc

	 * is not using nvme_cancel_request().

	 */

	nvme_stop_keep_alive(&ctrl->ctrl);

	blk_sync_queue(ctrl->ctrl.admin_q);

	blk_mq_tagset_busy_iter(&ctrl->admin_tag_set,

				nvme_fc_terminate_exchange, &ctrl->ctrl);