Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4054637c authored Oct 29, 2017 by Sagi Grimberg Committed by Christoph Hellwig Nov 01, 2017

nvme: flush reset_work before safely continuing with delete operation



Prevent racing controller reset and delete flows. reset_work must not
ever self-requeue so flushing it suffices.

Reported-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>

parent 12fa1304

drivers/nvme/host/core.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,7 @@ static void nvme_delete_ctrl_work(struct work_struct *work)
		struct nvme_ctrl *ctrl =
		container_of(work, struct nvme_ctrl, delete_work);

		flush_work(&ctrl->reset_work);
		nvme_stop_ctrl(ctrl);
		nvme_remove_namespaces(ctrl);
		ctrl->ops->delete_ctrl(ctrl);

drivers/nvme/host/fc.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -2638,7 +2638,6 @@ nvme_fc_delete_ctrl(struct nvme_ctrl *nctrl)
		{
		struct nvme_fc_ctrl *ctrl = to_fc_ctrl(nctrl);

		cancel_work_sync(&ctrl->ctrl.reset_work);
		cancel_delayed_work_sync(&ctrl->connect_work);
		/*
		* kill the association on the link side. this will block