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

nvmf: Rename spdk_nvmf_init_grp to spdk_nvmf_host

Browse Source 
Host is the term used in the specification.

Change-Id: Ie9a06e3ff176e00e2fdcdc5bede701fe768d4b35
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Ben Walker 2016-06-08 15:48:02 -07:00
parent e1d1040703
commit 6eb1bee64b
7 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/nvmf/conf.c
View File

@ -267,7 +267,7 @@ spdk_nvmf_parse_init_grp(struct spdk_conf_section *sp)
const char *mask; const char *mask;
char **netmasks; char **netmasks;
int num_netmasks; int num_netmasks;
struct spdk_nvmf_init_grp *init_grp; struct spdk_nvmf_host *host;
for (num_netmasks = 0; ; num_netmasks++) { for (num_netmasks = 0; ; num_netmasks++) {
@ -296,9 +296,9 @@ spdk_nvmf_parse_init_grp(struct spdk_conf_section *sp)
} }
} }
init_grp = spdk_nvmf_init_grp_create(sp->num, num_netmasks, netmasks); host = spdk_nvmf_init_grp_create(sp->num, num_netmasks, netmasks);
if (!init_grp) { if (!host) {
free(netmasks); free(netmasks);
return -1; return -1;
} }

78
lib/nvmf/init_grp.c
View File

