[PATCH] nvmet: move ka_work initialization to nvmet_alloc_ctrl

[PATCH] nvmet: move ka_work initialization to nvmet_alloc_ctrl

[amit.engel]

From: Amit Engel <amit.engel@dell.com>

Initialize keep-alive work only once, as part of alloc_ctrl
and not each time that nvmet_start_keep_alive_timer is being called

Signed-off-by: Amit Engel <amit.engel@dell.com>
---
 drivers/nvme/target/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c
index adbede9ab7f3..36f9c1caa3f8 100644
--- a/drivers/nvme/target/core.c
+++ b/drivers/nvme/target/core.c
@@ -412,7 +412,6 @@ void nvmet_start_keep_alive_timer(struct nvmet_ctrl *ctrl)
 	pr_debug("ctrl %d start keep-alive timer for %d secs\n",
 		ctrl->cntlid, ctrl->kato);
 
-	INIT_DELAYED_WORK(&ctrl->ka_work, nvmet_keep_alive_timer);
 	schedule_delayed_work(&ctrl->ka_work, ctrl->kato * HZ);
 }
 
@@ -1341,6 +1340,7 @@ u16 nvmet_alloc_ctrl(const char *subsysnqn, const char *hostnqn,
 	INIT_LIST_HEAD(&ctrl->async_events);
 	INIT_RADIX_TREE(&ctrl->p2p_ns_map, GFP_KERNEL);
 	INIT_WORK(&ctrl->fatal_err_work, nvmet_fatal_error_handler);
+	INIT_DELAYED_WORK(&ctrl->ka_work, nvmet_keep_alive_timer);
 
 	memcpy(ctrl->subsysnqn, subsysnqn, NVMF_NQN_SIZE);
 	memcpy(ctrl->hostnqn, hostnqn, NVMF_NQN_SIZE);
-- 
2.18.2


_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme

Re: [PATCH] nvmet: move ka_work initialization to nvmet_alloc_ctrl

[Hou Pu]

On Thu, Apr 22, 2021 at 8:33 PM <amit.engel@dell.com> wrote:
>
> From: Amit Engel <amit.engel@dell.com>
>
> Initialize keep-alive work only once, as part of alloc_ctrl
> and not each time that nvmet_start_keep_alive_timer is being called
>
> Signed-off-by: Amit Engel <amit.engel@dell.com>

Looks good to me.
Reviewed-by: Hou Pu <houpu.main@gmail.com>

Thanks,
Hou

> ---
>  drivers/nvme/target/core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c
> index adbede9ab7f3..36f9c1caa3f8 100644
> --- a/drivers/nvme/target/core.c
> +++ b/drivers/nvme/target/core.c
> @@ -412,7 +412,6 @@ void nvmet_start_keep_alive_timer(struct nvmet_ctrl *ctrl)
>         pr_debug("ctrl %d start keep-alive timer for %d secs\n",
>                 ctrl->cntlid, ctrl->kato);
>
> -       INIT_DELAYED_WORK(&ctrl->ka_work, nvmet_keep_alive_timer);
>         schedule_delayed_work(&ctrl->ka_work, ctrl->kato * HZ);
>  }
>
> @@ -1341,6 +1340,7 @@ u16 nvmet_alloc_ctrl(const char *subsysnqn, const char *hostnqn,
>         INIT_LIST_HEAD(&ctrl->async_events);
>         INIT_RADIX_TREE(&ctrl->p2p_ns_map, GFP_KERNEL);
>         INIT_WORK(&ctrl->fatal_err_work, nvmet_fatal_error_handler);
> +       INIT_DELAYED_WORK(&ctrl->ka_work, nvmet_keep_alive_timer);
>
>         memcpy(ctrl->subsysnqn, subsysnqn, NVMF_NQN_SIZE);
>         memcpy(ctrl->hostnqn, hostnqn, NVMF_NQN_SIZE);
> --
> 2.18.2
>

_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme

Re: [PATCH] nvmet: move ka_work initialization to nvmet_alloc_ctrl

[Christoph Hellwig]

Thanks,

applied to nvme-5.14.

_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme