* [PATCH v2 1/2] nvmet: reset keep alive timer in controller enable
@ 2018-06-19 12:45 Sagi Grimberg
2018-06-19 12:45 ` [PATCH v2 2/2] nvme: start keep alive timer when enabling the controller Sagi Grimberg
2018-06-20 9:06 ` [PATCH v2 1/2] nvmet: reset keep alive timer in controller enable Christoph Hellwig
0 siblings, 2 replies; 6+ messages in thread
From: Sagi Grimberg @ 2018-06-19 12:45 UTC (permalink / raw)
From: Max Gurtuvoy <maxg@mellanox.com>
Controllers that are not yet enabled should not really
enforce keep alive timeout, but we still want to track
a timeout and cleanup in case a host died before it enabled
us. Hence, simply reset the keep alive timer when the controller
is enabled.
Suggested-by: Max Gurtovoy <maxg at mellanox.com>
Signed-off-by: Sagi Grimberg <sagi at grimberg.me>
---
Changes from v1:
- Added some code documentation
drivers/nvme/target/core.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c
index a03da764ecae..1ade6fe9b830 100644
--- a/drivers/nvme/target/core.c
+++ b/drivers/nvme/target/core.c
@@ -686,6 +686,14 @@ static void nvmet_start_ctrl(struct nvmet_ctrl *ctrl)
}
ctrl->csts = NVME_CSTS_RDY;
+ /*
+ * Controllers that are not yet enabled should not really
+ * enforce keep alive timeout, but we still want to track
+ * a timeout and cleanup in case a host died before it enabled
+ * us. Hence, simply reset the keep alive timer when the controller
+ * is enabled.
+ */
+ mod_delayed_work(system_wq, &ctrl->ka_work, ctrl->kato * HZ);
}
static void nvmet_clear_ctrl(struct nvmet_ctrl *ctrl)
--
2.14.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 2/2] nvme: start keep alive timer when enabling the controller
2018-06-19 12:45 [PATCH v2 1/2] nvmet: reset keep alive timer in controller enable Sagi Grimberg
@ 2018-06-19 12:45 ` Sagi Grimberg
2018-06-20 9:06 ` [PATCH v2 1/2] nvmet: reset keep alive timer in controller enable Christoph Hellwig
1 sibling, 0 replies; 6+ messages in thread
From: Sagi Grimberg @ 2018-06-19 12:45 UTC (permalink / raw)
From: Max Gurtuvoy <maxg@mellanox.com>
We start the keep alive timer after all the I/O queues were
created, this might be too late as the controller might have
start its keep alive timer when it was enabled. Hence, start
it right after controller enable was completed.
We stop the keep alive in nvme_stop_ctrl as its before the
disable/shutdown and its independent of the transport connectivity.
Suggested-by: Max Gurtovoy <maxg at mellanox.com>
Suggested-by: James Smart <james.smart at broadcom.com>
Signed-off-by: Sagi Grimberg <sagi at grimberg.me>
---
drivers/nvme/host/core.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 3ba4232d114e..8673b7816e9a 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1761,7 +1761,14 @@ int nvme_enable_ctrl(struct nvme_ctrl *ctrl, u64 cap)
ret = ctrl->ops->reg_write32(ctrl, NVME_REG_CC, ctrl->ctrl_config);
if (ret)
return ret;
- return nvme_wait_ready(ctrl, cap, true);
+
+ ret = nvme_wait_ready(ctrl, cap, true);
+ if (ret)
+ return ret;
+
+ nvme_start_keep_alive(ctrl);
+
+ return 0;
}
EXPORT_SYMBOL_GPL(nvme_enable_ctrl);
@@ -3418,9 +3425,6 @@ EXPORT_SYMBOL_GPL(nvme_stop_ctrl);
void nvme_start_ctrl(struct nvme_ctrl *ctrl)
{
- if (ctrl->kato)
- nvme_start_keep_alive(ctrl);
-
if (ctrl->queue_count > 1) {
nvme_queue_scan(ctrl);
nvme_enable_aen(ctrl);
--
2.14.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v2 1/2] nvmet: reset keep alive timer in controller enable
2018-06-19 12:45 [PATCH v2 1/2] nvmet: reset keep alive timer in controller enable Sagi Grimberg
2018-06-19 12:45 ` [PATCH v2 2/2] nvme: start keep alive timer when enabling the controller Sagi Grimberg
@ 2018-06-20 9:06 ` Christoph Hellwig
2018-06-20 9:33 ` Max Gurtovoy
1 sibling, 1 reply; 6+ messages in thread
From: Christoph Hellwig @ 2018-06-20 9:06 UTC (permalink / raw)
I've applied both patches to nvme-4.18.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-06-20 12:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-19 12:45 [PATCH v2 1/2] nvmet: reset keep alive timer in controller enable Sagi Grimberg
2018-06-19 12:45 ` [PATCH v2 2/2] nvme: start keep alive timer when enabling the controller Sagi Grimberg
2018-06-20 9:06 ` [PATCH v2 1/2] nvmet: reset keep alive timer in controller enable Christoph Hellwig
2018-06-20 9:33 ` Max Gurtovoy
2018-06-20 10:41 ` Sagi Grimberg
2018-06-20 12:28 ` Christoph Hellwig
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox