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

nvmf: rename FabricIntf to Listen, add transport

Browse Source 
Change the Port configuration file entries to a new format:

[Port1]
  Listen <transport> <address>:<service>

Initially, this still only supports RDMA, but the new format will allow
specifying other transports once they are added.

Change-Id: Iadfd19b91db57b571064379368dbe77204ccecbb
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2016-07-14 14:23:18 -07:00 committed by Benjamin Walker
parent d6a499fec2
commit 6a1383813c
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/spdk/nvmf.conf.in
View File

@ -51,10 +51,10 @@
# NVM subsystem controller session, providing a means to distribute NVMf # NVM subsystem controller session, providing a means to distribute NVMf
# traffic across all network ports. # traffic across all network ports.
[Port1] [Port1]
FabricIntf 15.15.15.2:4420 Listen RDMA 15.15.15.2:4420
[Port2] [Port2]
FabricIntf 192.168.2.21:4420 Listen RDMA 192.168.2.21:4420
# Users must change the Host section(s) to match the IP # Users must change the Host section(s) to match the IP
# addresses of the clients that will connect to this target. # addresses of the clients that will connect to this target.

18
lib/nvmf/conf.c
View File

@ -34,6 +34,7 @@
#include <ctype.h> #include <ctype.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <strings.h>
#include <rte_config.h> #include <rte_config.h>
#include <rte_lcore.h> #include <rte_lcore.h>
@ -184,7 +185,7 @@ spdk_nvmf_parse_port(struct spdk_conf_section *sp)
{ {
struct spdk_nvmf_port *port; struct spdk_nvmf_port *port;
struct spdk_nvmf_fabric_intf *fabric_intf; struct spdk_nvmf_fabric_intf *fabric_intf;
char *listen_addr, *host, *listen_port; char *transport_name, *listen_addr, *host, *listen_port;
int i = 0, rc = 0; int i = 0, rc = 0;
/* Create the Subsystem Port */ /* Create the Subsystem Port */
@ -194,10 +195,21 @@ spdk_nvmf_parse_port(struct spdk_conf_section *sp)
return -1; return -1;
} }
/* Loop over the fabric interfaces and add them to the port */ /* Loop over the listen addresses and add them to the port */
for (i = 0; ; i++) { for (i = 0; ; i++) {
listen_addr = spdk_conf_section_get_nmval(sp, "FabricIntf", i, 0); transport_name = spdk_conf_section_get_nmval(sp, "Listen", i, 0);
if (transport_name == NULL) {
break;
}
if (strcasecmp(transport_name, "RDMA") != 0) {
SPDK_ERRLOG("Unknown transport type '%s'\n", transport_name);
return -1;
}
listen_addr = spdk_conf_section_get_nmval(sp, "Listen", i, 1);
if (listen_addr == NULL) { if (listen_addr == NULL) {
SPDK_ERRLOG("Missing address for Listen in Port%d\n", sp->num);
break; break;
} }
rc = spdk_nvmf_parse_addr(listen_addr, &host, &listen_port); rc = spdk_nvmf_parse_addr(listen_addr, &host, &listen_port);

2
test/nvmf/nvmf.conf
View File

@ -7,7 +7,7 @@
[Port1] [Port1]
Comment "Test1" Comment "Test1"
FabricIntf 192.168.100.8:4420 Listen RDMA 192.168.100.8:4420
[Host1] [Host1]
Netmask 192.168.100.0/24 Netmask 192.168.100.0/24