nvme-fc: Update header and host for common definitions for LS handling

Given that both host and target now generate and receive LS's create
a single table definition for LS names. Each tranport half will have
a local version of the table.

As Create Association LS is issued by both sides, and received by
both sides, create common routines to format the LS and to validate
the LS.

Convert the host side transport to use the new common Create
Association LS formatting routine.

Signed-off-by: James Smart <jsmart2021@gmail.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
index 0ac2466030633d31e36a7c80336342790617ef35..c069ab056202b8b78d7b6f1f4adfd3be2eecbe27 100644 (file)
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
@@ -1419,29 +1419,8 @@ nvme_fc_xmt_disconnect_assoc(struct nvme_fc_ctrl *ctrl)
        else
                lsreq->private = NULL;
 
-       discon_rqst->w0.ls_cmd = FCNVME_LS_DISCONNECT_ASSOC;
-       discon_rqst->desc_list_len = cpu_to_be32(
-                               sizeof(struct fcnvme_lsdesc_assoc_id) +
-                               sizeof(struct fcnvme_lsdesc_disconn_cmd));
-
-       discon_rqst->associd.desc_tag = cpu_to_be32(FCNVME_LSDESC_ASSOC_ID);
-       discon_rqst->associd.desc_len =
-                       fcnvme_lsdesc_len(
-                               sizeof(struct fcnvme_lsdesc_assoc_id));
-
-       discon_rqst->associd.association_id = cpu_to_be64(ctrl->association_id);
-
-       discon_rqst->discon_cmd.desc_tag = cpu_to_be32(
-                                               FCNVME_LSDESC_DISCONN_CMD);
-       discon_rqst->discon_cmd.desc_len =
-                       fcnvme_lsdesc_len(
-                               sizeof(struct fcnvme_lsdesc_disconn_cmd));
-
-       lsreq->rqstaddr = discon_rqst;
-       lsreq->rqstlen = sizeof(*discon_rqst);
-       lsreq->rspaddr = discon_acc;
-       lsreq->rsplen = sizeof(*discon_acc);
-       lsreq->timeout = NVME_FC_LS_TIMEOUT_SEC;
+       nvmefc_fmt_lsreq_discon_assoc(lsreq, discon_rqst, discon_acc,
+                               ctrl->association_id);
 
        ret = nvme_fc_send_ls_req_async(ctrl->rport, lsop,
                                nvme_fc_disconnect_assoc_done);

diff --git a/drivers/nvme/host/fc.h b/drivers/nvme/host/fc.h
index 08fa88381d45eaf0a6ae7451e12b61de0a9a9cdd..05ce566f2cafea9371e1ea82fcbf5808166295ca 100644 (file)
--- a/drivers/nvme/host/fc.h
+++ b/drivers/nvme/host/fc.h
@@ -17,6 +17,7 @@
  */
 
 union nvmefc_ls_requests {
+       struct fcnvme_ls_rqst_w0                w0;
        struct fcnvme_ls_cr_assoc_rqst          rq_cr_assoc;
        struct fcnvme_ls_cr_conn_rqst           rq_cr_conn;
        struct fcnvme_ls_disconnect_assoc_rqst  rq_dis_assoc;
@@ -145,4 +146,82 @@ static char *validation_errors[] = {
        "Bad Disconnect ACC Length",
 };
 
+#define NVME_FC_LAST_LS_CMD_VALUE      FCNVME_LS_DISCONNECT_CONN
+
+static char *nvmefc_ls_names[] = {
+       "Reserved (0)",
+       "RJT (1)",
+       "ACC (2)",
+       "Create Association",
+       "Create Connection",
+       "Disconnect Association",
+       "Disconnect Connection",
+};
+
+static inline void
+nvmefc_fmt_lsreq_discon_assoc(struct nvmefc_ls_req *lsreq,
+       struct fcnvme_ls_disconnect_assoc_rqst *discon_rqst,
+       struct fcnvme_ls_disconnect_assoc_acc *discon_acc,
+       u64 association_id)
+{
+       lsreq->rqstaddr = discon_rqst;
+       lsreq->rqstlen = sizeof(*discon_rqst);
+       lsreq->rspaddr = discon_acc;
+       lsreq->rsplen = sizeof(*discon_acc);
+       lsreq->timeout = NVME_FC_LS_TIMEOUT_SEC;
+
+       discon_rqst->w0.ls_cmd = FCNVME_LS_DISCONNECT_ASSOC;
+       discon_rqst->desc_list_len = cpu_to_be32(
+                               sizeof(struct fcnvme_lsdesc_assoc_id) +
+                               sizeof(struct fcnvme_lsdesc_disconn_cmd));
+
+       discon_rqst->associd.desc_tag = cpu_to_be32(FCNVME_LSDESC_ASSOC_ID);
+       discon_rqst->associd.desc_len =
+                       fcnvme_lsdesc_len(
+                               sizeof(struct fcnvme_lsdesc_assoc_id));
+
+       discon_rqst->associd.association_id = cpu_to_be64(association_id);
+
+       discon_rqst->discon_cmd.desc_tag = cpu_to_be32(
+                                               FCNVME_LSDESC_DISCONN_CMD);
+       discon_rqst->discon_cmd.desc_len =
+                       fcnvme_lsdesc_len(
+                               sizeof(struct fcnvme_lsdesc_disconn_cmd));
+}
+
+static inline int
+nvmefc_vldt_lsreq_discon_assoc(u32 rqstlen,
+       struct fcnvme_ls_disconnect_assoc_rqst *rqst)
+{
+       int ret = 0;
+
+       if (rqstlen < sizeof(struct fcnvme_ls_disconnect_assoc_rqst))
+               ret = VERR_DISCONN_LEN;
+       else if (rqst->desc_list_len !=
+                       fcnvme_lsdesc_len(
+                               sizeof(struct fcnvme_ls_disconnect_assoc_rqst)))
+               ret = VERR_DISCONN_RQST_LEN;
+       else if (rqst->associd.desc_tag != cpu_to_be32(FCNVME_LSDESC_ASSOC_ID))
+               ret = VERR_ASSOC_ID;
+       else if (rqst->associd.desc_len !=
+                       fcnvme_lsdesc_len(
+                               sizeof(struct fcnvme_lsdesc_assoc_id)))
+               ret = VERR_ASSOC_ID_LEN;
+       else if (rqst->discon_cmd.desc_tag !=
+                       cpu_to_be32(FCNVME_LSDESC_DISCONN_CMD))
+               ret = VERR_DISCONN_CMD;
+       else if (rqst->discon_cmd.desc_len !=
+                       fcnvme_lsdesc_len(
+                               sizeof(struct fcnvme_lsdesc_disconn_cmd)))
+               ret = VERR_DISCONN_CMD_LEN;
+       /*
+        * As the standard changed on the LS, check if old format and scope
+        * something other than Association (e.g. 0).
+        */
+       else if (rqst->discon_cmd.rsvd8[0])
+               ret = VERR_DISCONN_SCOPE;
+
+       return ret;
+}
+
 #endif /* _NVME_FC_TRANSPORT_H */