Commit cf199a3f authored by Ben Walker's avatar Ben Walker
Browse files

nvmf: Move map from subsystem group to subsystem 



Change-Id: I8961f0a3f93a2c088819d207bf70c64147a68533
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
parent b531f591

lib/nvmf/subsystem.c

+23 −25
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ nvmf_create_subsystem(int num, char *name, enum spdk_nvmf_subsystem_types sub_ty 
		return NULL;

	}



	memset(subsystem, 0, sizeof(struct spdk_nvmf_subsystem));

	SPDK_TRACELOG(SPDK_TRACE_NVMF, "nvmf_create_subsystem: allocated subsystem %p\n", subsystem);



	subsystem->num = num;
@@ -94,12 +93,18 @@ nvmf_create_subsystem(int num, char *name, enum spdk_nvmf_subsystem_types sub_ty 
int

nvmf_delete_subsystem(struct spdk_nvmf_subsystem *subsystem)

{

	int i;



	if (subsystem == NULL) {

		SPDK_TRACELOG(SPDK_TRACE_NVMF,

			      "nvmf_delete_subsystem: there is no subsystem\n");

		return 0;

	}



	for (i = 0; i < subsystem->map_count; i++) {

		subsystem->map[i].host->ref--;

	}



	if (subsystem->session) {

		spdk_nvmf_session_destruct(subsystem->session);

	}
@@ -159,16 +164,10 @@ spdk_check_nvmf_name(const char *name) 
static void

spdk_nvmf_subsystem_destruct(struct spdk_nvmf_subsystem_grp *ss_group)

{

	int i;



	if (ss_group == NULL) {

		return;

	}



	for (i = 0; i < ss_group->map_count; i++) {

		ss_group->map[i].host->ref--;

	}



	/* Call NVMf library to free the subsystem */

	nvmf_delete_subsystem(ss_group->subsystem);
@@ -176,7 +175,7 @@ spdk_nvmf_subsystem_destruct(struct spdk_nvmf_subsystem_grp *ss_group) 
}



static int

spdk_nvmf_subsystem_add_map(struct spdk_nvmf_subsystem_grp *ss_group,

spdk_nvmf_subsystem_add_map(struct spdk_nvmf_subsystem *subsystem,

			    int port_tag, int host_tag)

{

	struct spdk_nvmf_access_map	*map;
@@ -185,27 +184,27 @@ spdk_nvmf_subsystem_add_map(struct spdk_nvmf_subsystem_grp *ss_group, 


	port = spdk_nvmf_port_find_by_tag(port_tag);

	if (port == NULL) {

		SPDK_ERRLOG("%s: Port%d not found\n", ss_group->subsystem->subnqn, port_tag);

		SPDK_ERRLOG("%s: Port%d not found\n", subsystem->subnqn, port_tag);

		return -1;

	}

	if (port->state != GROUP_READY) {

		SPDK_ERRLOG("%s: Port%d not active\n", ss_group->subsystem->subnqn, port_tag);

		SPDK_ERRLOG("%s: Port%d not active\n", subsystem->subnqn, port_tag);

		return -1;

	}

	host = spdk_nvmf_host_find_by_tag(host_tag);

	if (host == NULL) {

		SPDK_ERRLOG("%s: Host%d not found\n", ss_group->subsystem->subnqn, host_tag);

		SPDK_ERRLOG("%s: Host%d not found\n", subsystem->subnqn, host_tag);

		return -1;

	}

	if (host->state != GROUP_READY) {

		SPDK_ERRLOG("%s: Host%d not active\n", ss_group->subsystem->subnqn, host_tag);

		SPDK_ERRLOG("%s: Host%d not active\n", subsystem->subnqn, host_tag);

		return -1;

	}

	host->ref++;

	map = &ss_group->map[ss_group->map_count];

	map = &subsystem->map[subsystem->map_count];

	map->port = port;

	map->host = host;

	ss_group->map_count++;

	subsystem->map_count++;



	return 0;

}
@@ -246,6 +245,13 @@ spdk_cf_add_nvmf_subsystem(struct spdk_conf_section *sp) 


	printf("    NVMf Subsystem: Name: %s\n", nqn);



	/* register this subsystem with the NVMf library */

	ss_group->subsystem = nvmf_create_subsystem(ss_group->num, nqn, SPDK_NVMF_SUB_NVME);

	if (ss_group->subsystem == NULL) {

		SPDK_ERRLOG("Failed creating new nvmf library subsystem\n");

		goto err0;

	}



	/* Setup initiator and port access mapping */

	val = spdk_conf_section_get_val(sp, "Mapping");

	if (val == NULL) {
@@ -254,7 +260,6 @@ spdk_cf_add_nvmf_subsystem(struct spdk_conf_section *sp) 
		goto err0;

	}



	ss_group->map_count = 0;

	for (i = 0; i < MAX_PER_SUBSYSTEM_ACCESS_MAP; i++) {

		val = spdk_conf_section_get_nmval(sp, "Mapping", i, 0);

		if (val == NULL)
@@ -282,20 +287,13 @@ spdk_cf_add_nvmf_subsystem(struct spdk_conf_section *sp) 
			goto err0;

		}



		ret = spdk_nvmf_subsystem_add_map(ss_group, port_tag_i, ig_tag_i);

		ret = spdk_nvmf_subsystem_add_map(ss_group->subsystem, port_tag_i, ig_tag_i);

		if (ret < 0) {

			SPDK_ERRLOG("could not init access map within subsystem group\n");

			goto err0;

		}

	}



	/* register this subsystem with the NVMf library */

	ss_group->subsystem = nvmf_create_subsystem(ss_group->num, nqn, SPDK_NVMF_SUB_NVME);

	if (ss_group->subsystem == NULL) {

		SPDK_ERRLOG("Failed creating new nvmf library subsystem\n");

		goto err0;

	}



	val = spdk_conf_section_get_val(sp, "Controller");

	if (val == NULL) {

		SPDK_ERRLOG("Subsystem %d: missing Controller\n", ss_group->num);
@@ -376,8 +374,8 @@ spdk_format_discovery_log(struct spdk_nvmf_discovery_log_page *disc_log, uint32_ 
		if (subsystem->subtype == SPDK_NVMF_SUB_DISCOVERY)

			continue;



		for (i = 0; i < ss_group->map_count; i++) {

			map = &ss_group->map[i];

		for (i = 0; i < subsystem->map_count; i++) {

			map = &subsystem->map[i];

			port = map->port;

			if (port != NULL) {

				TAILQ_FOREACH(fabric_intf, &port->head, tailq) {

lib/nvmf/subsystem.h

+8 −7
Original line number Diff line number Diff line
@@ -42,6 +42,11 @@ struct spdk_nvmf_conn; 
#define MAX_PER_SUBSYSTEM_ACCESS_MAP 2

#define MAX_NQN_SIZE 255



struct spdk_nvmf_access_map {

	struct spdk_nvmf_port	*port;

	struct spdk_nvmf_host	*host;

};



/*

 * The NVMf subsystem, as indicated in the specification, is a collection

 * of virtual controller sessions.  Any individual controller session has
@@ -55,19 +60,15 @@ struct spdk_nvmf_subsystem { 
	struct spdk_nvme_ctrlr *ctrlr;

	struct spdk_nvme_qpair *io_qpair;



	TAILQ_ENTRY(spdk_nvmf_subsystem) entries;

};

	int map_count;

	struct spdk_nvmf_access_map map[MAX_PER_SUBSYSTEM_ACCESS_MAP];



struct spdk_nvmf_access_map {

	struct spdk_nvmf_port	*port;

	struct spdk_nvmf_host	*host;

	TAILQ_ENTRY(spdk_nvmf_subsystem) entries;

};



struct spdk_nvmf_subsystem_grp {

	int num;

	struct spdk_nvmf_subsystem *subsystem;

	int map_count;

	struct spdk_nvmf_access_map map[MAX_PER_SUBSYSTEM_ACCESS_MAP];

	TAILQ_ENTRY(spdk_nvmf_subsystem_grp)	tailq;

};