nvme: Add async shutdown support
PATCH 3/3 nvme: Add async shutdown support
This works with the asynchronous shutdown mechanism setup for the PCI drivers and participates to provide both pre and post shutdown routines at pci_driver structure level.
The shutdown_pre routine starts the shutdown and does not wait for the shutdown to complete. The shutdown_post routine waits for the shutdown to complete on individual controllers that this driver instance controls. This mechanism optimizes to speed up the shutdown in a system which host many controllers.
Signed-off-by Tanjore Suresh <[email protected]>
--- drivers/nvme/host/core.c | 28 ++++++++++---- drivers/nvme/host/nvme.h | 8 ++++ drivers/nvme/host/pci.c | 80 +++++++++++++++++++++++++--------------- 3 files changed, 80 insertions(+), 36 deletions(-)
drivers/nvme/host/core.c +21 -7
@@ -2210,16 +2210,30 @@ EXPORT_SYMBOL_GPL(nvme_enable_ctrl);int nvme_shutdown_ctrl (struct nvme_ctrl *ctrl) { -unsigned long timeout = jiffies + (ctrl->shutdown_timeout *HZ ); -u32 csts;int ret; + ret =nvme_shutdown_ctrl_start (ctrl); +if (ret) +return ret; +return nvme_wait_for_shutdown_cmpl (ctrl); +} +EXPORT_SYMBOL_GPL (nvme_shutdown_ctrl); + +int nvme_shutdown_ctrl_start (struct nvme_ctrl *ctrl) +{ + ctrl->ctrl_config &= ~NVME_CC_SHN_MASK ; ctrl->ctrl_config |=NVME_CC_SHN_NORMAL ; - ret = ctrl->ops->reg_write32 (ctrl,NVME_REG_CC , ctrl->ctrl_config); -if (ret) -return ret; +return ctrl->ops->reg_write32 (ctrl,NVME_REG_CC , ctrl->ctrl_config); +} +EXPORT_SYMBOL_GPL (nvme_shutdown_ctrl_start); + +int nvme_wait_for_shutdown_cmpl (struct nvme_ctrl *ctrl) +{ +unsigned long deadline = jiffies + (ctrl->shutdown_timeout *HZ ); +u32 csts; +int ret;while ((ret = ctrl->ops->reg_read32 (ctrl,NVME_REG_CSTS , &csts)) ==0 ) {if ((csts &NVME_CSTS_SHST_MASK ) ==NVME_CSTS_SHST_CMPLT )
@@ -2228,7 +2242,7 @@ int nvme_shutdown_ctrl(struct nvme_ctrl *ctrl)msleep (100 );if (fatal_signal_pending (current))return -EINTR ; -if (time_after (jiffies, timeout)) { +if (time_after (jiffies, deadline)) {dev_err (ctrl->device,"Device shutdown incomplete; abort shutdown\n" );return -ENODEV ;
@@ -2237,7 +2251,7 @@ int nvme_shutdown_ctrl(struct nvme_ctrl *ctrl)return ret; } -EXPORT_SYMBOL_GPL (nvme_shutdown_ctrl); +EXPORT_SYMBOL_GPL (nvme_wait_for_shutdown_cmpl);static int nvme_configure_timestamp (struct nvme_ctrl *ctrl) {
drivers/nvme/host/nvme.h +8 -0
@@ -170,6 +170,12 @@ enum { NVME_REQ_USERCMD = (1 << 1), }; +enum shutdown_type { +DO_NOT_SHUTDOWN =0 , +SHUTDOWN_TYPE_SYNC =1 , +SHUTDOWN_TYPE_ASYNC =2 , +}; +static inline struct nvme_request *nvme_req (struct request *req) {return blk_mq_rq_to_pdu (req);
@@ -671,6 +677,8 @@ bool nvme_wait_reset(struct nvme_ctrl *ctrl);int nvme_disable_ctrl (struct nvme_ctrl *ctrl);int nvme_enable_ctrl (struct nvme_ctrl *ctrl);int nvme_shutdown_ctrl (struct nvme_ctrl *ctrl); +int nvme_shutdown_ctrl_start (struct nvme_ctrl *ctrl); +int nvme_wait_for_shutdown_cmpl (struct nvme_ctrl *ctrl);int nvme_init_ctrl (struct nvme_ctrl *ctrl,struct device *dev,const struct nvme_ctrl_ops *ops,unsigned long quirks);void nvme_uninit_ctrl (struct nvme_ctrl *ctrl);
drivers/nvme/host/pci.c +51 -29
216 lines not on this page · raw message
Signature · 1 line
2.35.1.1021.g381101b075-goog
Christoph Hellwig
maintainerIf you only send me patch 3 of a 3 patch series I have no sensible way to review it, sorry.