ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme: add ADRFAM (address family) to transport ID

Browse Source 
This isn't used yet in the NVMe library, but it will be necessary later
for supporting non-IPv4 addresses.

Change-Id: I167ce63ad25b0e0c9aa192b12d764c8d078e67f9
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2016-12-12 15:05:14 -07:00
parent 9c5df2c4bf
commit 0346dd775e
4 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/nvme/identify/identify.c
View File

@ -912,6 +912,7 @@ parse_args(int argc, char **argv)
break; break;
case 'a': case 'a':
trid.trtype = SPDK_NVME_TRANSPORT_RDMA; trid.trtype = SPDK_NVME_TRANSPORT_RDMA;
trid.adrfam = SPDK_NVMF_ADRFAM_IPV4;
snprintf(trid.traddr, sizeof(trid.traddr), "%s", optarg); snprintf(trid.traddr, sizeof(trid.traddr), "%s", optarg);
break; break;
case 's': case 's':

1
examples/nvme/perf/perf.c
View File

@ -1072,6 +1072,7 @@ register_controllers(void)
return 0; return 0;
} }
trid.trtype = SPDK_NVME_TRANSPORT_RDMA; trid.trtype = SPDK_NVME_TRANSPORT_RDMA;
trid.adrfam = SPDK_NVMF_ADRFAM_IPV4;
p = (char *)p1 + 1; p = (char *)p1 + 1;
p1 = strchr(p, ':'); p1 = strchr(p, ':');

7
include/spdk/nvme.h
View File

@ -141,6 +141,13 @@ struct spdk_nvme_transport_id {
*/ */
enum spdk_nvme_transport_type trtype; enum spdk_nvme_transport_type trtype;
/**
* Address family of the transport address.
*
* For PCIe, this value is ignored.
*/
enum spdk_nvmf_adrfam adrfam;
/** /**
* Transport address of the NVMe-oF endpoint. For transports which use IP * Transport address of the NVMe-oF endpoint. For transports which use IP
* addressing (e.g. RDMA), this should be an IP address. For PCIe, this * addressing (e.g. RDMA), this should be an IP address. For PCIe, this

2
lib/nvme/nvme_rdma.c
View File

@ -1133,6 +1133,8 @@ nvme_rdma_ctrlr_scan(const struct spdk_nvme_transport_id *discovery_trid,
continue; continue;
} }
trid.adrfam = entry->adrfam;
/* Ensure that subnqn is null terminated. */ /* Ensure that subnqn is null terminated. */
end = memchr(entry->subnqn, '\0', SPDK_NVMF_NQN_MAX_LEN); end = memchr(entry->subnqn, '\0', SPDK_NVMF_NQN_MAX_LEN);
if (!end) { if (!end) {