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

nvmf: Store subsystems in array instead of a list

Browse Source 
This helps enforce uniqueness of the subsystem id and
allows for quick lookup by that id.

Change-Id: I4d2948892839d42b8c2b2a406682848415ad2bd6
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/376251
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Ben Walker 2017-08-29 13:03:13 -07:00
parent 1f8b6f3752
commit ea134c5cbf
6 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/nvmf/ctrlr_discovery.c
View File

@ -56,6 +56,7 @@ nvmf_update_discovery_log(struct spdk_nvmf_tgt *tgt)
struct spdk_nvmf_discovery_log_page_entry *entry; struct spdk_nvmf_discovery_log_page_entry *entry;
struct spdk_nvmf_discovery_log_page *disc_log; struct spdk_nvmf_discovery_log_page *disc_log;
size_t cur_size; size_t cur_size;
uint32_t sid;
SPDK_DEBUGLOG(SPDK_TRACE_NVMF, "Generating log page for genctr %" PRIu64 "\n", SPDK_DEBUGLOG(SPDK_TRACE_NVMF, "Generating log page for genctr %" PRIu64 "\n",
tgt->discovery_genctr); tgt->discovery_genctr);
@ -67,7 +68,12 @@ nvmf_update_discovery_log(struct spdk_nvmf_tgt *tgt)
return; return;
} }
TAILQ_FOREACH(subsystem, &tgt->subsystems, entries) { for (sid = 0; sid < tgt->max_sid; sid++) {
subsystem = tgt->subsystems[sid];
if (subsystem == NULL) {
continue;
}
if (subsystem->subtype == SPDK_NVMF_SUBTYPE_DISCOVERY) { if (subsystem->subtype == SPDK_NVMF_SUBTYPE_DISCOVERY) {
continue; continue;
} }

16
lib/nvmf/nvmf.c
View File

@ -87,7 +87,8 @@ spdk_nvmf_tgt_create(struct spdk_nvmf_tgt_opts *opts)
tgt->discovery_genctr = 0; tgt->discovery_genctr = 0;
tgt->discovery_log_page = NULL; tgt->discovery_log_page = NULL;
tgt->discovery_log_page_size = 0; tgt->discovery_log_page_size = 0;
TAILQ_INIT(&tgt->subsystems); tgt->subsystems = NULL;
tgt->max_sid = 0;
TAILQ_INIT(&tgt->transports); TAILQ_INIT(&tgt->transports);
SPDK_DEBUGLOG(SPDK_TRACE_NVMF, "Max Queue Pairs Per Controller: %d\n", SPDK_DEBUGLOG(SPDK_TRACE_NVMF, "Max Queue Pairs Per Controller: %d\n",
@ -113,6 +114,11 @@ spdk_nvmf_tgt_destroy(struct spdk_nvmf_tgt *tgt)
if (tgt->discovery_log_page) { if (tgt->discovery_log_page) {
free(tgt->discovery_log_page); free(tgt->discovery_log_page);
} }
if (tgt->subsystems) {
free(tgt->subsystems);
}
free(tgt); free(tgt);
} }
@ -149,12 +155,18 @@ struct spdk_nvmf_subsystem *
spdk_nvmf_tgt_find_subsystem(struct spdk_nvmf_tgt *tgt, const char *subnqn) spdk_nvmf_tgt_find_subsystem(struct spdk_nvmf_tgt *tgt, const char *subnqn)
{ {
struct spdk_nvmf_subsystem *subsystem; struct spdk_nvmf_subsystem *subsystem;
uint32_t sid;
if (!subnqn) { if (!subnqn) {
return NULL; return NULL;
} }
TAILQ_FOREACH(subsystem, &tgt->subsystems, entries) { for (sid = 0; sid < tgt->max_sid; sid++) {
subsystem = tgt->subsystems[sid];
if (subsystem == NULL) {
continue;
}
if (strcmp(subnqn, subsystem->subnqn) == 0) { if (strcmp(subnqn, subsystem->subnqn) == 0) {
return subsystem; return subsystem;
} }

7
lib/nvmf/nvmf_internal.h
View File

@ -51,7 +51,11 @@ struct spdk_nvmf_tgt {
struct spdk_thread *master_thread; struct spdk_thread *master_thread;
uint64_t discovery_genctr; uint64_t discovery_genctr;
TAILQ_HEAD(, spdk_nvmf_subsystem) subsystems;
/* Array of subsystem pointers of size max_sid indexed by sid */
struct spdk_nvmf_subsystem **subsystems;
uint32_t max_sid;
struct spdk_nvmf_discovery_log_page *discovery_log_page; struct spdk_nvmf_discovery_log_page *discovery_log_page;
size_t discovery_log_page_size; size_t discovery_log_page_size;
TAILQ_HEAD(, spdk_nvmf_transport) transports; TAILQ_HEAD(, spdk_nvmf_transport) transports;
@ -171,6 +175,7 @@ struct spdk_nvmf_ctrlr {
}; };
struct spdk_nvmf_subsystem { struct spdk_nvmf_subsystem {
uint32_t id;
char subnqn[SPDK_NVMF_NQN_MAX_LEN + 1]; char subnqn[SPDK_NVMF_NQN_MAX_LEN + 1];
enum spdk_nvmf_subtype subtype; enum spdk_nvmf_subtype subtype;
uint16_t next_cntlid; uint16_t next_cntlid;

24
lib/nvmf/subsystem.c
View File

@ -94,6 +94,7 @@ spdk_nvmf_create_subsystem(struct spdk_nvmf_tgt *tgt,
uint32_t num_ns) uint32_t num_ns)
{ {
struct spdk_nvmf_subsystem *subsystem; struct spdk_nvmf_subsystem *subsystem;
uint32_t sid;
if (!spdk_nvmf_valid_nqn(nqn)) { if (!spdk_nvmf_valid_nqn(nqn)) {
return NULL; return NULL;
@ -104,12 +105,31 @@ spdk_nvmf_create_subsystem(struct spdk_nvmf_tgt *tgt,
return NULL; return NULL;
} }
/* Find a free subsystem id (sid) */
for (sid = 0; sid < tgt->max_sid; sid++) {
if (tgt->subsystems[sid] == NULL) {
break;
}
}
if (sid == tgt->max_sid) {
struct spdk_nvmf_subsystem **subsys_array;
/* No free slots. Add more. */
tgt->max_sid++;
subsys_array = realloc(tgt->subsystems, tgt->max_sid * sizeof(struct spdk_nvmf_subsystem *));
if (!subsys_array) {
tgt->max_sid--;
return NULL;
}
tgt->subsystems = subsys_array;
}
subsystem = calloc(1, sizeof(struct spdk_nvmf_subsystem)); subsystem = calloc(1, sizeof(struct spdk_nvmf_subsystem));
if (subsystem == NULL) { if (subsystem == NULL) {
return NULL; return NULL;
} }
subsystem->tgt = tgt; subsystem->tgt = tgt;
subsystem->id = sid;
subsystem->subtype = type; subsystem->subtype = type;
subsystem->max_nsid = num_ns; subsystem->max_nsid = num_ns;
subsystem->num_allocated_nsid = 0; subsystem->num_allocated_nsid = 0;
@ -128,7 +148,7 @@ spdk_nvmf_create_subsystem(struct spdk_nvmf_tgt *tgt,
} }
} }
TAILQ_INSERT_TAIL(&tgt->subsystems, subsystem, entries); tgt->subsystems[sid] = subsystem;
tgt->discovery_genctr++; tgt->discovery_genctr++;
return subsystem; return subsystem;
@ -166,7 +186,7 @@ spdk_nvmf_delete_subsystem(struct spdk_nvmf_subsystem *subsystem)
free(subsystem->ns); free(subsystem->ns);
TAILQ_REMOVE(&subsystem->tgt->subsystems, subsystem, entries); subsystem->tgt->subsystems[subsystem->id] = NULL;
subsystem->tgt->discovery_genctr++; subsystem->tgt->discovery_genctr++;
free(subsystem); free(subsystem);

3
test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c
View File

@ -164,8 +164,6 @@ test_discovery_log(void)
struct spdk_nvmf_discovery_log_page_entry *entry; struct spdk_nvmf_discovery_log_page_entry *entry;
struct spdk_nvme_transport_id trid = {}; struct spdk_nvme_transport_id trid = {};
TAILQ_INIT(&tgt.subsystems);
/* Add one subsystem and verify that the discovery log contains it */ /* Add one subsystem and verify that the discovery log contains it */
subsystem = spdk_nvmf_create_subsystem(&tgt, "nqn.2016-06.io.spdk:subsystem1", subsystem = spdk_nvmf_create_subsystem(&tgt, "nqn.2016-06.io.spdk:subsystem1",
SPDK_NVMF_SUBTYPE_NVME, 0); SPDK_NVMF_SUBTYPE_NVME, 0);
@ -217,6 +215,7 @@ test_discovery_log(void)
sizeof(*entry)); sizeof(*entry));
CU_ASSERT(entry->trtype == 42); CU_ASSERT(entry->trtype == 42);
spdk_nvmf_delete_subsystem(subsystem); spdk_nvmf_delete_subsystem(subsystem);
free(tgt.subsystems);
free(tgt.discovery_log_page); free(tgt.discovery_log_page);
} }

3
test/unit/lib/nvmf/subsystem.c/subsystem_ut.c
View File

@ -203,7 +203,6 @@ nvmf_test_create_subsystem(void)
struct spdk_nvmf_tgt tgt = {}; struct spdk_nvmf_tgt tgt = {};
char nqn[256]; char nqn[256];
struct spdk_nvmf_subsystem *subsystem; struct spdk_nvmf_subsystem *subsystem;
TAILQ_INIT(&tgt.subsystems);
strncpy(nqn, "nqn.2016-06.io.spdk:subsystem1", sizeof(nqn)); strncpy(nqn, "nqn.2016-06.io.spdk:subsystem1", sizeof(nqn));
subsystem = spdk_nvmf_create_subsystem(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0); subsystem = spdk_nvmf_create_subsystem(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0);
@ -228,6 +227,8 @@ nvmf_test_create_subsystem(void)
CU_ASSERT(strlen(nqn) == 224); CU_ASSERT(strlen(nqn) == 224);
subsystem = spdk_nvmf_create_subsystem(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0); subsystem = spdk_nvmf_create_subsystem(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0);
CU_ASSERT(subsystem == NULL); CU_ASSERT(subsystem == NULL);
free(tgt.subsystems);
} }
int main(int argc, char **argv) int main(int argc, char **argv)