Commit 6bb6da3b authored by Joel Cunningham's avatar Joel Cunningham Committed by Tomasz Zawadzki
Browse files

test/unit/nvmf: add abort support to acquire preempt tests 



Generalize test_reservation_acquire_preempt_1 to be a high level entry
point for running preempt and preempt-and-abort tests. The test setup
for preempt versus preempt-and-abort is identical with abort carrying
to extra validations.

CUnit doesn't allow passing any parameters to a test, we'll have to make
sub-tests for preempt to avoid a large duplication of test code.

test_reservation_acquire_preempt_1 has been renamed to
test_reservation_acquire_preempt_basic and has been extended to also
validate the abort case (validates the ns preempt info state).

This will be extended in future commits with more preempt tests

Change-Id: I193e7363331dcd5bc3c580af85e89f16b9e2a0da
Signed-off-by: default avatarJoel Cunningham <joel.cunningham@oracle.com>
Reviewed-on: https://review.spdk.io/c/spdk/spdk/+/26673


Reviewed-by: default avatarChangpeng Liu <changpeliu@tencent.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
parent ede81afa

test/unit/lib/nvmf/subsystem.c/subsystem_ut.c

+36 −4
Original line number Diff line number Diff line
@@ -1178,12 +1178,15 @@ test_reservation_register_with_ptpl(void) 
}



static void

test_reservation_acquire_preempt_1(void)

test_reservation_acquire_preempt_basic(enum spdk_nvme_reservation_acquire_action preempt_type)

{

	struct spdk_nvmf_request *req;

	struct spdk_nvme_cpl *rsp;

	struct spdk_nvmf_registrant *reg;

	uint32_t gen;

	bool is_abort = (preempt_type == SPDK_NVME_RESERVE_PREEMPT_ABORT);



	printf("Executing test: %s with acquire type: %d\n", __func__, preempt_type);



	ut_reservation_init();
@@ -1206,12 +1209,13 @@ test_reservation_acquire_preempt_1(void) 
	SPDK_CU_ASSERT_FATAL(g_ns.crkey == 0xa1);

	SPDK_CU_ASSERT_FATAL(g_ns.holder == reg);

	SPDK_CU_ASSERT_FATAL(g_ns.gen == gen);

	SPDK_CU_ASSERT_FATAL(g_ns.preempt_abort == NULL);



	/* TEST CASE: g_ctrlr1_A holds the reservation, g_ctrlr_B preempt g_ctrl1_A,

	 * g_ctrl1_A registrant is unregistered.

	 */

	gen = g_ns.gen;

	ut_reservation_build_acquire_request(req, SPDK_NVME_RESERVE_PREEMPT, 0,

	ut_reservation_build_acquire_request(req, preempt_type, 0,

					     SPDK_NVME_RESERVE_WRITE_EXCLUSIVE_ALL_REGS, 0xb1, 0xa1);

	nvmf_ns_reservation_acquire(&g_ns, &g_ctrlr_B, req);

	SPDK_CU_ASSERT_FATAL(rsp->status.sc == SPDK_NVME_SC_SUCCESS);
@@ -1224,13 +1228,22 @@ test_reservation_acquire_preempt_1(void) 
	SPDK_CU_ASSERT_FATAL(reg != NULL);

	SPDK_CU_ASSERT_FATAL(g_ns.rtype == SPDK_NVME_RESERVE_WRITE_EXCLUSIVE_ALL_REGS);

	SPDK_CU_ASSERT_FATAL(g_ns.gen > gen);

	if (is_abort) {

		SPDK_CU_ASSERT_FATAL(g_ns.preempt_abort);

		SPDK_CU_ASSERT_FATAL(g_ns.preempt_abort->hostids_cnt == 1);

		SPDK_CU_ASSERT_FATAL(spdk_uuid_compare(&g_ctrlr1_A.hostid,

						       &g_ns.preempt_abort->hostids[0]) == 0);

		SPDK_CU_ASSERT_FATAL(g_ns.preempt_abort->hostids_gen == 1);

	} else {

		SPDK_CU_ASSERT_FATAL(g_ns.preempt_abort == NULL);

	}



	/* TEST CASE: g_ctrlr_B holds the reservation, g_ctrlr_C preempt g_ctrlr_B

	 * with valid key and PRKEY set to 0, all registrants other the host that issued

	 * the command are unregistered.

	 */

	gen = g_ns.gen;

	ut_reservation_build_acquire_request(req, SPDK_NVME_RESERVE_PREEMPT, 0,

	ut_reservation_build_acquire_request(req, preempt_type, 0,

					     SPDK_NVME_RESERVE_WRITE_EXCLUSIVE_ALL_REGS, 0xc1, 0x0);

	nvmf_ns_reservation_acquire(&g_ns, &g_ctrlr_C, req);

	SPDK_CU_ASSERT_FATAL(rsp->status.sc == SPDK_NVME_SC_SUCCESS);
@@ -1243,11 +1256,30 @@ test_reservation_acquire_preempt_1(void) 
	SPDK_CU_ASSERT_FATAL(g_ns.holder == reg);

	SPDK_CU_ASSERT_FATAL(g_ns.rtype == SPDK_NVME_RESERVE_WRITE_EXCLUSIVE_ALL_REGS);

	SPDK_CU_ASSERT_FATAL(g_ns.gen > gen);

	if (is_abort) {

		SPDK_CU_ASSERT_FATAL(g_ns.preempt_abort);

		SPDK_CU_ASSERT_FATAL(g_ns.preempt_abort->hostids_cnt == 1);

		SPDK_CU_ASSERT_FATAL(spdk_uuid_compare(&g_ctrlr_B.hostid,

						       &g_ns.preempt_abort->hostids[0]) == 0);

		SPDK_CU_ASSERT_FATAL(g_ns.preempt_abort->hostids_gen == 2);

	} else {

		SPDK_CU_ASSERT_FATAL(g_ns.preempt_abort == NULL);

	}



	ut_reservation_free_req(req);

	ut_reservation_deinit();

}



static void

test_reservation_acquire_preempt(void)

{

	/* Preempt versus preempt-and-abort only have minor functionality differences, so

	 * the same test can be executed with both preemption types.

	 */

	test_reservation_acquire_preempt_basic(SPDK_NVME_RESERVE_PREEMPT);

	test_reservation_acquire_preempt_basic(SPDK_NVME_RESERVE_PREEMPT_ABORT);

}



static void

test_reservation_acquire_release_with_ptpl(void)

{
@@ -2755,7 +2787,7 @@ main(int argc, char **argv) 
	CU_ADD_TEST(suite, test_spdk_nvmf_ns_visible);

	CU_ADD_TEST(suite, test_reservation_register);

	CU_ADD_TEST(suite, test_reservation_register_with_ptpl);

	CU_ADD_TEST(suite, test_reservation_acquire_preempt_1);

	CU_ADD_TEST(suite, test_reservation_acquire_preempt);

	CU_ADD_TEST(suite, test_reservation_acquire_release_with_ptpl);

	CU_ADD_TEST(suite, test_reservation_release);

	CU_ADD_TEST(suite, test_reservation_unregister_notification);