Commit 3b279697 authored by Changpeng Liu's avatar Changpeng Liu Committed by Darek Stojaczyk
Browse files

nvme/fio_plugin: optimize metadata buffer usage 



Fio will allocate metadata buffers for each request, even the NVMe namespace
wasn't formatted to separate metadata, it's not an error to set the metadata
pointer to NVMe command, but still it's better to set it with real cases.

Change-Id: I1d29b6be65cfa6ba1c20d31906bcee5e8e2decf8
Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/461349


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent cf0c4829

examples/nvme/fio_plugin/fio_plugin.c

+8 −4
Original line number Diff line number Diff line
@@ -756,6 +756,7 @@ spdk_fio_queue(struct thread_data *td, struct io_u *io_u) 
	struct spdk_fio_request	*fio_req = io_u->engine_data;

	struct spdk_fio_qpair	*fio_qpair;

	struct spdk_nvme_ns	*ns = NULL;

	void			*md_buf = NULL;

	struct spdk_dif_ctx	*dif_ctx = &fio_req->dif_ctx;

	uint32_t		block_size;

	uint64_t		lba;
@@ -773,6 +774,9 @@ spdk_fio_queue(struct thread_data *td, struct io_u *io_u) 
	if (fio_qpair == NULL || ns == NULL) {

		return -ENXIO;

	}

	if (fio_qpair->do_nvme_pi && !fio_qpair->extended_lba) {

		md_buf = fio_req->md_buf;

	}

	fio_req->fio_qpair = fio_qpair;



	block_size = spdk_nvme_ns_get_extended_sector_size(ns);
@@ -796,26 +800,26 @@ spdk_fio_queue(struct thread_data *td, struct io_u *io_u) 
	switch (io_u->ddir) {

	case DDIR_READ:

		if (!g_spdk_enable_sgl) {

			rc = spdk_nvme_ns_cmd_read_with_md(ns, fio_qpair->qpair, io_u->buf, fio_req->md_buf, lba, lba_count,

			rc = spdk_nvme_ns_cmd_read_with_md(ns, fio_qpair->qpair, io_u->buf, md_buf, lba, lba_count,

							   spdk_fio_completion_cb, fio_req,

							   dif_ctx->dif_flags, dif_ctx->apptag_mask, dif_ctx->app_tag);

		} else {

			rc = spdk_nvme_ns_cmd_readv_with_md(ns, fio_qpair->qpair, lba,

							    lba_count, spdk_fio_completion_cb, fio_req, dif_ctx->dif_flags,

							    spdk_nvme_io_reset_sgl, spdk_nvme_io_next_sge, fio_req->md_buf,

							    spdk_nvme_io_reset_sgl, spdk_nvme_io_next_sge, md_buf,

							    dif_ctx->apptag_mask, dif_ctx->app_tag);

		}

		break;

	case DDIR_WRITE:

		if (!g_spdk_enable_sgl) {

			rc = spdk_nvme_ns_cmd_write_with_md(ns, fio_qpair->qpair, io_u->buf, fio_req->md_buf, lba,

			rc = spdk_nvme_ns_cmd_write_with_md(ns, fio_qpair->qpair, io_u->buf, md_buf, lba,

							    lba_count,

							    spdk_fio_completion_cb, fio_req,

							    dif_ctx->dif_flags, dif_ctx->apptag_mask, dif_ctx->app_tag);

		} else {

			rc = spdk_nvme_ns_cmd_writev_with_md(ns, fio_qpair->qpair, lba,

							     lba_count, spdk_fio_completion_cb, fio_req, dif_ctx->dif_flags,

							     spdk_nvme_io_reset_sgl, spdk_nvme_io_next_sge, fio_req->md_buf,

							     spdk_nvme_io_reset_sgl, spdk_nvme_io_next_sge, md_buf,

							     dif_ctx->apptag_mask, dif_ctx->app_tag);

		}

		break;