Commit 70bc390c authored by Ben Walker's avatar Ben Walker Committed by Jim Harris
Browse files

nvmf: spdk_nvmf_find_subsystem now takes a tgt parameter 



The user can now specify which target they want to
search for the subsystem. Also, change the name to
spdk_nvmf_tgt_find_subsystem and put it in the correct
compilation unit.

Change-Id: I7c085959814c14d8400a0ba2572103b0814a4d0e
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/374879


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 4addb5c8

app/nvmf_tgt/nvmf_tgt.c

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ nvmf_tgt_create_subsystem(const char *name, enum spdk_nvmf_subtype subtype, 
	struct spdk_nvmf_subsystem *subsystem;

	struct nvmf_tgt_subsystem *app_subsys;



	if (spdk_nvmf_find_subsystem(name)) {

	if (spdk_nvmf_tgt_find_subsystem(g_tgt, name)) {

		SPDK_ERRLOG("Subsystem already exist\n");

		return NULL;

	}

include/spdk/nvmf.h

+6 −2
Original line number Diff line number Diff line
@@ -105,6 +105,12 @@ struct spdk_nvmf_subsystem *spdk_nvmf_create_subsystem(struct spdk_nvmf_tgt *tgt 
		spdk_nvmf_subsystem_connect_fn connect_cb,

		spdk_nvmf_subsystem_disconnect_fn disconnect_cb);



/**

 * Search the target for a subsystem with the given NQN

 */

struct spdk_nvmf_subsystem *spdk_nvmf_tgt_find_subsystem(struct spdk_nvmf_tgt *tgt,

		const char *subnqn);



/**

 * Initialize the subsystem on the thread that will be used to poll it.

 *
@@ -114,8 +120,6 @@ int spdk_nvmf_subsystem_start(struct spdk_nvmf_subsystem *subsystem); 


void spdk_nvmf_delete_subsystem(struct spdk_nvmf_subsystem *subsystem);



struct spdk_nvmf_subsystem *spdk_nvmf_find_subsystem(const char *subnqn);



/**

 * Allow the given host NQN to connect to the given subsystem.

 *

lib/nvmf/ctrlr.c

+6 −3
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ spdk_nvmf_ctrlr_connect(struct spdk_nvmf_qpair *qpair, 
			struct spdk_nvmf_fabric_connect_data *data,

			struct spdk_nvmf_fabric_connect_rsp *rsp)

{

	struct spdk_nvmf_tgt *tgt;

	struct spdk_nvmf_ctrlr *ctrlr;

	struct spdk_nvmf_subsystem *subsystem;
@@ -227,7 +228,9 @@ spdk_nvmf_ctrlr_connect(struct spdk_nvmf_qpair *qpair, 
	SPDK_TRACELOG(SPDK_TRACE_NVMF, "  subnqn: \"%s\"\n", data->subnqn);

	SPDK_TRACELOG(SPDK_TRACE_NVMF, "  hostnqn: \"%s\"\n", data->hostnqn);



	subsystem = spdk_nvmf_find_subsystem(data->subnqn);

	tgt = qpair->transport->tgt;



	subsystem = spdk_nvmf_tgt_find_subsystem(tgt, data->subnqn);

	if (subsystem == NULL) {

		SPDK_ERRLOG("Could not find subsystem '%s'\n", data->subnqn);

		INVALID_CONNECT_DATA(subnqn);
@@ -238,9 +241,9 @@ spdk_nvmf_ctrlr_connect(struct spdk_nvmf_qpair *qpair, 
	 * SQSIZE is a 0-based value, so it must be at least 1 (minimum queue depth is 2) and

	 *  strictly less than max_queue_depth.

	 */

	if (cmd->sqsize == 0 || cmd->sqsize >= subsystem->tgt->opts.max_queue_depth) {

	if (cmd->sqsize == 0 || cmd->sqsize >= tgt->opts.max_queue_depth) {

		SPDK_ERRLOG("Invalid SQSIZE %u (min 1, max %u)\n",

			    cmd->sqsize, subsystem->tgt->opts.max_queue_depth - 1);

			    cmd->sqsize, tgt->opts.max_queue_depth - 1);

		INVALID_CONNECT_CMD(sqsize);

		return;

	}

lib/nvmf/nvmf.c

+18 −0
Original line number Diff line number Diff line
@@ -112,6 +112,24 @@ spdk_nvmf_tgt_destroy(struct spdk_nvmf_tgt *tgt) 
	}

}



struct spdk_nvmf_subsystem *

spdk_nvmf_tgt_find_subsystem(struct spdk_nvmf_tgt *tgt, const char *subnqn)

{

	struct spdk_nvmf_subsystem	*subsystem;



	if (!subnqn) {

		return NULL;

	}



	TAILQ_FOREACH(subsystem, &tgt->subsystems, entries) {

		if (strcmp(subnqn, subsystem->subnqn) == 0) {

			return subsystem;

		}

	}



	return NULL;

}



struct spdk_nvmf_transport *

spdk_nvmf_tgt_get_transport(struct spdk_nvmf_tgt *tgt, enum spdk_nvme_transport_type type)

{

lib/nvmf/request.c

+4 −1
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ invalid_connect_response(struct spdk_nvmf_fabric_connect_rsp *rsp, uint8_t iattr 
static spdk_nvmf_request_exec_status

nvmf_process_connect(struct spdk_nvmf_request *req)

{

	struct spdk_nvmf_tgt		*tgt;

	struct spdk_nvmf_subsystem	*subsystem;

	struct spdk_nvmf_fabric_connect_data *data = (struct spdk_nvmf_fabric_connect_data *)

			req->data;
@@ -160,7 +161,9 @@ nvmf_process_connect(struct spdk_nvmf_request *req) 
		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}



	subsystem = spdk_nvmf_find_subsystem(data->subnqn);

	tgt = req->qpair->transport->tgt;



	subsystem = spdk_nvmf_tgt_find_subsystem(tgt, data->subnqn);

	if (subsystem == NULL) {

		SPDK_ERRLOG("Could not find subsystem '%s'\n", data->subnqn);

		INVALID_CONNECT_DATA(subnqn);