nvmet: allow Keep Alive for Discovery controller

Per change to specification allowing Discovery controllers to have
explicit persistent connections, remove restriction on Discovery
controllers allowing kato on connect.

Signed-off-by: Jay Sternberg <jay.e.sternberg@intel.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c
index 2e89f4e3364b35f2eee0ececde67589a9a2461cd..ad94119f6a51914b9f2c7014ab82609532b852dc 100644 (file)
--- a/drivers/nvme/target/admin-cmd.c
+++ b/drivers/nvme/target/admin-cmd.c
@@ -726,7 +726,7 @@ static void nvmet_execute_async_event(struct nvmet_req *req)
        schedule_work(&ctrl->async_event_work);
 }
 
-static void nvmet_execute_keep_alive(struct nvmet_req *req)
+void nvmet_execute_keep_alive(struct nvmet_req *req)
 {
        struct nvmet_ctrl *ctrl = req->sq->ctrl;
 

diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c
index f42a105ef17f6ff1751acb4ce787a8ad56b06ba3..46345c3f9d4a42bb614d00e3ac359f37ad32776f 100644 (file)
--- a/drivers/nvme/target/core.c
+++ b/drivers/nvme/target/core.c
@@ -1180,31 +1180,17 @@ u16 nvmet_alloc_ctrl(const char *subsysnqn, const char *hostnqn,
        ctrl->cntlid = ret;
 
        ctrl->ops = req->ops;
-       if (ctrl->subsys->type == NVME_NQN_DISC) {
-               /* Don't accept keep-alive timeout for discovery controllers */
-               if (kato) {
-                       status = NVME_SC_INVALID_FIELD | NVME_SC_DNR;
-                       goto out_remove_ida;
-               }
 
-               /*
-                * Discovery controllers use some arbitrary high value in order
-                * to cleanup stale discovery sessions
-                *
-                * From the latest base diff RC:
-                * "The Keep Alive command is not supported by
-                * Discovery controllers. A transport may specify a
-                * fixed Discovery controller activity timeout value
-                * (e.g., 2 minutes).  If no commands are received
-                * by a Discovery controller within that time
-                * period, the controller may perform the
-                * actions for Keep Alive Timer expiration".
-                */
-               ctrl->kato = NVMET_DISC_KATO;
-       } else {
-               /* keep-alive timeout in seconds */
-               ctrl->kato = DIV_ROUND_UP(kato, 1000);
-       }
+       /*
+        * Discovery controllers may use some arbitrary high value
+        * in order to cleanup stale discovery sessions
+        */
+       if ((ctrl->subsys->type == NVME_NQN_DISC) && !kato)
+               kato = NVMET_DISC_KATO_MS;
+
+       /* keep-alive timeout in seconds */
+       ctrl->kato = DIV_ROUND_UP(kato, 1000);
+
        nvmet_start_keep_alive_timer(ctrl);
 
        mutex_lock(&subsys->lock);
@@ -1215,8 +1201,6 @@ u16 nvmet_alloc_ctrl(const char *subsysnqn, const char *hostnqn,
        *ctrlp = ctrl;
        return 0;
 
-out_remove_ida:
-       ida_simple_remove(&cntlid_ida, ctrl->cntlid);
 out_free_sqs:
        kfree(ctrl->sqs);
 out_free_cqs:

diff --git a/drivers/nvme/target/discovery.c b/drivers/nvme/target/discovery.c
index bc0aa0bf1543dc539256948f13663674dec5d166..6e0f91eb34ce1e4fd003f5beb08c181b347b216b 100644 (file)
--- a/drivers/nvme/target/discovery.c
+++ b/drivers/nvme/target/discovery.c
@@ -194,6 +194,10 @@ u16 nvmet_parse_discovery_cmd(struct nvmet_req *req)
        }
 
        switch (cmd->common.opcode) {
+       case nvme_admin_keep_alive:
+               req->execute = nvmet_execute_keep_alive;
+               req->data_len = 0;
+               return 0;
        case nvme_admin_get_log_page:
                req->data_len = nvmet_get_log_page_len(cmd);
 

diff --git a/drivers/nvme/target/nvmet.h b/drivers/nvme/target/nvmet.h
index 8ddc54fa98c716d496b72effe96bae3dff4879db..c525fb0510c5e458707f082950f39779beef21e6 100644 (file)
--- a/drivers/nvme/target/nvmet.h
+++ b/drivers/nvme/target/nvmet.h
@@ -372,6 +372,8 @@ void nvmet_req_complete(struct nvmet_req *req, u16 status);
 int nvmet_req_alloc_sgl(struct nvmet_req *req);
 void nvmet_req_free_sgl(struct nvmet_req *req);
 
+void nvmet_execute_keep_alive(struct nvmet_req *req);
+
 void nvmet_cq_setup(struct nvmet_ctrl *ctrl, struct nvmet_cq *cq, u16 qid,
                u16 size);
 void nvmet_sq_setup(struct nvmet_ctrl *ctrl, struct nvmet_sq *sq, u16 qid,
@@ -442,7 +444,7 @@ u32 nvmet_get_log_page_len(struct nvme_command *cmd);
 #define NVMET_DEFAULT_ANA_GRPID        1
 
 #define NVMET_KAS              10
-#define NVMET_DISC_KATO                120
+#define NVMET_DISC_KATO_MS             120000
 
 int __init nvmet_init_configfs(void);
 void __exit nvmet_exit_configfs(void);