Commit c31fc453 authored by Niklas Cassel's avatar Niklas Cassel Committed by Tomasz Zawadzki
Browse files

ut/nvme: use nvme_ns_construct()/nvme_ns_destruct() in nvme_ns_ut.c 



Use nvme_ns_construct()/nvme_ns_destruct() for each subtest.
This is what lib/nvme uses when creating/deleting namespaces,
so it makes sense to use the same functions in the unit test.

If we explicitly call memset(), we might hide real problems,
since e.g. nvme_ns_destruct() does not clear all struct members
in struct spdk_nvme_ns.

Signed-off-by: default avatarNiklas Cassel <niklas.cassel@wdc.com>
Change-Id: Ia0ffce3d0a29088282e9fc8fc5413b98d1fe7c63
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4264


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 07525a91

test/unit/lib/nvme/nvme_ns.c/nvme_ns_ut.c

+25 −11
Original line number Diff line number Diff line
@@ -83,35 +83,41 @@ static void 
test_nvme_ns_uuid(void)

{

	struct spdk_nvme_ns ns = {};

	uint32_t id = 1;

	struct spdk_nvme_ns_data nsdata = {};

	struct spdk_nvme_ctrlr ctrlr = { .nsdata = &nsdata };

	const struct spdk_uuid *uuid;

	struct spdk_uuid expected_uuid;



	memset(&expected_uuid, 0xA5, sizeof(expected_uuid));



	/* Empty list - no UUID should be found */

	memset(ns.id_desc_list, 0, sizeof(ns.id_desc_list));

	nvme_ns_construct(&ns, id, &ctrlr);

	uuid = spdk_nvme_ns_get_uuid(&ns);

	CU_ASSERT(uuid == NULL);

	nvme_ns_destruct(&ns);



	/* NGUID only (no UUID in list) */

	memset(ns.id_desc_list, 0, sizeof(ns.id_desc_list));

	nvme_ns_construct(&ns, id, &ctrlr);

	ns.id_desc_list[0] = 0x02; /* NIDT == NGUID */

	ns.id_desc_list[1] = 0x10; /* NIDL */

	memset(&ns.id_desc_list[4], 0xCC, 0x10);

	uuid = spdk_nvme_ns_get_uuid(&ns);

	CU_ASSERT(uuid == NULL);

	nvme_ns_destruct(&ns);



	/* Just UUID in the list */

	memset(ns.id_desc_list, 0, sizeof(ns.id_desc_list));

	nvme_ns_construct(&ns, id, &ctrlr);

	ns.id_desc_list[0] = 0x03; /* NIDT == UUID */

	ns.id_desc_list[1] = 0x10; /* NIDL */

	memcpy(&ns.id_desc_list[4], &expected_uuid, sizeof(expected_uuid));

	uuid = spdk_nvme_ns_get_uuid(&ns);

	SPDK_CU_ASSERT_FATAL(uuid != NULL);

	CU_ASSERT(memcmp(uuid, &expected_uuid, sizeof(*uuid)) == 0);

	nvme_ns_destruct(&ns);



	/* UUID followed by NGUID */

	memset(ns.id_desc_list, 0, sizeof(ns.id_desc_list));

	nvme_ns_construct(&ns, id, &ctrlr);

	ns.id_desc_list[0] = 0x03; /* NIDT == UUID */

	ns.id_desc_list[1] = 0x10; /* NIDL */

	memcpy(&ns.id_desc_list[4], &expected_uuid, sizeof(expected_uuid));
@@ -121,9 +127,10 @@ test_nvme_ns_uuid(void) 
	uuid = spdk_nvme_ns_get_uuid(&ns);

	SPDK_CU_ASSERT_FATAL(uuid != NULL);

	CU_ASSERT(memcmp(uuid, &expected_uuid, sizeof(*uuid)) == 0);

	nvme_ns_destruct(&ns);



	/* NGUID followed by UUID */

	memset(ns.id_desc_list, 0, sizeof(ns.id_desc_list));

	nvme_ns_construct(&ns, id, &ctrlr);

	ns.id_desc_list[0] = 0x02; /* NIDT == NGUID */

	ns.id_desc_list[1] = 0x10; /* NIDL */

	memset(&ns.id_desc_list[4], 0xCC, 0x10);
@@ -133,30 +140,35 @@ test_nvme_ns_uuid(void) 
	uuid = spdk_nvme_ns_get_uuid(&ns);

	SPDK_CU_ASSERT_FATAL(uuid != NULL);

	CU_ASSERT(memcmp(uuid, &expected_uuid, sizeof(*uuid)) == 0);

	nvme_ns_destruct(&ns);

}



