Commit 0cb8a331 authored by Mateusz Kozlowski's avatar Mateusz Kozlowski Committed by Jim Harris
Browse files

lib/ftl: Update initialization of io channel 



Changed initialization of io channels to be made in the core/read
thread themselves. This fixes potential hangs when using the ftl lib
directly, without bdev and initializing an ftl device from a different
thread than will be used for IO.

Signed-off-by: default avatarMateusz Kozlowski <mateusz.kozlowski@intel.com>
Change-Id: I7089cc46cc6de5e9008e7c22cc01d2b4103ebb14
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/464891


Reviewed-by: default avatarBroadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 35f840b3

lib/ftl/ftl_core.c

+17 −2
Original line number Diff line number Diff line
@@ -393,6 +393,21 @@ ftl_check_read_thread(const struct spdk_ftl_dev *dev) 
	return dev->read_thread.thread == spdk_get_thread();

}



struct spdk_io_channel *

ftl_get_io_channel(const struct spdk_ftl_dev *dev)

{

	if (ftl_check_core_thread(dev)) {

		return dev->core_thread.ioch;

	}

	if (ftl_check_read_thread(dev)) {

		return dev->read_thread.ioch;

	}



	assert(0);

	return NULL;

}





int

ftl_io_erase(struct ftl_io *io)

