Commit 50b10bc2 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

bdev/nvme: bdev_nvme_reset_io() redirect to the orig_thread at completion 



In the following patches, bdev_nvme_reset() will execute the reset ctrlr
operation on the nvme_ctrlr->thread until completion as bdev_nvme_admin_passthru()
does. Hence change the callback bdev_nvme_reset_io_continue() to
redirect to the orig_thread by using bio. Furthermore, use bio->cpl.cdw0
to store the completion status of the reset processing. bdev_nvme_reset()
does not use bio->cpl.

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


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent 6e0a60ae

module/bdev/nvme/bdev_nvme.c

+23 −8
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ struct nvme_bdev_io { 


	/** Saved status for admin passthru completion event, PI error verification, or intermediate compare-and-write status */

	struct spdk_nvme_cpl cpl;



	/** Extended IO opts passed by the user to bdev layer and mapped to NVME format */

	struct spdk_nvme_ns_cmd_ext_io_opts ext_opts;
@@ -1386,11 +1387,11 @@ bdev_nvme_reset_rpc(struct nvme_ctrlr *nvme_ctrlr, bdev_nvme_reset_cb cb_fn, voi 
static int _bdev_nvme_reset_io(struct nvme_io_path *io_path, struct nvme_bdev_io *bio);



static void

bdev_nvme_reset_io_complete(struct nvme_bdev_io *bio, bool success)

bdev_nvme_reset_io_complete(struct nvme_bdev_io *bio)

{

	enum spdk_bdev_io_status io_status;



	if (success) {

	if (bio->cpl.cdw0 == 0) {

		io_status = SPDK_BDEV_IO_STATUS_SUCCESS;

	} else {

		io_status = SPDK_BDEV_IO_STATUS_FAILED;
@@ -1400,16 +1401,16 @@ bdev_nvme_reset_io_complete(struct nvme_bdev_io *bio, bool success) 
}



static void

bdev_nvme_reset_io_continue(void *cb_arg, bool success)

_bdev_nvme_reset_io_continue(void *ctx)

{

	struct nvme_bdev_io *bio = cb_arg;

	struct nvme_bdev_io *bio = ctx;

	struct nvme_io_path *prev_io_path, *next_io_path;

	int rc;



	prev_io_path = bio->io_path;

	bio->io_path = NULL;



	if (!success) {

	if (bio->cpl.cdw0 != 0) {

		goto complete;

	}
@@ -1423,10 +1424,20 @@ bdev_nvme_reset_io_continue(void *cb_arg, bool success) 
		return;

	}



	success = false;

	bio->cpl.cdw0 = 1;



complete:

	bdev_nvme_reset_io_complete(bio, success);

	bdev_nvme_reset_io_complete(bio);

}



static void

bdev_nvme_reset_io_continue(void *cb_arg, bool success)

{

	struct nvme_bdev_io *bio = cb_arg;



	bio->cpl.cdw0 = !success;



	spdk_thread_send_msg(bio->orig_thread, _bdev_nvme_reset_io_continue, bio);

}



static int
@@ -1469,6 +1480,9 @@ bdev_nvme_reset_io(struct nvme_bdev_channel *nbdev_ch, struct nvme_bdev_io *bio) 
	struct nvme_io_path *io_path;

	int rc;



	bio->cpl.cdw0 = 0;

	bio->orig_thread = spdk_get_thread();



	/* Reset only the first nvme_ctrlr in the nvme_bdev_ctrlr for now.

	 *

	 * TODO: Reset all nvme_ctrlrs in the nvme_bdev_ctrlr sequentially.
@@ -1479,7 +1493,8 @@ bdev_nvme_reset_io(struct nvme_bdev_channel *nbdev_ch, struct nvme_bdev_io *bio) 


	rc = _bdev_nvme_reset_io(io_path, bio);

	if (rc != 0) {

		bdev_nvme_reset_io_complete(bio, false);

		bio->cpl.cdw0 = 1;

		bdev_nvme_reset_io_complete(bio);

	}

}

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

+2 −2
Original line number Diff line number Diff line
@@ -3680,7 +3680,7 @@ test_reset_bdev_ctrlr(void) 
	CU_ASSERT(nvme_ctrlr1->resetting == true);

	poll_thread_times(1, 1);

	CU_ASSERT(nvme_ctrlr1->resetting == true);

	poll_thread_times(0, 1);

	poll_thread_times(0, 2);

	CU_ASSERT(nvme_ctrlr1->resetting == false);

	CU_ASSERT(curr_path1->is_failed == false);

	CU_ASSERT(first_bio->io_path == io_path12);
@@ -3712,7 +3712,7 @@ test_reset_bdev_ctrlr(void) 
	CU_ASSERT(nvme_ctrlr2->resetting == true);

	poll_thread_times(1, 1);

	CU_ASSERT(nvme_ctrlr2->resetting == true);

	poll_thread_times(0, 1);

	poll_thread_times(0, 2);

	CU_ASSERT(first_bio->io_path == NULL);

	CU_ASSERT(nvme_ctrlr2->resetting == false);

	CU_ASSERT(curr_path2->is_failed == false);