Commit 07c2b34a authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

bdev/nvme: Register completion function as a generic callback for reset 



bdev_nvme_reset() will be used by JSON RPC and we will have to call
the callback to JSON RPC at bdev_nvme_reset_complete(). To do it
easily, register the current completion function for nvme_bdev_io
in bdev_nvme_reset_complete() into nvme_ctrlr as a generic callback.

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


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 avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent f1c141fc

module/bdev/nvme/bdev_nvme.c

+18 −6
Original line number Diff line number Diff line
@@ -503,9 +503,11 @@ static void 
bdev_nvme_reset_complete(struct nvme_ctrlr *nvme_ctrlr, int rc)

{

	struct nvme_ctrlr_trid *curr_trid;

	struct nvme_bdev_io *bio = nvme_ctrlr->reset_bio;

	bdev_nvme_reset_cb reset_cb_fn = nvme_ctrlr->reset_cb_fn;

	void *reset_cb_arg = nvme_ctrlr->reset_cb_arg;



	nvme_ctrlr->reset_bio = NULL;

	nvme_ctrlr->reset_cb_fn = NULL;

	nvme_ctrlr->reset_cb_arg = NULL;



	if (rc) {

		SPDK_ERRLOG("Resetting controller failed.\n");
@@ -530,8 +532,8 @@ bdev_nvme_reset_complete(struct nvme_ctrlr *nvme_ctrlr, int rc) 


	pthread_mutex_unlock(&nvme_ctrlr->mutex);



	if (bio) {

		bdev_nvme_io_complete(bio, rc);

	if (reset_cb_fn) {

		reset_cb_fn(reset_cb_arg, rc);

	}



	/* Make sure we clear any pending resets before returning. */
@@ -626,6 +628,14 @@ bdev_nvme_reset(struct nvme_ctrlr *nvme_ctrlr) 
	return 0;

}



static void

bdev_nvme_reset_io_complete(void *cb_arg, int rc)

{

	struct nvme_bdev_io *bio = cb_arg;



	bdev_nvme_io_complete(bio, rc);

}



static int

bdev_nvme_reset_io(struct nvme_ctrlr_channel *ctrlr_ch, struct nvme_bdev_io *bio)

{
@@ -634,8 +644,10 @@ bdev_nvme_reset_io(struct nvme_ctrlr_channel *ctrlr_ch, struct nvme_bdev_io *bio 


	rc = bdev_nvme_reset(ctrlr_ch->ctrlr);

	if (rc == 0) {

		assert(ctrlr_ch->ctrlr->reset_bio == NULL);

		ctrlr_ch->ctrlr->reset_bio = bio;

		assert(ctrlr_ch->ctrlr->reset_cb_fn == NULL);

		assert(ctrlr_ch->ctrlr->reset_cb_arg == NULL);

		ctrlr_ch->ctrlr->reset_cb_fn = bdev_nvme_reset_io_complete;

		ctrlr_ch->ctrlr->reset_cb_arg = bio;

	} else if (rc == -EAGAIN) {

		/*

		 * Reset call is queued only if it is from the app framework. This is on purpose so that

module/bdev/nvme/common.h

+4 −1
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ struct nvme_ctrlr_trid { 
	bool					is_failed;

};



typedef void (*bdev_nvme_reset_cb)(void *cb_arg, int rc);



struct nvme_ctrlr {

	/**

	 * points to pinned, physically contiguous memory region;
@@ -108,7 +110,8 @@ struct nvme_ctrlr { 


	struct ocssd_bdev_ctrlr			*ocssd_ctrlr;



	struct nvme_bdev_io			*reset_bio;

	bdev_nvme_reset_cb			reset_cb_fn;

	void					*reset_cb_arg;



	/** linked list pointer for device list */

	TAILQ_ENTRY(nvme_ctrlr)			tailq;