{
@@ -1265,7 +1280,7 @@ ftl_nv_cache_write_header(struct ftl_nv_cache *nv_cache, bool shutdown, 
	struct ftl_io_channel *ioch;



	bdev = spdk_bdev_desc_get_bdev(nv_cache->bdev_desc);

	ioch = spdk_io_channel_get_ctx(dev->ioch);

	ioch = spdk_io_channel_get_ctx(ftl_get_io_channel(dev));



	memset(hdr, 0, spdk_bdev_get_block_size(bdev));
@@ -1287,7 +1302,7 @@ ftl_nv_cache_scrub(struct ftl_nv_cache *nv_cache, spdk_bdev_io_completion_cb cb_ 
	struct ftl_io_channel *ioch;

	struct spdk_bdev *bdev;



	ioch = spdk_io_channel_get_ctx(dev->ioch);

	ioch = spdk_io_channel_get_ctx(ftl_get_io_channel(dev));

	bdev = spdk_bdev_desc_get_bdev(nv_cache->bdev_desc);



	return spdk_bdev_write_zeroes_blocks(nv_cache->bdev_desc, ioch->cache_ioch, 1,

lib/ftl/ftl_core.h

+5 −3
Original line number Diff line number Diff line
@@ -90,6 +90,8 @@ struct ftl_thread { 
	/* Thread on which the poller is running */

	struct spdk_thread			*thread;



	/* IO channel */

	struct spdk_io_channel			*ioch;

	/* Poller */

	struct spdk_poller			*poller;

	/* Poller's function */
@@ -160,9 +162,6 @@ struct spdk_ftl_dev { 
	/* Destruction context */

	struct ftl_init_context			fini_ctx;



	/* IO channel */

	struct spdk_io_channel			*ioch;



	/* NVMe controller */

	struct spdk_nvme_ctrlr			*ctrlr;

	/* NVMe namespace */
@@ -301,6 +300,9 @@ int ftl_nv_cache_write_header(struct ftl_nv_cache *nv_cache, bool shutdown, 
int	ftl_nv_cache_scrub(struct ftl_nv_cache *nv_cache, spdk_bdev_io_completion_cb cb_fn,

			   void *cb_arg);



struct spdk_io_channel *

ftl_get_io_channel(const struct spdk_ftl_dev *dev);



#define ftl_to_ppa(addr) \

	(struct ftl_ppa) { .ppa = (uint64_t)(addr) }

lib/ftl/ftl_init.c

+5 −10
Original line number Diff line number Diff line
@@ -732,6 +732,8 @@ _ftl_dev_init_thread(void *ctx) 
	if (spdk_get_thread() == ftl_get_core_thread(dev)) {

		ftl_anm_register_device(dev, ftl_process_anm_event);

	}



	thread->ioch = spdk_get_io_channel(dev);

}



static int
@@ -778,8 +780,10 @@ ftl_dev_free_thread(struct spdk_ftl_dev *dev, struct ftl_thread *thread) 
{

	assert(thread->poller == NULL);



	spdk_put_io_channel(thread->ioch);

	spdk_nvme_ctrlr_free_io_qpair(thread->qpair);

	thread->thread = NULL;

	thread->ioch = NULL;

	thread->qpair = NULL;

}
@@ -1069,12 +1073,6 @@ ftl_dev_init_io_channel(struct spdk_ftl_dev *dev) 
				sizeof(struct ftl_io_channel),

				NULL);



	dev->ioch = spdk_get_io_channel(dev);

	if (!dev->ioch) {

		spdk_io_device_unregister(dev, NULL);

		return -1;

	}



	return 0;

}
@@ -1227,10 +1225,7 @@ ftl_dev_free_sync(struct spdk_ftl_dev *dev) 
	ftl_dev_dump_bands(dev);

	ftl_dev_dump_stats(dev);



	if (dev->ioch) {

		spdk_put_io_channel(dev->ioch);

	spdk_io_device_unregister(dev, NULL);

	}



	if (dev->bands) {

		for (i = 0; i < ftl_dev_num_bands(dev); ++i) {

lib/ftl/ftl_io.c

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ ftl_io_init_internal(const struct ftl_io_init_opts *opts) 
		if (parent) {

			io = ftl_io_alloc_child(parent);

		} else {

			io = ftl_io_alloc(dev->ioch);

			io = ftl_io_alloc(ftl_get_io_channel(dev));

		}



		if (!io) {

lib/ftl/ftl_restore.c

+9 −10
Original line number Diff line number Diff line
@@ -322,9 +322,10 @@ ftl_restore_head_cb(struct ftl_io *io, void *ctx, int status) 
	}

}



static int

ftl_restore_head_md(struct ftl_restore *restore)

static void

ftl_restore_head_md(void *ctx)

{

	struct ftl_restore *restore = ctx;

	struct spdk_ftl_dev *dev = restore->dev;

	struct ftl_restore_band *rband;

	struct ftl_lba_map *lba_map;
@@ -347,8 +348,7 @@ ftl_restore_head_md(struct ftl_restore *restore) 


				/* If the first IO fails, don't bother sending anything else */

				if (i == 0) {

					ftl_restore_free(restore);

					return -EIO;

					ftl_restore_complete(restore, -EIO);

				}

			}
@@ -359,12 +359,9 @@ ftl_restore_head_md(struct ftl_restore *restore) 
	if (spdk_unlikely(num_failed > 0)) {

		num_ios = __atomic_fetch_sub(&restore->num_ios, num_failed, __ATOMIC_SEQ_CST);

		if (num_ios == num_failed) {

			ftl_restore_free(restore);

			return -EIO;

			ftl_restore_complete(restore, -EIO);

		}

	}



	return 0;

}



int
@@ -377,7 +374,9 @@ ftl_restore_md(struct spdk_ftl_dev *dev, ftl_restore_fn cb) 
		return -ENOMEM;

	}



	return ftl_restore_head_md(restore);

	spdk_thread_send_msg(ftl_get_core_thread(dev), ftl_restore_head_md, restore);



	return 0;

}



static int
@@ -1003,7 +1002,7 @@ ftl_restore_nv_cache(struct ftl_restore *restore, ftl_restore_fn cb) 
	size_t alignment;

	int rc, i;



	ioch = spdk_io_channel_get_ctx(dev->ioch);

	ioch = spdk_io_channel_get_ctx(ftl_get_io_channel(dev));

	bdev = spdk_bdev_desc_get_bdev(nv_cache->bdev_desc);

	alignment = spdk_max(spdk_bdev_get_buf_align(bdev), sizeof(uint64_t));