From: Max Gurtuvoy Date: Tue, 19 Jun 2018 12:45:33 +0000 (+0300) Subject: nvmet: reset keep alive timer in controller enable X-Git-Tag: Ubuntu-4.15.0-56.62~2626 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=2cfe6c75a9148febe537ccfdb458132a91fcaebe;p=mirror_ubuntu-bionic-kernel.git nvmet: reset keep alive timer in controller enable BugLink: https://bugs.launchpad.net/bugs/1835845 [ Upstream commit d68a90e148f5a82aa67654c5012071e31c0e4baa ] Controllers that are not yet enabled should not really enforce keep alive timeouts, but we still want to track a timeout and cleanup in case a host died before it enabled the controller. Hence, simply reset the keep alive timer when the controller is enabled. Suggested-by: Max Gurtovoy Signed-off-by: Sagi Grimberg Signed-off-by: Christoph Hellwig Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman Signed-off-by: Kamal Mostafa Signed-off-by: Khalid Elmously --- diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c index 5914ead8a3b4..9494524ec70a 100644 --- a/drivers/nvme/target/core.c +++ b/drivers/nvme/target/core.c @@ -621,6 +621,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 the + * keep alive timeout, but we still want to track a timeout and cleanup + * in case a host died before it enabled the controller. 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)