Commit 8331ebd1 authored by Tomasz Zawadzki's avatar Tomasz Zawadzki Committed by Jim Harris
Browse files

ftl: Added trace support 



This patch adds supplementary tracing for OCSSD library to allow
for more efficient debugging and profiling of the user I/O path
as well as the background tasks (maintaining write pointer,
defragmentation, ANM event handling, etc.).

Change-Id: I741f1304f4ee0eba019e31bea7814af475c3296e
Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Signed-off-by: default avatarWojciech Malikowski <wojciech.malikowski@intel.com>
Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-on: https://review.gerrithub.io/c/431327


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 5c3591c7

include/spdk/ftl.h

+0 −3
Original line number Diff line number Diff line
@@ -69,9 +69,6 @@ struct spdk_ftl_conf { 
	/* Threshold for opening new band */

	size_t					band_thld;



	/* Trace enabled flag */

	int					trace;



	/* Maximum IO depth per band relocate */

	size_t					max_reloc_qdepth;

lib/ftl/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) 
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk



C_SRCS = ftl_band.c ftl_core.c ftl_debug.c ftl_io.c ftl_rwb.c ftl_reloc.c \

	 ftl_anm.c  ftl_restore.c ftl_init.c

	 ftl_anm.c  ftl_restore.c ftl_init.c ftl_trace.c



LIBNAME = ftl

lib/ftl/ftl_core.c

+10 −14
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ ftl_io_cmpl_cb(void *arg, const struct spdk_nvme_cpl *status) 
		ftl_io_process_error(io, status);

	}



	ftl_trace(completion, ftl_dev_trace(io->dev), io, FTL_TRACE_COMPLETION_DISK);

	ftl_trace_completion(io->dev, io, FTL_TRACE_COMPLETION_DISK);



	if (!ftl_io_dec_req(io)) {

		ftl_io_complete(io);
@@ -294,7 +294,7 @@ ftl_submit_erase(struct ftl_io *io) 


		ftl_io_inc_req(io);



		ftl_trace(submission, ftl_dev_trace(dev), io, ppa, 1);

		ftl_trace_submission(dev, io, ppa, 1);

		rc = spdk_nvme_ocssd_ns_cmd_vector_reset(dev->ns, ftl_get_write_qpair(dev),

				&ppa_packed, 1, NULL, ftl_io_cmpl_cb, io);

		if (rc) {
@@ -302,7 +302,6 @@ ftl_submit_erase(struct ftl_io *io) 
			ftl_io_dec_req(io);

			break;

		}



	}



	if (ftl_io_done(io)) {
@@ -428,7 +427,7 @@ ftl_add_wptr(struct spdk_ftl_dev *dev) 
	LIST_INSERT_HEAD(&dev->wptr_list, wptr, list_entry);



	SPDK_DEBUGLOG(SPDK_LOG_FTL_CORE, "wptr: band %u\n", band->id);

	ftl_trace(write_band, ftl_dev_trace(dev), band);

	ftl_trace_write_band(dev, band);

	return 0;

}
@@ -651,7 +650,7 @@ ftl_apply_limits(struct spdk_ftl_dev *dev) 
	/* Clear the limits, since we don't need to apply them anymore */

	rwb_limit[FTL_RWB_TYPE_USER] = ftl_rwb_entry_cnt(dev->rwb);

