nvmet: Introduced helper routine for controller status check.

This patch introduces helper function for checking controller
status during admin and io command processing which returns u16
status. As to bring consistency on returning status, other
friend functions also now return u16 status instead of int
to match the spec.

As part of the theseerror log prints in also prints qid on
which command error occured.

Signed-off-by: Parav Pandit <parav@mellanox.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jens Axboe <axboe@fb.com>

6 files changed, 41 insertions, 34 deletions

diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c
index 42b8bba97e7d..105ace88d07e 100644
--- a/drivers/nvme/target/admin-cmd.c
+++ b/drivers/nvme/target/admin-cmd.c
@@ -480,22 +480,16 @@ static void nvmet_execute_keep_alive(struct nvmet_req *req)
         nvmet_req_complete(req, 0);
 }
 
-int nvmet_parse_admin_cmd(struct nvmet_req *req)
+u16 nvmet_parse_admin_cmd(struct nvmet_req *req)
 {
         struct nvme_command *cmd = req->cmd;
+        u16 ret;
 
         req->ns = NULL;
 
-        if (unlikely(!(req->sq->ctrl->cc & NVME_CC_ENABLE))) {
-                pr_err("got admin cmd %d while CC.EN == 0\n",
-                       cmd->common.opcode);
-                return NVME_SC_CMD_SEQ_ERROR | NVME_SC_DNR;
-        }
-        if (unlikely(!(req->sq->ctrl->csts & NVME_CSTS_RDY))) {
-                pr_err("got admin cmd %d while CSTS.RDY == 0\n",
-                       cmd->common.opcode);
-                return NVME_SC_CMD_SEQ_ERROR | NVME_SC_DNR;
-        }
+        ret = nvmet_check_ctrl_status(req, cmd);
+        if (unlikely(ret))
+                return ret;
 
         switch (cmd->common.opcode) {
         case nvme_admin_get_log_page:
@@ -545,6 +539,7 @@ int nvmet_parse_admin_cmd(struct nvmet_req *req)
                 return 0;
         }
 
-        pr_err("unhandled cmd %d\n", cmd->common.opcode);
+        pr_err("unhandled cmd %d on qid %d\n", cmd->common.opcode,
+               req->sq->qid);
         return NVME_SC_INVALID_OPCODE | NVME_SC_DNR;
 }
diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c
index 2536119a580d..cf90713043da 100644
--- a/drivers/nvme/target/core.c
+++ b/drivers/nvme/target/core.c
@@ -661,6 +661,23 @@ out:
         return status;
 }
 
+u16 nvmet_check_ctrl_status(struct nvmet_req *req, struct nvme_command *cmd)
+{
+        if (unlikely(!(req->sq->ctrl->cc & NVME_CC_ENABLE))) {
+                pr_err("got io cmd %d while CC.EN == 0 on qid = %d\n",
+                       cmd->common.opcode, req->sq->qid);
+                return NVME_SC_CMD_SEQ_ERROR | NVME_SC_DNR;
+        }
+
+        if (unlikely(!(req->sq->ctrl->csts & NVME_CSTS_RDY))) {
+                pr_err("got io cmd %d while CSTS.RDY == 0 on qid = %d\n",
+                       cmd->common.opcode, req->sq->qid);
+                req->ns = NULL;
+                return NVME_SC_CMD_SEQ_ERROR | NVME_SC_DNR;
+        }
+        return 0;
+}
+
 static bool __nvmet_host_allowed(struct nvmet_subsys *subsys,
                 const char *hostnqn)
 {
diff --git a/drivers/nvme/target/discovery.c b/drivers/nvme/target/discovery.c
index 745f26f35244..1aaf597e81fc 100644
--- a/drivers/nvme/target/discovery.c
+++ b/drivers/nvme/target/discovery.c
@@ -159,7 +159,7 @@ out:
         nvmet_req_complete(req, status);
 }
 
-int nvmet_parse_discovery_cmd(struct nvmet_req *req)
+u16 nvmet_parse_discovery_cmd(struct nvmet_req *req)
 {
         struct nvme_command *cmd = req->cmd;
 
diff --git a/drivers/nvme/target/fabrics-cmd.c b/drivers/nvme/target/fabrics-cmd.c
index 8bd022af3df6..2a3c15b57f6e 100644
--- a/drivers/nvme/target/fabrics-cmd.c
+++ b/drivers/nvme/target/fabrics-cmd.c
@@ -73,7 +73,7 @@ static void nvmet_execute_prop_get(struct nvmet_req *req)
         nvmet_req_complete(req, status);
 }
 
