Commit a0a41eef authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

nvmf: allow inactive namespaces in virtual mode 



Now that virtual mode namespaces can be chosen arbitrarily, there can be
holes in the ns_list.  Make sure all of the virtual mode code paths are
prepared to handle these inactive but valid NSIDs.

Change-Id: I0d70fd9dae37a29a8358e1d38dcc6cac3237fd9a
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/365717


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 28db2ce0

app/nvmf_tgt/nvmf_rpc.c

+7 −2
Original line number Diff line number Diff line
@@ -109,12 +109,17 @@ dump_nvmf_subsystem(struct spdk_json_write_ctx *w, struct nvmf_tgt_subsystem *tg 
						   subsystem->dev.direct.pci_addr.dev,

						   subsystem->dev.direct.pci_addr.func);

		} else {

			int i;

			uint32_t i;



			spdk_json_write_name(w, "serial_number");

			spdk_json_write_string(w, spdk_nvmf_subsystem_get_sn(subsystem));

			spdk_json_write_name(w, "namespaces");

			spdk_json_write_array_begin(w);

			for (i = 0; i < subsystem->dev.virt.ns_count; i++) {

			for (i = 0; i < subsystem->dev.virt.max_nsid; i++) {

				if (subsystem->dev.virt.ns_list[i] == NULL) {

					continue;

				}



				spdk_json_write_object_begin(w);

				spdk_json_write_name(w, "nsid");

				spdk_json_write_int32(w, i + 1);

include/spdk/nvmf.h

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ struct spdk_nvmf_subsystem { 
			char	sn[MAX_SN_LEN + 1];

			struct spdk_bdev *ns_list[MAX_VIRTUAL_NAMESPACE];

			struct spdk_io_channel *ch[MAX_VIRTUAL_NAMESPACE];

			uint16_t ns_count;

			uint32_t max_nsid;

		} virt;

	} dev;

lib/nvmf/subsystem.c

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ spdk_nvmf_subsystem_add_ns(struct spdk_nvmf_subsystem *subsystem, struct spdk_bd 
		      nsid);



	subsystem->dev.virt.ns_list[i] = bdev;

	subsystem->dev.virt.ns_count++;

	subsystem->dev.virt.max_nsid = spdk_max(subsystem->dev.virt.max_nsid, nsid);

	return nsid;

}

lib/nvmf/virtual.c

+31 −10
Original line number Diff line number Diff line
@@ -63,14 +63,18 @@ struct __attribute__((packed)) nvme_read_cdw12 { 


static void nvmf_virtual_set_dsm(struct spdk_nvmf_session *session)

{

	int i;

	uint32_t i;



	for (i = 0; i < session->subsys->dev.virt.ns_count; i++) {

	for (i = 0; i < session->subsys->dev.virt.max_nsid; i++) {

		struct spdk_bdev *bdev = session->subsys->dev.virt.ns_list[i];



		if (bdev == NULL) {

			continue;

		}



		if (!spdk_bdev_io_type_supported(bdev, SPDK_BDEV_IO_TYPE_UNMAP)) {

			SPDK_TRACELOG(SPDK_TRACE_NVMF,

				      "Subsystem%d Namespace %s does not support unmap - not enabling DSM\n",

				      "Subsystem%u Namespace %s does not support unmap - not enabling DSM\n",

				      i, spdk_bdev_get_name(bdev));

			return;

		}
@@ -106,7 +110,7 @@ nvmf_virtual_ctrlr_get_data(struct spdk_nvmf_session *session) 
	session->vcdata.cqes.min = 0x04;

	session->vcdata.cqes.max = 0x04;

	session->vcdata.maxcmd = 1024;

	session->vcdata.nn = subsys->dev.virt.ns_count;

	session->vcdata.nn = subsys->dev.virt.max_nsid;

	session->vcdata.vwc.present = 1;

	session->vcdata.sgls.supported = 1;

	strncpy(session->vcdata.subnqn, session->subsys->subnqn, sizeof(session->vcdata.subnqn));
@@ -186,7 +190,7 @@ identify_ns(struct spdk_nvmf_subsystem *subsystem, 
	struct spdk_bdev *bdev;

	uint64_t num_blocks;



	if (cmd->nsid > subsystem->dev.virt.ns_count || cmd->nsid == 0) {

	if (cmd->nsid > subsystem->dev.virt.max_nsid || cmd->nsid == 0) {

		SPDK_ERRLOG("Identify Namespace for invalid NSID %u\n", cmd->nsid);

		rsp->status.sc = SPDK_NVME_SC_INVALID_NAMESPACE_OR_FORMAT;

		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;
@@ -194,6 +198,11 @@ identify_ns(struct spdk_nvmf_subsystem *subsystem, 


	bdev = subsystem->dev.virt.ns_list[cmd->nsid - 1];



	if (bdev == NULL) {

		memset(nsdata, 0, sizeof(*nsdata));

		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}



	num_blocks = spdk_bdev_get_num_blocks(bdev);



	nsdata->nsze = num_blocks;
@@ -227,12 +236,15 @@ identify_active_ns_list(struct spdk_nvmf_subsystem *subsystem, 
		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}



	num_ns = subsystem->dev.virt.ns_count;

	num_ns = subsystem->dev.virt.max_nsid;



	for (i = 1; i <= num_ns; i++) {

		if (i <= cmd->nsid) {

			continue;

		}

		if (subsystem->dev.virt.ns_list[i - 1] == NULL) {

			continue;

		}

		ns_list->ns_list[count++] = i;

		if (count == SPDK_COUNTOF(ns_list->ns_list)) {

			break;
@@ -516,13 +528,18 @@ nvmf_virtual_ctrlr_process_io_cmd(struct spdk_nvmf_request *req) 
	response->status.sc = SPDK_NVME_SC_SUCCESS;

	nsid = cmd->nsid;



	if (nsid > subsystem->dev.virt.ns_count || nsid == 0) {

	if (nsid > subsystem->dev.virt.max_nsid || nsid == 0) {

		SPDK_ERRLOG("Unsuccessful query for nsid %u\n", cmd->nsid);

		response->status.sc = SPDK_NVME_SC_INVALID_NAMESPACE_OR_FORMAT;

		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}



	bdev = subsystem->dev.virt.ns_list[nsid - 1];

	if (bdev == NULL) {

		response->status.sc = SPDK_NVME_SC_INVALID_NAMESPACE_OR_FORMAT;

		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}



	ch = subsystem->dev.virt.ch[nsid - 1];

	switch (cmd->opc) {

	case SPDK_NVME_OPC_READ:
@@ -544,8 +561,12 @@ nvmf_virtual_ctrlr_attach(struct spdk_nvmf_subsystem *subsystem) 
	struct spdk_io_channel *ch;

	uint32_t i;



	for (i = 0; i < subsystem->dev.virt.ns_count; i++) {

	for (i = 0; i < subsystem->dev.virt.max_nsid; i++) {

		bdev = subsystem->dev.virt.ns_list[i];

		if (bdev == NULL) {

			continue;

		}



		ch = spdk_bdev_get_io_channel(bdev);

		if (ch == NULL) {

			SPDK_ERRLOG("io_channel allocation failed\n");
@@ -562,7 +583,7 @@ nvmf_virtual_ctrlr_detach(struct spdk_nvmf_subsystem *subsystem) 
{

	uint32_t i;



	for (i = 0; i < subsystem->dev.virt.ns_count; i++) {

	for (i = 0; i < subsystem->dev.virt.max_nsid; i++) {

		if (subsystem->dev.virt.ns_list[i]) {

			spdk_put_io_channel(subsystem->dev.virt.ch[i]);

			spdk_bdev_unclaim(subsystem->dev.virt.ns_list[i]);
@@ -570,7 +591,7 @@ nvmf_virtual_ctrlr_detach(struct spdk_nvmf_subsystem *subsystem) 
			subsystem->dev.virt.ns_list[i] = NULL;

		}

	}

	subsystem->dev.virt.ns_count = 0;

	subsystem->dev.virt.max_nsid = 0;

}



const struct spdk_nvmf_ctrlr_ops spdk_nvmf_virtual_ctrlr_ops = {

test/lib/nvmf/subsystem/subsystem_ut.c

+4 −5
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ test_spdk_nvmf_subsystem_add_ns(void) 
{

	struct spdk_nvmf_subsystem subsystem = {

		.mode = NVMF_SUBSYSTEM_MODE_VIRTUAL,

		.dev.virt.ns_count = 0,

		.dev.virt.max_nsid = 0,

		.dev.virt.ns_list = {},

	};

	struct spdk_bdev bdev1 = {}, bdev2 = {};
@@ -203,20 +203,19 @@ test_spdk_nvmf_subsystem_add_ns(void) 
	nsid = spdk_nvmf_subsystem_add_ns(&subsystem, &bdev1, 0);

	/* NSID 1 is the first unused ID */

	CU_ASSERT(nsid == 1);

	CU_ASSERT(subsystem.dev.virt.ns_count == 1);

	CU_ASSERT(subsystem.dev.virt.max_nsid == 1);

	CU_ASSERT(subsystem.dev.virt.ns_list[nsid - 1] == &bdev1);



	/* Request a specific NSID */

	nsid = spdk_nvmf_subsystem_add_ns(&subsystem, &bdev2, 5);

	CU_ASSERT(nsid == 5);

	CU_ASSERT(subsystem.dev.virt.ns_count == 2);

	CU_ASSERT(subsystem.dev.virt.max_nsid == 5);

	CU_ASSERT(subsystem.dev.virt.ns_list[nsid - 1] == &bdev2);



	/* Request an NSID that is already in use */

	nsid = spdk_nvmf_subsystem_add_ns(&subsystem, &bdev2, 5);

	CU_ASSERT(nsid == 0);

	/* ns_count should be unchanged */

	CU_ASSERT(subsystem.dev.virt.ns_count == 2);

	CU_ASSERT(subsystem.dev.virt.max_nsid == 5);

}



static void