nvmet: align addrfam list to spec

With reference to the NVMeOF Specification (page 44, Figure 38)
discovery log page entry provides address family field. We do set the
transport type field but the adrfam field is not set when using loop
transport and also it doesn't have support in the nvme-cli. So when
reading discovery log page with a loop transport it leads to confusing
output.

As per the spec for adrfam value 254 is reserved for Intra Host
Transport i.e. loopback), we add a required macro in the protocol
header file, set default port disc addr entry's adrfam to
NVMF_ADDR_FAMILY_MAX, and update nvmet_addr_family configfs array for
show/store attribute.

Without this patch, setting adrfam to (ipv4/ipv6/ib/fc/loop/" ") we get
following output for nvme discover command from nvme-cli which is
confusing.
trtype:  loop
adrfam:  ipv4
trtype:  loop
adrfam:  ipv6
trtype:  loop
adrfam:  infiniband
trtype:  loop
adrfam:  fibre-channel
trtype:  loop		# ${CFGFS_HOME}/nvmet/ports/1/addr_adrfam = loop
adrfam:  pci            # <----- pci for loop
trtype:  loop		# ${CFGFS_HOME}/nvmet/ports/1/addr_adrfam = " "
adrfam:  pci            # <----- pci for unrecognized

This patch fixes above output :-
trtype:  loop
adrfam:  ipv4
trtype:  loop
adrfam:  ipv6
trtype:  loop
adrfam:  infiniband
trtype:  loop
adrfam:  fibre-channel
trtype:  loop           # ${CFGFS_HOME}/nvmet/ports/1/addr_adrfam = loop
adrfam:  loop           # <----- loop for loop
trtype:  loop		# ${CFGFS_HOME}/config/nvmet/ports/adrfam = " "
adrfam:  unrecognized   # <----- unrecognized when invalid value

Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/nvme/target/configfs.c b/drivers/nvme/target/configfs.c
index 20779587eefe94569b05f536b26f2824688cf117..ae8fb4489a10d3effd2535f2ce3d4ec16ac83427 100644 (file)
--- a/drivers/nvme/target/configfs.c
+++ b/drivers/nvme/target/configfs.c
@@ -33,11 +33,12 @@ static struct nvmet_type_name_map nvmet_transport[] = {
 };
 
 static const struct nvmet_type_name_map nvmet_addr_family[] = {
-       { NVMF_ADDR_FAMILY_PCI, "pcie" },
-       { NVMF_ADDR_FAMILY_IP4, "ipv4" },
-       { NVMF_ADDR_FAMILY_IP6, "ipv6" },
-       { NVMF_ADDR_FAMILY_IB,  "ib" },
-       { NVMF_ADDR_FAMILY_FC,  "fc" },
+       { NVMF_ADDR_FAMILY_PCI,         "pcie" },
+       { NVMF_ADDR_FAMILY_IP4,         "ipv4" },
+       { NVMF_ADDR_FAMILY_IP6,         "ipv6" },
+       { NVMF_ADDR_FAMILY_IB,          "ib" },
+       { NVMF_ADDR_FAMILY_FC,          "fc" },
+       { NVMF_ADDR_FAMILY_LOOP,        "loop" },
 };
 
 static bool nvmet_is_port_enabled(struct nvmet_port *p, const char *caller)
@@ -83,7 +84,7 @@ static ssize_t nvmet_addr_adrfam_store(struct config_item *item,
        return -EINVAL;
 
 found:
-       port->disc_addr.adrfam = i;
+       port->disc_addr.adrfam = nvmet_addr_family[i].type;
        return count;
 }
 
@@ -1338,6 +1339,7 @@ static struct config_group *nvmet_ports_make(struct config_group *group,
        port->inline_data_size = -1;    /* < 0 == let the transport choose */
 
        port->disc_addr.portid = cpu_to_le16(portid);
+       port->disc_addr.adrfam = NVMF_ADDR_FAMILY_MAX;
        port->disc_addr.treq = NVMF_TREQ_DISABLE_SQFLOW;
        config_group_init_type_name(&port->group, name, &nvmet_port_type);
 

diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index 3d5189f46cb162faa991605383c5fec636781ab8..2d978d0cbde68f7c5948b62c50b861af3042db48 100644 (file)
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -38,6 +38,8 @@ enum {
        NVMF_ADDR_FAMILY_IP6    = 2,    /* IP6 */
        NVMF_ADDR_FAMILY_IB     = 3,    /* InfiniBand */
        NVMF_ADDR_FAMILY_FC     = 4,    /* Fibre Channel */
+       NVMF_ADDR_FAMILY_LOOP   = 254,  /* Reserved for host usage */
+       NVMF_ADDR_FAMILY_MAX,
 };
 
 /* Transport Type codes for Discovery Log Page entry TRTYPE field */