apply:

	ftl_trace(limits, ftl_dev_trace(dev), rwb_limit, dev->num_free);

	ftl_trace_limits(dev, rwb_limit, dev->num_free);

	ftl_rwb_set_limits(dev->rwb, rwb_limit);

}
@@ -733,7 +732,7 @@ ftl_submit_read(struct ftl_io *io, ftl_next_ppa_fn next_ppa, 


		assert(lbk_cnt > 0);



		ftl_trace(submission, ftl_dev_trace(dev), io, ppa, lbk_cnt);

		ftl_trace_submission(dev, io, ppa, lbk_cnt);

		rc = spdk_nvme_ns_cmd_read(dev->ns, ftl_get_read_qpair(dev),

					   ftl_io_iovec_addr(io),

					   ftl_ppa_addr_pack(io->dev, ppa), lbk_cnt,
@@ -795,15 +794,13 @@ ftl_lba_read_next_ppa(struct ftl_io *io, struct ftl_ppa *ppa, 


	/* If the PPA is invalid, skip it (the buffer should already be zero'ed) */

	if (ftl_ppa_invalid(*ppa)) {

		ftl_trace(completion, ftl_dev_trace(io->dev), io,

			  FTL_TRACE_COMPLETION_INVALID);

		ftl_trace_completion(io->dev, io, FTL_TRACE_COMPLETION_INVALID);

		return 0;

	}



	if (ftl_ppa_cached(*ppa)) {

		if (!ftl_ppa_cache_read(io, io->lba + lbk, *ppa, ftl_io_iovec_addr(io))) {

			ftl_trace(completion, ftl_dev_trace(io->dev), io,

				  FTL_TRACE_COMPLETION_CACHE);

			ftl_trace_completion(io->dev, io, FTL_TRACE_COMPLETION_CACHE);

			return 0;

		}
@@ -989,8 +986,7 @@ ftl_submit_write(struct ftl_wptr *wptr, struct ftl_io *io) 
		assert(iov[i].iov_len > 0);

		assert(iov[i].iov_len / PAGE_SIZE == dev->xfer_size);



		ftl_trace(submission, ftl_dev_trace(dev), io, wptr->ppa,

			  iov[i].iov_len / PAGE_SIZE);

		ftl_trace_submission(dev, io, wptr->ppa, iov[i].iov_len / PAGE_SIZE);

		rc = spdk_nvme_ns_cmd_write_with_md(dev->ns, ftl_get_write_qpair(dev),

						    iov[i].iov_base, ftl_io_get_md(io),

						    ftl_ppa_addr_pack(dev, wptr->ppa),
@@ -1082,7 +1078,7 @@ ftl_wptr_process_writes(struct ftl_wptr *wptr) 


		ftl_rwb_entry_set_valid(entry);



		ftl_trace(rwb_pop, ftl_dev_trace(dev), entry);

		ftl_trace_rwb_pop(dev, entry);

		ftl_update_rwb_stats(dev, entry);



		ppa = ftl_band_next_ppa(wptr->band, ppa, 1);
@@ -1182,7 +1178,7 @@ ftl_rwb_fill(struct ftl_io *io) 
		/* write completion callback when it's processed faster than */

		/* L2P is set in update_l2p(). */

		ftl_rwb_push(entry);

		ftl_trace(rwb_fill, ftl_dev_trace(dev), io);

		ftl_trace_rwb_fill(dev, io);

	}



	ftl_io_complete(io);

lib/ftl/ftl_core.h

+1 −7
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ struct ftl_stats { 
	uint64_t				write_total;



	/* Traces */

	struct ftl_trace			*trace;

	struct ftl_trace			trace;



	/* Number of limits applied */

	uint64_t				limits[SPDK_FTL_LIMIT_MAX];
@@ -429,10 +429,4 @@ ftl_vld_map_size(const struct spdk_ftl_dev *dev) 
	return (size_t)spdk_divide_round_up(ftl_num_band_lbks(dev), CHAR_BIT);

}



static inline struct ftl_trace *

ftl_dev_trace(struct spdk_ftl_dev *dev)

{

	return dev->stats.trace;

}



#endif /* FTL_CORE_H */

lib/ftl/ftl_init.c

+0 −2
Original line number Diff line number Diff line
@@ -87,8 +87,6 @@ static const struct spdk_ftl_conf g_default_conf = { 
	.max_active_relocs = 3,

	/* IO pool size per user thread (this should be adjusted to thread IO qdepth) */

	.user_io_pool_size = 2048,

	/* Enable traces */

	.trace = 0,

};



static void ftl_dev_free_sync(struct spdk_ftl_dev *dev);