Commit d6135c3a authored by Keith Busch's avatar Keith Busch
Browse files

nvme-pci: Sync queues on reset 



A controller with multiple namespaces may have multiple request_queues with
their own timeout work. If a controller fails with IO outstanding to
diffent namespaces, each request queue may attempt to handle it, so
ensure there is no previously scheduled timeout work executing prior to
starting controller initialization by synchronizing with each queue.

Reviewed-by: default avatarMinwoo Im <minwoo.im.dev@gmail.com>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
parent 2036f726

drivers/nvme/host/core.c

+12 −0
Original line number Diff line number Diff line
@@ -3880,6 +3880,18 @@ void nvme_start_queues(struct nvme_ctrl *ctrl) 
}

EXPORT_SYMBOL_GPL(nvme_start_queues);





void nvme_sync_queues(struct nvme_ctrl *ctrl)

{

	struct nvme_ns *ns;



	down_read(&ctrl->namespaces_rwsem);

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

		blk_sync_queue(ns->queue);

	up_read(&ctrl->namespaces_rwsem);

}

EXPORT_SYMBOL_GPL(nvme_sync_queues);



/*

 * Check we didn't inadvertently grow the command structure sizes:

 */

drivers/nvme/host/nvme.h

+1 −0
Original line number Diff line number Diff line
@@ -441,6 +441,7 @@ void nvme_complete_async_event(struct nvme_ctrl *ctrl, __le16 status, 
void nvme_stop_queues(struct nvme_ctrl *ctrl);

void nvme_start_queues(struct nvme_ctrl *ctrl);

void nvme_kill_queues(struct nvme_ctrl *ctrl);

void nvme_sync_queues(struct nvme_ctrl *ctrl);

void nvme_unfreeze(struct nvme_ctrl *ctrl);

void nvme_wait_freeze(struct nvme_ctrl *ctrl);

void nvme_wait_freeze_timeout(struct nvme_ctrl *ctrl, long timeout);

drivers/nvme/host/pci.c

+1 −0
Original line number Diff line number Diff line
@@ -2492,6 +2492,7 @@ static void nvme_reset_work(struct work_struct *work) 
	 */

	if (dev->ctrl.ctrl_config & NVME_CC_ENABLE)

		nvme_dev_disable(dev, false);

	nvme_sync_queues(&dev->ctrl);



	mutex_lock(&dev->shutdown_lock);

	result = nvme_pci_enable(dev);