@ -49,15 +49,15 @@
#define MAX_INITIATOR_NAME 256 #define MAX_INITIATOR_NAME 256
#define MAX_NETMASK 256 #define MAX_NETMASK 256
static TAILQ_HEAD(, spdk_nvmf_init_grp) g_ig_head = TAILQ_HEAD_INITIALIZER(g_ig_head); static TAILQ_HEAD(, spdk_nvmf_host) g_host_head = TAILQ_HEAD_INITIALIZER(g_host_head);
struct spdk_nvmf_init_grp * struct spdk_nvmf_host *
spdk_nvmf_init_grp_create(int tag, spdk_nvmf_init_grp_create(int tag,
int num_netmasks, int num_netmasks,
char **netmasks) char **netmasks)
{ {
int i; int i;
struct spdk_nvmf_init_grp *ig = NULL; struct spdk_nvmf_host *host = NULL;
/* Make sure there are no duplicate initiator group tags */ /* Make sure there are no duplicate initiator group tags */
if (nvmf_initiator_group_find_by_tag(tag)) { if (nvmf_initiator_group_find_by_tag(tag)) {
@ -75,46 +75,46 @@ spdk_nvmf_init_grp_create(int tag,
"add initiator group (from initiator list) tag=%d, #masks=%d\n", "add initiator group (from initiator list) tag=%d, #masks=%d\n",
tag, num_netmasks); tag, num_netmasks);
ig = calloc(1, sizeof(*ig)); host = calloc(1, sizeof(*host));
if (!ig) { if (!host) {
SPDK_ERRLOG("initiator group malloc error (%d)\n", tag); SPDK_ERRLOG("Unable to allocate host (%d)\n", tag);
return NULL; return NULL;
} }
ig->tag = tag; host->tag = tag;
ig->nnetmasks = num_netmasks; host->nnetmasks = num_netmasks;
ig->netmasks = netmasks; host->netmasks = netmasks;
for (i = 0; i < num_netmasks; i++) { for (i = 0; i < num_netmasks; i++) {
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "Netmask %s\n", ig->netmasks[i]); SPDK_TRACELOG(SPDK_TRACE_DEBUG, "Netmask %s\n", host->netmasks[i]);
} }
ig->state = GROUP_INIT; host->state = GROUP_INIT;
pthread_mutex_lock(&g_nvmf_tgt.mutex); pthread_mutex_lock(&g_nvmf_tgt.mutex);
ig->state = GROUP_READY; host->state = GROUP_READY;
TAILQ_INSERT_TAIL(&g_ig_head, ig, tailq); TAILQ_INSERT_TAIL(&g_host_head, host, tailq);
pthread_mutex_unlock(&g_nvmf_tgt.mutex); pthread_mutex_unlock(&g_nvmf_tgt.mutex);
return ig; return host;
} }
static void static void
nvmf_initiator_group_destroy(struct spdk_nvmf_init_grp *ig) nvmf_initiator_group_destroy(struct spdk_nvmf_host *host)
{ {
#if 0 // TODO: fix bogus scan-build warning about use-after-free #if 0 // TODO: fix bogus scan-build warning about use-after-free
int i; int i;
if (!ig) { if (!host) {
return; return;
} }
for (i = 0; i < ig->nnetmasks; i++) { for (i = 0; i < host->nnetmasks; i++) {
free(ig->netmasks[i]); free(host->netmasks[i]);
} }
free(ig->netmasks); free(host->netmasks);
free(ig); free(host);
#endif #endif
} }
@ -239,25 +239,25 @@ spdk_nvmf_allow_netmask(const char *netmask, const char *addr)
return 0; return 0;
} }
struct spdk_nvmf_init_grp * struct spdk_nvmf_host *
nvmf_initiator_group_find_by_addr(char *addr) nvmf_initiator_group_find_by_addr(char *addr)
{ {
struct spdk_nvmf_init_grp *ig; struct spdk_nvmf_host *host;
int i; int i;
int rc; int rc;
if (addr == NULL) if (addr == NULL)
return NULL; return NULL;
TAILQ_FOREACH(ig, &g_ig_head, tailq) { TAILQ_FOREACH(host, &g_host_head, tailq) {
/* check netmask of each group looking for permission */ /* check netmask of each group looking for permission */
for (i = 0; i < ig->nnetmasks; i++) { for (i = 0; i < host->nnetmasks; i++) {
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "netmask=%s, addr=%s\n", SPDK_TRACELOG(SPDK_TRACE_DEBUG, "netmask=%s, addr=%s\n",
ig->netmasks[i], addr); host->netmasks[i], addr);
rc = spdk_nvmf_allow_netmask(ig->netmasks[i], addr); rc = spdk_nvmf_allow_netmask(host->netmasks[i], addr);
if (rc > 0) { if (rc > 0) {
/* OK netmask */ /* OK netmask */
return ig; return host;
} }
} }
} }
@ -267,15 +267,15 @@ nvmf_initiator_group_find_by_addr(char *addr)
return NULL; return NULL;
} }
struct spdk_nvmf_init_grp * struct spdk_nvmf_host *
nvmf_initiator_group_find_by_tag(int tag) nvmf_initiator_group_find_by_tag(int tag)
{ {
struct spdk_nvmf_init_grp *ig; struct spdk_nvmf_host *host;
TAILQ_FOREACH(ig, &g_ig_head, tailq) { TAILQ_FOREACH(host, &g_host_head, tailq) {
if (ig->tag == tag) { if (host->tag == tag) {
SPDK_TRACELOG(SPDK_TRACE_DEBUG, " found initiator group with tag: ig %p\n", ig); SPDK_TRACELOG(SPDK_TRACE_DEBUG, " found initiator group with tag: host %p\n", host);
return ig; return host;
} }
} }
@ -285,15 +285,15 @@ nvmf_initiator_group_find_by_tag(int tag)
void void
nvmf_initiator_group_array_destroy(void) nvmf_initiator_group_array_destroy(void)
{ {
struct spdk_nvmf_init_grp *ig; struct spdk_nvmf_host *host;
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "Enter\n"); SPDK_TRACELOG(SPDK_TRACE_DEBUG, "Enter\n");
pthread_mutex_lock(&g_nvmf_tgt.mutex); pthread_mutex_lock(&g_nvmf_tgt.mutex);
while (!TAILQ_EMPTY(&g_ig_head)) { while (!TAILQ_EMPTY(&g_host_head)) {
ig = TAILQ_FIRST(&g_ig_head); host = TAILQ_FIRST(&g_host_head);
ig->state = GROUP_DESTROY; host->state = GROUP_DESTROY;
TAILQ_REMOVE(&g_ig_head, ig, tailq); TAILQ_REMOVE(&g_host_head, host, tailq);
nvmf_initiator_group_destroy(ig); nvmf_initiator_group_destroy(host);
} }
pthread_mutex_unlock(&g_nvmf_tgt.mutex); pthread_mutex_unlock(&g_nvmf_tgt.mutex);
} }

10
lib/nvmf/init_grp.h
View File

@ -37,25 +37,25 @@
#include "spdk/queue.h" #include "spdk/queue.h"
#include "port.h" // For enum group_state #include "port.h" // For enum group_state
struct spdk_nvmf_init_grp { struct spdk_nvmf_host {
int nnetmasks; int nnetmasks;
char **netmasks; char **netmasks;
int ref; int ref;
int tag; int tag;
enum group_state state; enum group_state state;
TAILQ_ENTRY(spdk_nvmf_init_grp) tailq; TAILQ_ENTRY(spdk_nvmf_host) tailq;
}; };
/* NVMf Initiator Group management API */ /* NVMf Initiator Group management API */
struct spdk_nvmf_init_grp * struct spdk_nvmf_host *
spdk_nvmf_init_grp_create(int tag, spdk_nvmf_init_grp_create(int tag,
int num_netmasks, int num_netmasks,
char **netmasks); char **netmasks);
struct spdk_nvmf_init_grp * struct spdk_nvmf_host *
nvmf_initiator_group_find_by_tag(int tag); nvmf_initiator_group_find_by_tag(int tag);
struct spdk_nvmf_init_grp * struct spdk_nvmf_host *
nvmf_initiator_group_find_by_addr(char *addr); nvmf_initiator_group_find_by_addr(char *addr);
void void

8
lib/nvmf/rdma.c
View File

@ -406,7 +406,7 @@ nvmf_post_rdma_recv(struct spdk_nvmf_conn *conn,
static int static int
nvmf_rdma_cm_connect(struct rdma_cm_event *event) nvmf_rdma_cm_connect(struct rdma_cm_event *event)
{ {
struct spdk_nvmf_init_grp *ig; struct spdk_nvmf_host *host;
struct spdk_nvmf_fabric_intf *fabric_intf; struct spdk_nvmf_fabric_intf *fabric_intf;
struct rdma_cm_id *conn_id; struct rdma_cm_id *conn_id;
struct spdk_nvmf_conn *conn; struct spdk_nvmf_conn *conn;
@ -453,12 +453,12 @@ nvmf_rdma_cm_connect(struct rdma_cm_event *event)
SPDK_TRACELOG(SPDK_TRACE_RDMA, "Connect Route: peer addr %s\n", SPDK_TRACELOG(SPDK_TRACE_RDMA, "Connect Route: peer addr %s\n",
addr_str); addr_str);
ig = nvmf_initiator_group_find_by_addr(addr_str); host = nvmf_initiator_group_find_by_addr(addr_str);
if (ig == NULL) { if (host == NULL) {
SPDK_ERRLOG("connect request: remote host addr not provisioned!\n"); SPDK_ERRLOG("connect request: remote host addr not provisioned!\n");
goto err1; goto err1;
} }
SPDK_TRACELOG(SPDK_TRACE_RDMA, "Found approved remote host initiator group %p\n", ig); SPDK_TRACELOG(SPDK_TRACE_RDMA, "Found approved remote host %p\n", host);
/* Init the NVMf rdma transport connection */ /* Init the NVMf rdma transport connection */
conn = spdk_nvmf_allocate_conn(); conn = spdk_nvmf_allocate_conn();

24
lib/nvmf/subsystem_grp.c
View File

@ -218,7 +218,7 @@ spdk_nvmf_subsystem_destruct(struct spdk_nvmf_subsystem_grp *ss_group)
free(ss_group->name); free(ss_group->name);
for (i = 0; i < ss_group->map_count; i++) { for (i = 0; i < ss_group->map_count; i++) {
ss_group->map[i].ig->ref--; ss_group->map[i].host->ref--;
} }
/* Call NVMf library to free the subsystem */ /* Call NVMf library to free the subsystem */
@ -229,11 +229,11 @@ spdk_nvmf_subsystem_destruct(struct spdk_nvmf_subsystem_grp *ss_group)
static int static int
spdk_nvmf_subsystem_add_map(struct spdk_nvmf_subsystem_grp *ss_group, spdk_nvmf_subsystem_add_map(struct spdk_nvmf_subsystem_grp *ss_group,
int port_tag, int ig_tag) int port_tag, int host_tag)
{ {
struct spdk_nvmf_access_map *map; struct spdk_nvmf_access_map *map;
struct spdk_nvmf_port *port; struct spdk_nvmf_port *port;
struct spdk_nvmf_init_grp *ig; struct spdk_nvmf_host *host;
port = spdk_nvmf_port_find_by_tag(port_tag); port = spdk_nvmf_port_find_by_tag(port_tag);
if (port == NULL) { if (port == NULL) {
@ -244,19 +244,19 @@ spdk_nvmf_subsystem_add_map(struct spdk_nvmf_subsystem_grp *ss_group,
SPDK_ERRLOG("%s: Port%d not active\n", ss_group->name, port_tag); SPDK_ERRLOG("%s: Port%d not active\n", ss_group->name, port_tag);
return -1; return -1;
} }
ig = nvmf_initiator_group_find_by_tag(ig_tag); host = nvmf_initiator_group_find_by_tag(host_tag);
if (ig == NULL) { if (host == NULL) {
SPDK_ERRLOG("%s: Host%d not found\n", ss_group->name, ig_tag); SPDK_ERRLOG("%s: Host%d not found\n", ss_group->name, host_tag);
return -1; return -1;
} }
if (ig->state != GROUP_READY) { if (host->state != GROUP_READY) {
SPDK_ERRLOG("%s: Host%d not active\n", ss_group->name, ig_tag); SPDK_ERRLOG("%s: Host%d not active\n", ss_group->name, host_tag);
return -1; return -1;
} }
ig->ref++; host->ref++;
map = &ss_group->map[ss_group->map_count]; map = &ss_group->map[ss_group->map_count];
map->port = port; map->port = port;
map->ig = ig; map->host = host;
ss_group->map_count++; ss_group->map_count++;
return 0; return 0;

4
lib/nvmf/subsystem_grp.h
View File

@ -67,8 +67,8 @@ struct spdk_nvmf_subsystem {
}; };
struct spdk_nvmf_access_map { struct spdk_nvmf_access_map {
struct spdk_nvmf_port *port; struct spdk_nvmf_port *port;
struct spdk_nvmf_init_grp *ig; struct spdk_nvmf_host *host;
}; };
struct spdk_nvmf_subsystem_grp { struct spdk_nvmf_subsystem_grp {

2
test/lib/nvmf/nvmf_c/nvmf_ut.c
View File

@ -111,7 +111,7 @@ void spdk_nvmf_port_destroy_all(void)
{ {
} }
struct spdk_nvmf_init_grp *nvmf_initiator_group_find_by_tag(int tag) struct spdk_nvmf_host *nvmf_initiator_group_find_by_tag(int tag)
{ {
return NULL; return NULL;
} }