@@ -2361,16 +2361,10 @@ static void nvme_remove_dead_ctrl(struct nvme_dev *dev, int status)
nvme_put_ctrl(&dev->ctrl);
}
-static void nvme_reset_work(struct work_struct *work)
+static int nvme_pre_reset_dev(struct nvme_dev *dev)
{
- struct nvme_dev *dev =
- container_of(work, struct nvme_dev, ctrl.reset_work);
bool was_suspend = !!(dev->ctrl.ctrl_config & NVME_CC_SHN_NORMAL);
int result = -ENODEV;
- enum nvme_ctrl_state new_state = NVME_CTRL_LIVE;
-
- if (WARN_ON(dev->ctrl.state != NVME_CTRL_RESETTING))
- goto out;
/*
* If we're called to reset a live controller first shut it down before
@@ -2430,8 +2424,13 @@ static void nvme_reset_work(struct work_struct *work)
}
result = nvme_setup_io_queues(dev);
- if (result)
- goto out;
+ out:
+ return result;
+}
+
+static void nvme_post_reset_dev(struct nvme_dev *dev)
+{
+ enum nvme_ctrl_state new_state = NVME_CTRL_LIVE;
/*
* Keep the controller around but remove all namespaces if we don't have
@@ -2465,7 +2464,25 @@ static void nvme_reset_work(struct work_struct *work)
return;
out:
- nvme_remove_dead_ctrl(dev, result);
+ nvme_remove_dead_ctrl(dev, 0);
+}
+
+static void nvme_reset_work(struct work_struct *work)
+{
+ struct nvme_dev *dev =
+ container_of(work, struct nvme_dev, ctrl.reset_work);
+ int ret;
+
+ if (WARN_ON(dev->ctrl.state != NVME_CTRL_RESETTING))
+ return;
+
+ ret = nvme_pre_reset_dev(dev);
+ if (ret) {
+ nvme_remove_dead_ctrl(dev, ret);
+ return;
+ }
+
+ nvme_post_reset_dev(dev);
}
static void nvme_remove_dead_ctrl_work(struct work_struct *work)
This patch splits controller resetting into the following two parts: 1) the real resetting part 2) the 2nd part for draining IO and updating controller state The patch prepares for supporting reliable controller recovery, for example, IO timeout still may be triggered when running the above part 2, so we still have to recover hardware under this situation. No functional change. Cc: Jianchao Wang <jianchao.w.wang@oracle.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Sagi Grimberg <sagi@grimberg.me> Cc: linux-nvme@lists.infradead.org Cc: Laurence Oberman <loberman@redhat.com> Signed-off-by: Ming Lei <ming.lei@redhat.com> --- drivers/nvme/host/pci.c | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-)