-int nvmet_parse_fabrics_cmd(struct nvmet_req *req)
+u16 nvmet_parse_fabrics_cmd(struct nvmet_req *req)
 {
         struct nvme_command *cmd = req->cmd;
 
@@ -214,7 +214,7 @@ out_ctrl_put:
         goto out;
 }
 
-int nvmet_parse_connect_cmd(struct nvmet_req *req)
+u16 nvmet_parse_connect_cmd(struct nvmet_req *req)
 {
         struct nvme_command *cmd = req->cmd;
 
diff --git a/drivers/nvme/target/io-cmd.c b/drivers/nvme/target/io-cmd.c
index 190b68741a6a..27623f2bfe6b 100644
--- a/drivers/nvme/target/io-cmd.c
+++ b/drivers/nvme/target/io-cmd.c
@@ -196,26 +196,19 @@ static void nvmet_execute_write_zeroes(struct nvmet_req *req)
         }
 }
 
-int nvmet_parse_io_cmd(struct nvmet_req *req)
+u16 nvmet_parse_io_cmd(struct nvmet_req *req)
 {
         struct nvme_command *cmd = req->cmd;
+        u16 ret;
 
-        if (unlikely(!(req->sq->ctrl->cc & NVME_CC_ENABLE))) {
-                pr_err("got io cmd %d while CC.EN == 0\n",
-                       cmd->common.opcode);
+        ret = nvmet_check_ctrl_status(req, cmd);
+        if (unlikely(ret)) {
                 req->ns = NULL;
-                return NVME_SC_CMD_SEQ_ERROR | NVME_SC_DNR;
-        }
-
-        if (unlikely(!(req->sq->ctrl->csts & NVME_CSTS_RDY))) {
-                pr_err("got io cmd %d while CSTS.RDY == 0\n",
-                       cmd->common.opcode);
-                req->ns = NULL;
-                return NVME_SC_CMD_SEQ_ERROR | NVME_SC_DNR;
+                return ret;
         }
 
         req->ns = nvmet_find_namespace(req->sq->ctrl, cmd->rw.nsid);
-        if (!req->ns)
+        if (unlikely(!req->ns))
                 return NVME_SC_INVALID_NS | NVME_SC_DNR;
 
         switch (cmd->common.opcode) {
@@ -237,7 +230,8 @@ int nvmet_parse_io_cmd(struct nvmet_req *req)
                 req->execute = nvmet_execute_write_zeroes;
                 return 0;
         default:
-                pr_err("unhandled cmd %d\n", cmd->common.opcode);
+                pr_err("unhandled cmd %d on qid %d\n", cmd->common.opcode,
+                       req->sq->qid);
                 return NVME_SC_INVALID_OPCODE | NVME_SC_DNR;
         }
 }
diff --git a/drivers/nvme/target/nvmet.h b/drivers/nvme/target/nvmet.h
index f7ff15f17ca9..7cb77ba5993b 100644
--- a/drivers/nvme/target/nvmet.h
+++ b/drivers/nvme/target/nvmet.h
@@ -253,11 +253,11 @@ struct nvmet_async_event {
         u8                      log_page;
 };
 
-int nvmet_parse_connect_cmd(struct nvmet_req *req);
-int nvmet_parse_io_cmd(struct nvmet_req *req);
-int nvmet_parse_admin_cmd(struct nvmet_req *req);
-int nvmet_parse_discovery_cmd(struct nvmet_req *req);
-int nvmet_parse_fabrics_cmd(struct nvmet_req *req);
+u16 nvmet_parse_connect_cmd(struct nvmet_req *req);
+u16 nvmet_parse_io_cmd(struct nvmet_req *req);
+u16 nvmet_parse_admin_cmd(struct nvmet_req *req);
+u16 nvmet_parse_discovery_cmd(struct nvmet_req *req);
+u16 nvmet_parse_fabrics_cmd(struct nvmet_req *req);
 
 bool nvmet_req_init(struct nvmet_req *req, struct nvmet_cq *cq,
                 struct nvmet_sq *sq, struct nvmet_fabrics_ops *ops);
@@ -278,6 +278,7 @@ u16 nvmet_alloc_ctrl(const char *subsysnqn, const char *hostnqn,
 u16 nvmet_ctrl_find_get(const char *subsysnqn, const char *hostnqn, u16 cntlid,
                 struct nvmet_req *req, struct nvmet_ctrl **ret);
 void nvmet_ctrl_put(struct nvmet_ctrl *ctrl);
+u16 nvmet_check_ctrl_status(struct nvmet_req *req, struct nvme_command *cmd);
 
 struct nvmet_subsys *nvmet_subsys_alloc(const char *subsysnqn,
                 enum nvme_subsys_type type);