]> www.infradead.org Git - users/sagi/nvme-cli.git/commitdiff
fabrics: add tcp port tsas decoding
authorSagi Grimberg <sagi@lightbitslabs.com>
Thu, 24 May 2018 11:46:01 +0000 (14:46 +0300)
committerKeith Busch <keith.busch@intel.com>
Fri, 7 Dec 2018 22:05:48 +0000 (15:05 -0700)
tcp tsas include sectype indication for unsecured/tls ports.

Signed-off-by: Sagi Grimberg <sagi@lightbitslabs.com>
fabrics.c
linux/nvme.h

index 86f6f992b14f9b8300326d2c018d62cd326e61a0..f8e03de46632f59949bc9f035ba96d0aa36c8091 100644 (file)
--- a/fabrics.c
+++ b/fabrics.c
@@ -140,6 +140,16 @@ static inline const char *treq_str(__u8 treq)
        return arg_str(treqs, ARRAY_SIZE(treqs), treq);
 }
 
+static const char * const sectypes[] = {
+       [NVMF_TCP_SECTYPE_NONE]         = "none",
+       [NVMF_TCP_SECTYPE_TLS]          = "tls",
+};
+
+static inline const char *sectype_str(__u8 sectype)
+{
+       return arg_str(sectypes, ARRAY_SIZE(sectypes), sectype);
+}
+
 static const char * const prtypes[] = {
        [NVMF_RDMA_PRTYPE_NOT_SPECIFIED]        = "not specified",
        [NVMF_RDMA_PRTYPE_IB]                   = "infiniband",
@@ -436,6 +446,10 @@ static void print_discovery_log(struct nvmf_disc_rsp_page_hdr *log, int numrec)
                        printf("rdma_pkey: 0x%04x\n",
                                e->tsas.rdma.pkey);
                        break;
+               case NVMF_TRTYPE_TCP:
+                       printf("sectype: %s\n",
+                               sectype_str(e->tsas.tcp.sectype));
+                       break;
                }
        }
 }
index 7a600c791877ec44ad87c1b8411711b90d0660b2..68000eb8c1dc42fd6d886ed748c1f651862aa6de 100644 (file)
@@ -91,6 +91,13 @@ enum {
        NVMF_RDMA_CMS_RDMA_CM   = 1, /* Sockets based endpoint addressing */
 };
 
+/* TCP port security type for  Discovery Log Page entry TSAS
+ */
+enum {
+       NVMF_TCP_SECTYPE_NONE   = 0, /* No Security */
+       NVMF_TCP_SECTYPE_TLS    = 1, /* Transport Layer Security */
+};
+
 #define NVME_AQ_DEPTH          32
 #define NVME_NR_AEN_COMMANDS   1
 #define NVME_AQ_BLK_MQ_DEPTH   (NVME_AQ_DEPTH - NVME_NR_AEN_COMMANDS)
@@ -1184,6 +1191,9 @@ struct nvmf_disc_rsp_page_entry {
                        __u16   pkey;
                        __u8    resv10[246];
                } rdma;
+               struct tcp {
+                       __u8    sectype;
+               } tcp;
        } tsas;
 };