Commit 476b6661 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Jim Harris
Browse files

ut/bdev_nvme: Use attach/detach ctrlr for test_pending_reset() 



This is necessary to the following patches to test reset continuation.

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I20e0a6b96694eb06adadfbe8e20f73380645ea43
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7326


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Community-CI: Mellanox Build Bot
parent f56563ad

test/unit/lib/bdev/nvme/bdev_nvme.c/bdev_nvme_ut.c

+25 −12
Original line number Diff line number Diff line
@@ -1318,20 +1318,30 @@ test_failover_ctrlr(void) 
	CU_ASSERT(nvme_bdev_ctrlr_get_by_name("nvme0") == NULL);

}



static void

attach_ctrlr_done(void *cb_ctx, size_t bdev_count, int rc)

{

	CU_ASSERT(rc == g_ut_attach_ctrlr_status);

	CU_ASSERT(bdev_count == g_ut_attach_bdev_count);

}



static void

test_pending_reset(void)

{

	struct spdk_nvme_transport_id trid = {};

	struct spdk_nvme_ctrlr ctrlr = {};

	struct spdk_nvme_host_id hostid = {};

	struct spdk_nvme_ctrlr *ctrlr;

	struct nvme_bdev_ctrlr *nvme_bdev_ctrlr = NULL;

	const int STRING_SIZE = 32;

	const char *attached_names[STRING_SIZE];

	struct spdk_bdev_io *first_bdev_io, *second_bdev_io;

	struct nvme_bdev_io *first_bio, *second_bio;

	struct spdk_io_channel *ch1, *ch2;

	struct nvme_io_channel *nvme_ch1, *nvme_ch2;

	int rc;



	memset(attached_names, 0, sizeof(char *) * STRING_SIZE);

	ut_init_trid(&trid);

	TAILQ_INIT(&ctrlr.active_io_qpairs);



	first_bdev_io = calloc(1, sizeof(struct spdk_bdev_io) + sizeof(struct nvme_bdev_io));

	SPDK_CU_ASSERT_FATAL(first_bdev_io != NULL);
@@ -1345,7 +1355,18 @@ test_pending_reset(void) 


	set_thread(0);



	nvme_bdev_ctrlr_create(&ctrlr, "nvme0", &trid, 0, NULL);

	ctrlr = ut_attach_ctrlr(&trid, 0);

	SPDK_CU_ASSERT_FATAL(ctrlr != NULL);



	g_ut_attach_ctrlr_status = 0;

	g_ut_attach_bdev_count = 0;



	rc = bdev_nvme_create(&trid, &hostid, "nvme0", attached_names, STRING_SIZE, NULL, 0,

			      attach_ctrlr_done, NULL, NULL);

	CU_ASSERT(rc == 0);



	spdk_delay_us(1000);

	poll_threads();



	nvme_bdev_ctrlr = nvme_bdev_ctrlr_get_by_name("nvme0");

	SPDK_CU_ASSERT_FATAL(nvme_bdev_ctrlr != NULL);
@@ -1401,7 +1422,7 @@ test_pending_reset(void) 
	CU_ASSERT(rc == 0);

	CU_ASSERT(TAILQ_FIRST(&nvme_ch1->pending_resets) == second_bdev_io);



	ctrlr.fail_reset = true;

	ctrlr->fail_reset = true;



	poll_threads();
@@ -1419,7 +1440,6 @@ test_pending_reset(void) 


	set_thread(0);





	rc = bdev_nvme_delete("nvme0", NULL);

	CU_ASSERT(rc == 0);
@@ -1431,13 +1451,6 @@ test_pending_reset(void) 
	free(second_bdev_io);

}



static void

attach_ctrlr_done(void *cb_ctx, size_t bdev_count, int rc)

{

	CU_ASSERT(rc == g_ut_attach_ctrlr_status);

	CU_ASSERT(bdev_count == g_ut_attach_bdev_count);

}



static void

test_attach_ctrlr(void)

{