nvme: move reset workqueue handling to common code
Subsystems (3)
Christoph Hellwig
maintainerPATCH 1/1 nvme: move reset workqueue handling to common code
This moves the nvme_reset function from the PCIe driver to common code, renaming it to nvme_reset_ctrl in the process. Additionally a new helper nvme_reset_ctrl_sync is added for the case where we want to wait for the reset. To facilitate that the reset_work work structure is move to the common nvme_ctrl structure and the ->reset_ctrl method is removed. For now the drivers initialize the reset_work with their own callback, but longer term we should move to callouts for specific parts of the reset process and move even more code to the core.
--- drivers/nvme/host/core.c | 28 +++++++++++++++++++++++++--- drivers/nvme/host/fc.c | 36 ++++-------------------------------- drivers/nvme/host/nvme.h | 3 ++- drivers/nvme/host/pci.c | 45 +++++++++++---------------------------------- drivers/nvme/host/rdma.c | 23 +++-------------------- drivers/nvme/target/loop.c | 25 ++++--------------------- 6 files changed, 49 insertions(+), 111 deletions(-)
drivers/nvme/host/core.c +25 -3
@@ -73,6 +73,28 @@ static DEFINE_SPINLOCK(dev_list_lock);static struct class *nvme_class; +int nvme_reset_ctrl (struct nvme_ctrl *ctrl) +{ +if (!ctrl->admin_q ||blk_queue_dying (ctrl->admin_q)) +return -ENODEV ; +if (!nvme_change_ctrl_state (ctrl,NVME_CTRL_RESETTING )) +return -EBUSY ; +if (!queue_work (nvme_wq, &ctrl->reset_work)) +return -EBUSY ; +return 0 ; +} +EXPORT_SYMBOL_GPL (nvme_reset_ctrl); + +static int nvme_reset_ctrl_sync (struct nvme_ctrl *ctrl) +{ +int ret; + + ret =nvme_reset_ctrl (ctrl); +if (!ret) +flush_work (&ctrl->reset_work); +return ret; +} +static int nvme_error_status (struct request *req) {switch (nvme_req (req)->status &0x7ff ) {
@@ -601,7 +623,7 @@ static void nvme_keep_alive_work(struct work_struct *work)if (nvme_keep_alive (ctrl)) {/* allocation failure, reset the controller */ dev_err (ctrl->device,"keep-alive failed\n" ); - ctrl->ops->reset_ctrl (ctrl); +nvme_reset_ctrl_sync (ctrl);return ; } }
@@ -1739,7 +1761,7 @@ static long nvme_dev_ioctl(struct file *file, unsigned int cmd,return nvme_dev_user_cmd (ctrl, argp);case NVME_IOCTL_RESET :dev_warn (ctrl->device,"resetting controller\n" ); -return ctrl->ops->reset_ctrl (ctrl); +return nvme_reset_ctrl_sync (ctrl);case NVME_IOCTL_SUBSYS_RESET :return nvme_reset_subsystem (ctrl);case NVME_IOCTL_RESCAN :
@@ -1765,7 +1787,7 @@ static ssize_t nvme_sysfs_reset(struct device *dev,struct nvme_ctrl *ctrl =dev_get_drvdata (dev);int ret; - ret = ctrl->ops->reset_ctrl (ctrl); + ret =nvme_reset_ctrl_sync (ctrl);if (ret <0 )return ret;return count;
drivers/nvme/host/fc.c +4 -32
@@ -161,7 +161,6 @@ struct nvme_fc_ctrl {struct blk_mq_tag_set tag_set;struct work_struct delete_work; -struct work_struct reset_work;struct delayed_work connect_work;struct kref ref;
@@ -1775,10 +1774,7 @@ nvme_fc_error_recovery(struct nvme_fc_ctrl *ctrl, char *errmsg)return ; } -if (!queue_work (nvme_wq, &ctrl->reset_work)) -dev_err (ctrl->ctrl.device, -"NVME-FC{%d}: error_recovery: Failed to schedule " -"reset work\n" , ctrl->cnum); +nvme_reset_ctrl (&ctrl->ctrl); } static enum blk_eh_timer_return
@@ -2527,7 +2523,7 @@ nvme_fc_delete_ctrl_work(struct work_struct *work)struct nvme_fc_ctrl *ctrl = container_of(work, struct nvme_fc_ctrl, delete_work); -cancel_work_sync (&ctrl->reset_work); +cancel_work_sync (&ctrl->ctrl.reset_work);cancel_delayed_work_sync (&ctrl->connect_work);/*
@@ -2621,7 +2617,7 @@ static void nvme_fc_reset_ctrl_work(struct work_struct *work) {struct nvme_fc_ctrl *ctrl = - container_of(work, struct nvme_fc_ctrl, reset_work); + container_of(work, struct nvme_fc_ctrl, ctrl.reset_work);int ret;/* will block will waiting for io to terminate */
@@ -2635,29 +2631,6 @@ nvme_fc_reset_ctrl_work(struct work_struct *work) "NVME-FC{%d}: controller reset complete\n", ctrl->cnum); } -/* -* called by the nvme core layer, for sysfs interface that requests -* a reset of the nvme controller -*/ -static int -nvme_fc_reset_nvme_ctrl (struct nvme_ctrl *nctrl) -{ -struct nvme_fc_ctrl *ctrl =to_fc_ctrl (nctrl); - -dev_info (ctrl->ctrl.device, -"NVME-FC{%d}: admin requested controller reset\n" , ctrl->cnum); - -if (!nvme_change_ctrl_state (&ctrl->ctrl,NVME_CTRL_RESETTING )) -return -EBUSY ; - -if (!queue_work (nvme_wq, &ctrl->reset_work)) -return -EBUSY ; - -flush_work (&ctrl->reset_work); - -return 0 ; -} -static const struct nvme_ctrl_ops nvme_fc_ctrl_ops = { .name ="fc" , .module =THIS_MODULE ,
@@ -2665,7 +2638,6 @@ static const struct nvme_ctrl_ops nvme_fc_ctrl_ops = { .reg_read32 = nvmf_reg_read32, .reg_read64 = nvmf_reg_read64, .reg_write32 = nvmf_reg_write32, - .reset_ctrl = nvme_fc_reset_nvme_ctrl, .free_ctrl = nvme_fc_nvme_ctrl_freed, .submit_async_event = nvme_fc_submit_async_event, .delete_ctrl = nvme_fc_del_nvme_ctrl,
@@ -2740,7 +2712,7 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts,kref_init (&ctrl->ref);INIT_WORK (&ctrl->delete_work, nvme_fc_delete_ctrl_work); -INIT_WORK (&ctrl->reset_work, nvme_fc_reset_ctrl_work); +INIT_WORK (&ctrl->ctrl.reset_work, nvme_fc_reset_ctrl_work);INIT_DELAYED_WORK (&ctrl->connect_work, nvme_fc_connect_ctrl_work);spin_lock_init (&ctrl->lock);
drivers/nvme/host/nvme.h +2 -1
@@ -133,6 +133,7 @@ struct nvme_ctrl {struct device *device;/* char device */ struct list_head node;struct ida ns_ida; +struct work_struct reset_work;struct opal_dev *opal_dev;
@@ -220,7 +221,6 @@ struct nvme_ctrl_ops {int (*reg_read32)(struct nvme_ctrl *ctrl,u32 off,u32 *val);int (*reg_write32)(struct nvme_ctrl *ctrl,u32 off,u32 val);int (*reg_read64)(struct nvme_ctrl *ctrl,u32 off,u64 *val); -int (*reset_ctrl)(struct nvme_ctrl *ctrl);void (*free_ctrl)(struct nvme_ctrl *ctrl);void (*submit_async_event)(struct nvme_ctrl *ctrl,int aer_idx);int (*delete_ctrl)(struct nvme_ctrl *ctrl);
@@ -327,6 +327,7 @@ int nvme_set_features(struct nvme_ctrl *dev, unsigned fid, unsigned dword11,int nvme_set_queue_count (struct nvme_ctrl *ctrl,int *count);void nvme_start_keep_alive (struct nvme_ctrl *ctrl);void nvme_stop_keep_alive (struct nvme_ctrl *ctrl); +int nvme_reset_ctrl (struct nvme_ctrl *ctrl);struct sg_io_hdr ;
drivers/nvme/host/pci.c +11 -34
135 lines not on this page · raw message
drivers/nvme/host/rdma.c +3 -20
@@ -108,7 +108,6 @@ struct nvme_rdma_ctrl {/* other member variables */ struct blk_mq_tag_set tag_set;struct work_struct delete_work; -struct work_struct reset_work;struct work_struct err_work;struct nvme_rdma_qe async_event_sqe;
@@ -1723,8 +1722,8 @@ static void nvme_rdma_remove_ctrl_work(struct work_struct *work)static void nvme_rdma_reset_ctrl_work (struct work_struct *work) { -struct nvme_rdma_ctrl *ctrl =container_of (work, - struct nvme_rdma_ctrl, reset_work); +struct nvme_rdma_ctrl *ctrl = + container_of(work, struct nvme_rdma_ctrl, ctrl.reset_work);int ret;bool changed;
@@ -1768,21 +1767,6 @@ static void nvme_rdma_reset_ctrl_work(struct work_struct *work)WARN_ON (!queue_work (nvme_wq, &ctrl->delete_work)); } -static int nvme_rdma_reset_ctrl (struct nvme_ctrl *nctrl) -{ -struct nvme_rdma_ctrl *ctrl =to_rdma_ctrl (nctrl); - -if (!nvme_change_ctrl_state (&ctrl->ctrl,NVME_CTRL_RESETTING )) -return -EBUSY ; - -if (!queue_work (nvme_wq, &ctrl->reset_work)) -return -EBUSY ; - -flush_work (&ctrl->reset_work); - -return 0 ; -} -static const struct nvme_ctrl_ops nvme_rdma_ctrl_ops = { .name ="rdma" , .module =THIS_MODULE ,
@@ -1790,7 +1774,6 @@ static const struct nvme_ctrl_ops nvme_rdma_ctrl_ops = { .reg_read32 = nvmf_reg_read32, .reg_read64 = nvmf_reg_read64, .reg_write32 = nvmf_reg_write32, - .reset_ctrl = nvme_rdma_reset_ctrl, .free_ctrl = nvme_rdma_free_ctrl, .submit_async_event = nvme_rdma_submit_async_event, .delete_ctrl = nvme_rdma_del_ctrl,
@@ -1899,7 +1882,7 @@ static struct nvme_ctrl *nvme_rdma_create_ctrl(struct device *dev, nvme_rdma_reconnect_ctrl_work);INIT_WORK (&ctrl->err_work, nvme_rdma_error_recovery_work);INIT_WORK (&ctrl->delete_work, nvme_rdma_del_ctrl_work); -INIT_WORK (&ctrl->reset_work, nvme_rdma_reset_ctrl_work); +INIT_WORK (&ctrl->ctrl.reset_work, nvme_rdma_reset_ctrl_work); ctrl->queue_count = opts->nr_io_queues +1 ;/* +1 for admin queue */ ctrl->ctrl.sqsize = opts->queue_size -1 ;
drivers/nvme/target/loop.c +4 -21
@@ -58,7 +58,6 @@ struct nvme_loop_ctrl {struct nvmet_ctrl *target_ctrl;struct work_struct delete_work; -struct work_struct reset_work; };static inline struct nvme_loop_ctrl *to_loop_ctrl (struct nvme_ctrl *ctrl)
@@ -150,7 +149,7 @@ nvme_loop_timeout(struct request *rq, bool reserved)struct nvme_loop_iod *iod =blk_mq_rq_to_pdu (rq);/* queue error recovery */ -queue_work (nvme_wq, &iod->queue->ctrl->reset_work); +nvme_reset_ctrl (&iod->queue->ctrl->ctrl);/* fail with DNR on admin cmd timeout */ nvme_req (rq)->status =NVME_SC_ABORT_REQ |NVME_SC_DNR ;
@@ -500,8 +499,8 @@ static void nvme_loop_delete_ctrl(struct nvmet_ctrl *nctrl)static void nvme_loop_reset_ctrl_work (struct work_struct *work) { -struct nvme_loop_ctrl *ctrl =container_of (work, - struct nvme_loop_ctrl, reset_work); +struct nvme_loop_ctrl *ctrl = + container_of(work, struct nvme_loop_ctrl, ctrl.reset_work);bool changed;int ret;
@@ -539,21 +538,6 @@ static void nvme_loop_reset_ctrl_work(struct work_struct *work)nvme_put_ctrl (&ctrl->ctrl); } -static int nvme_loop_reset_ctrl (struct nvme_ctrl *nctrl) -{ -struct nvme_loop_ctrl *ctrl =to_loop_ctrl (nctrl); - -if (!nvme_change_ctrl_state (&ctrl->ctrl,NVME_CTRL_RESETTING )) -return -EBUSY ; - -if (!queue_work (nvme_wq, &ctrl->reset_work)) -return -EBUSY ; - -flush_work (&ctrl->reset_work); - -return 0 ; -} -static const struct nvme_ctrl_ops nvme_loop_ctrl_ops = { .name ="loop" , .module =THIS_MODULE ,
@@ -561,7 +545,6 @@ static const struct nvme_ctrl_ops nvme_loop_ctrl_ops = { .reg_read32 = nvmf_reg_read32, .reg_read64 = nvmf_reg_read64, .reg_write32 = nvmf_reg_write32, - .reset_ctrl = nvme_loop_reset_ctrl, .free_ctrl = nvme_loop_free_ctrl, .submit_async_event = nvme_loop_submit_async_event, .delete_ctrl = nvme_loop_del_ctrl,
@@ -628,7 +611,7 @@ static struct nvme_ctrl *nvme_loop_create_ctrl(struct device *dev,INIT_LIST_HEAD (&ctrl->list);INIT_WORK (&ctrl->delete_work, nvme_loop_del_ctrl_work); -INIT_WORK (&ctrl->reset_work, nvme_loop_reset_ctrl_work); +INIT_WORK (&ctrl->ctrl.reset_work, nvme_loop_reset_ctrl_work); ret =nvme_init_ctrl (&ctrl->ctrl, dev, &nvme_loop_ctrl_ops,0 /* no quirks, we're perfect! */ );
Signature · 1 line
2.11.0
Jens Axboe
maintainerPATCH 1/1 nvme: move reset workqueue handling to common code
Quoted 8 lines · Christoph Hellwig
This moves the
nvme_resetfunction from the PCIe driver to common code, renaming it tonvme_reset_ctrlin the process. Additionally a new helpernvme_reset_ctrl_syncis added for the case where we want to wait for the reset. To facilitate that thereset_workwork structure is move to the commonnvme_ctrlstructure and the ->reset_ctrl method is removed. For now the drivers initialize thereset_workwith their own callback, but longer term we should move to callouts for specific parts of the reset process and move even more code to the core.
Nice cleanup.
Signature · 1 line
Jens Axboe
Sagi Grimberg
maintainerPATCH 1/1 nvme: move reset workqueue handling to common code
In reply to Christoph Hellwigdrivers/nvme/host/core.c static DEFINE_SPINLOCK(dev_list_lock); · line 79
Quoted 5 lines
drivers/nvme/host/core.c +4
-0+int nvme_reset_ctrl (struct nvme_ctrl *ctrl) +{ +if (!ctrl->admin_q ||blk_queue_dying (ctrl->admin_q)) +return -ENODEV ;
I don't think we need these. I know they exist in pci, but it looks really odd that we're able to even get to this point when the controller is not already in RESETTING/DELETING/DEAD (which would not pass the ctrl state change anyhow).
And if it is, we need to fix that IMHO, we should always make sure to rely on our ctrl state for making decisions.
Quoted 22 lines
drivers/nvme/host/core.c +18
-0+if (!nvme_change_ctrl_state (ctrl,NVME_CTRL_RESETTING )) +return -EBUSY ; +if (!queue_work (nvme_wq, &ctrl->reset_work)) +return -EBUSY ; +return 0 ; +} +EXPORT_SYMBOL_GPL (nvme_reset_ctrl); + +static int nvme_reset_ctrl_sync (struct nvme_ctrl *ctrl) +{ +int ret; + + ret =nvme_reset_ctrl (ctrl); +if (!ret) +flush_work (&ctrl->reset_work); +return ret; +} +static int nvme_error_status (struct request *req) {switch (nvme_req (req)->status &0x7ff ) {
drivers/nvme/host/core.c static void nvme_keep_alive_work(struct work_struct *work) · line 626
Quoted 5 lines
drivers/nvme/host/core.c +1
-1@@ -601,7 +623,7 @@ static void nvme_keep_alive_work(struct work_struct *work)if (nvme_keep_alive (ctrl)) {/* allocation failure, reset the controller */ dev_err (ctrl->device,"keep-alive failed\n" ); - ctrl->ops->reset_ctrl (ctrl); +nvme_reset_ctrl_sync (ctrl);
Looking at this, I actually think this should be the non-sync version. My code :)
Both of these are not directly related to the patch itself so,