static void

test_nvme_ns_csi(void)

{

	struct spdk_nvme_ctrlr ctrlr = {};

	struct spdk_nvme_ns ns = { .ctrlr = &ctrlr };

	struct spdk_nvme_ns ns = {};

	uint32_t id = 1;

	struct spdk_nvme_ns_data nsdata = {};

	struct spdk_nvme_ctrlr ctrlr = { .nsdata = &nsdata };

	enum spdk_nvme_csi csi;



	/* Empty list - SPDK_NVME_CSI_NVM should be returned */

	memset(ns.id_desc_list, 0, sizeof(ns.id_desc_list));

	nvme_ns_construct(&ns, id, &ctrlr);

	csi = spdk_nvme_ns_get_csi(&ns);

	CU_ASSERT(csi == SPDK_NVME_CSI_NVM);

	nvme_ns_destruct(&ns);



	/* NVM CSI - SPDK_NVME_CSI_NVM should be returned */

	memset(ns.id_desc_list, 0, sizeof(ns.id_desc_list));

	nvme_ns_construct(&ns, id, &ctrlr);

	ns.id_desc_list[0] = 0x4; /* NIDT == CSI */

	ns.id_desc_list[1] = 0x1; /* NIDL */

	ns.id_desc_list[4] = 0x0; /* SPDK_NVME_CSI_NVM */

	csi = spdk_nvme_ns_get_csi(&ns);

	CU_ASSERT(csi == SPDK_NVME_CSI_NVM);

	nvme_ns_destruct(&ns);



	/* NGUID followed by ZNS CSI - SPDK_NVME_CSI_ZNS should be returned */

	memset(ns.id_desc_list, 0, sizeof(ns.id_desc_list));

	nvme_ns_construct(&ns, id, &ctrlr);

	ns.id_desc_list[0] = 0x02; /* NIDT == NGUID */

	ns.id_desc_list[1] = 0x10; /* NIDL */

	memset(&ns.id_desc_list[4], 0xCC, 0x10);
@@ -165,9 +177,10 @@ test_nvme_ns_csi(void) 
	ns.id_desc_list[24] = 0x2; /* SPDK_NVME_CSI_ZNS */

	csi = spdk_nvme_ns_get_csi(&ns);

	CU_ASSERT(csi == SPDK_NVME_CSI_ZNS);

	nvme_ns_destruct(&ns);



	/* KV CSI followed by NGUID - SPDK_NVME_CSI_KV should be returned */

	memset(ns.id_desc_list, 0, sizeof(ns.id_desc_list));

	nvme_ns_construct(&ns, id, &ctrlr);

	ns.id_desc_list[0] = 0x4; /* NIDT == CSI */

	ns.id_desc_list[1] = 0x1; /* NIDL */

	ns.id_desc_list[4] = 0x1; /* SPDK_NVME_CSI_KV */
@@ -176,6 +189,7 @@ test_nvme_ns_csi(void) 
	memset(&ns.id_desc_list[9], 0xCC, 0x10);

	csi = spdk_nvme_ns_get_csi(&ns);

	CU_ASSERT(csi == SPDK_NVME_CSI_KV);

	nvme_ns_destruct(&ns);

}



int main(int argc, char **argv)