Commit 07be7ca0 authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Tomasz Zawadzki
Browse files

bdev/nvme: use non-ext IO functions if possible 



Patch 55f94793 ("bdev: remove spdk_bdev_ext_io_opts from spdk_bdev_io")
changed the way bdev_nvme submits IO to the NVMe driver causing
performance degradation for requests with iovcnt = 1, as they also had
to go through the path that executes the reset_sgl/next_sge callbacks.

This patch reverts those changes back to the original code checking
iovcnt and using the non-SGL functions if possible.

Suggested-by: default avatarJim Harris <james.r.harris@intel.com>
Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: I5e7c6620d38b7690ff862d8cd0075afacc578217
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16961


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@nvidia.com>
parent 584d2952

module/bdev/nvme/bdev_nvme.c

+45 −19
Original line number Diff line number Diff line
@@ -6550,6 +6550,7 @@ bdev_nvme_readv(struct nvme_bdev_io *bio, struct iovec *iov, int iovcnt, 
	bio->iovpos = 0;

	bio->iov_offset = 0;



	if (domain != NULL) {

		bio->ext_opts.size = sizeof(struct spdk_nvme_ns_cmd_ext_io_opts);

		bio->ext_opts.memory_domain = domain;

		bio->ext_opts.memory_domain_ctx = domain_ctx;
@@ -6558,8 +6559,20 @@ bdev_nvme_readv(struct nvme_bdev_io *bio, struct iovec *iov, int iovcnt, 


		rc = spdk_nvme_ns_cmd_readv_ext(ns, qpair, lba, lba_count,

						bdev_nvme_readv_done, bio,

					bdev_nvme_queued_reset_sgl, bdev_nvme_queued_next_sge,

						bdev_nvme_queued_reset_sgl,

						bdev_nvme_queued_next_sge,

						&bio->ext_opts);

	} else if (iovcnt == 1) {

		rc = spdk_nvme_ns_cmd_read_with_md(ns, qpair, iov[0].iov_base,

						   md, lba, lba_count, bdev_nvme_readv_done,

						   bio, flags, 0, 0);

	} else {

		rc = spdk_nvme_ns_cmd_readv_with_md(ns, qpair, lba, lba_count,

						    bdev_nvme_readv_done, bio, flags,

						    bdev_nvme_queued_reset_sgl,

						    bdev_nvme_queued_next_sge, md, 0, 0);

	}



	if (rc != 0 && rc != -ENOMEM) {

		SPDK_ERRLOG("readv failed: rc = %d\n", rc);

	}
@@ -6583,6 +6596,7 @@ bdev_nvme_writev(struct nvme_bdev_io *bio, struct iovec *iov, int iovcnt, 
	bio->iovpos = 0;

	bio->iov_offset = 0;



	if (domain != NULL) {

		bio->ext_opts.size = sizeof(struct spdk_nvme_ns_cmd_ext_io_opts);

		bio->ext_opts.memory_domain = domain;

		bio->ext_opts.memory_domain_ctx = domain_ctx;
@@ -6591,8 +6605,20 @@ bdev_nvme_writev(struct nvme_bdev_io *bio, struct iovec *iov, int iovcnt, 


		rc = spdk_nvme_ns_cmd_writev_ext(ns, qpair, lba, lba_count,

						 bdev_nvme_writev_done, bio,

					 bdev_nvme_queued_reset_sgl, bdev_nvme_queued_next_sge,

						 bdev_nvme_queued_reset_sgl,

						 bdev_nvme_queued_next_sge,

						 &bio->ext_opts);

	} else if (iovcnt == 1) {

		rc = spdk_nvme_ns_cmd_write_with_md(ns, qpair, iov[0].iov_base,

						    md, lba, lba_count, bdev_nvme_writev_done,

						    bio, flags, 0, 0);

	} else {

		rc = spdk_nvme_ns_cmd_writev_with_md(ns, qpair, lba, lba_count,

						     bdev_nvme_writev_done, bio, flags,

						     bdev_nvme_queued_reset_sgl,

						     bdev_nvme_queued_next_sge, md, 0, 0);

	}



	if (rc != 0 && rc != -ENOMEM) {

		SPDK_ERRLOG("writev failed: rc = %d\n", rc);

	}

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

+3 −1
Original line number Diff line number Diff line
@@ -2363,11 +2363,13 @@ test_submit_nvme_cmd(void) 


	ut_test_submit_fused_nvme_cmd(ch, bdev_io);



	/* Verify that ext NVME API is called */

	/* Verify that ext NVME API is called when data is described by memory domain  */

	g_ut_readv_ext_called = false;

	bdev_io->u.bdev.memory_domain = (void *)0xdeadbeef;

	ut_test_submit_nvme_cmd(ch, bdev_io, SPDK_BDEV_IO_TYPE_READ);

	CU_ASSERT(g_ut_readv_ext_called == true);

	g_ut_readv_ext_called = false;

	bdev_io->u.bdev.memory_domain = NULL;



	ut_test_submit_admin_cmd(ch, bdev_io, ctrlr);