Commit 6f3b59be authored by Jacek Kalwas's avatar Jacek Kalwas Committed by Tomasz Zawadzki
Browse files

nvmf: add memory domain and its ctx to spdk_nvmf_request 



This allows to support memory domains on nvmf layer for read/write.
Support for plain compare or compare & write (fused) is still missing
though.

Signed-off-by: default avatarJacek Kalwas <jacek.kalwas@intel.com>
Change-Id: I9a365fcf6b7e722025d36c9f798ec2b766fa61a1
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17527


Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent a274c3ee

include/spdk/nvmf_transport.h

+7 −1
Original line number Diff line number Diff line
@@ -89,6 +89,12 @@ struct spdk_nvmf_request { 


	struct spdk_nvmf_dif_info	dif;



	/* Memory domain which describes payload in this request. If the bdev doesn't support memory

	 * domains, bdev layer will do the necessary push or pull operation. */

	struct spdk_memory_domain	*memory_domain;

	/* Context to be passed to memory domain operations. */

	void				*memory_domain_ctx;



	struct spdk_bdev_io_wait_entry	bdev_io_wait;

	spdk_nvmf_nvme_passthru_cmd_cb	cmd_cb_fn;

	struct spdk_nvmf_request	*first_fused_req;

lib/nvmf/ctrlr_bdev.c

+14 −4
Original line number Diff line number Diff line
@@ -269,6 +269,11 @@ int 
nvmf_bdev_ctrlr_read_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc,

			 struct spdk_io_channel *ch, struct spdk_nvmf_request *req)

{

	struct spdk_bdev_ext_io_opts opts = {

		.size = SPDK_SIZEOF(&opts, accel_sequence),

		.memory_domain = req->memory_domain,

		.memory_domain_ctx = req->memory_domain_ctx

	};

	uint64_t bdev_num_blocks = spdk_bdev_get_num_blocks(bdev);

	uint32_t block_size = spdk_bdev_get_block_size(bdev);

	struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd;
@@ -296,8 +301,8 @@ nvmf_bdev_ctrlr_read_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc, 


	assert(!spdk_nvmf_request_using_zcopy(req));



	rc = spdk_bdev_readv_blocks(desc, ch, req->iov, req->iovcnt, start_lba, num_blocks,

				    nvmf_bdev_ctrlr_complete_cmd, req);

	rc = spdk_bdev_readv_blocks_ext(desc, ch, req->iov, req->iovcnt, start_lba, num_blocks,

					nvmf_bdev_ctrlr_complete_cmd, req, &opts);

	if (spdk_unlikely(rc)) {

		if (rc == -ENOMEM) {

			nvmf_bdev_ctrl_queue_io(req, bdev, ch, nvmf_ctrlr_process_io_cmd_resubmit, req);
@@ -315,6 +320,11 @@ int 
nvmf_bdev_ctrlr_write_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc,

			  struct spdk_io_channel *ch, struct spdk_nvmf_request *req)

{

	struct spdk_bdev_ext_io_opts opts = {

		.size = SPDK_SIZEOF(&opts, accel_sequence),

		.memory_domain = req->memory_domain,

		.memory_domain_ctx = req->memory_domain_ctx

	};

	uint64_t bdev_num_blocks = spdk_bdev_get_num_blocks(bdev);

	uint32_t block_size = spdk_bdev_get_block_size(bdev);

	struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd;
@@ -342,8 +352,8 @@ nvmf_bdev_ctrlr_write_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc, 


	assert(!spdk_nvmf_request_using_zcopy(req));



	rc = spdk_bdev_writev_blocks(desc, ch, req->iov, req->iovcnt, start_lba, num_blocks,

				     nvmf_bdev_ctrlr_complete_cmd, req);

	rc = spdk_bdev_writev_blocks_ext(desc, ch, req->iov, req->iovcnt, start_lba, num_blocks,

					 nvmf_bdev_ctrlr_complete_cmd, req, &opts);

	if (spdk_unlikely(rc)) {

		if (rc == -ENOMEM) {

			nvmf_bdev_ctrl_queue_io(req, bdev, ch, nvmf_ctrlr_process_io_cmd_resubmit, req);

test/unit/lib/nvmf/ctrlr_bdev.c/ctrlr_bdev_ut.c

+10 −0
Original line number Diff line number Diff line
@@ -31,6 +31,16 @@ DEFINE_STUB(spdk_bdev_comparev_blocks, int, (struct spdk_bdev_desc *desc, 
		uint64_t offset_blocks, uint64_t num_blocks,

		spdk_bdev_io_completion_cb cb, void *cb_arg), 0);



DEFINE_STUB(spdk_bdev_readv_blocks_ext, int, (struct spdk_bdev_desc *desc,

		struct spdk_io_channel *ch, struct iovec *iov, int iovcnt, uint64_t offset_blocks,

		uint64_t num_blocks, spdk_bdev_io_completion_cb cb, void *cb_arg,

		struct spdk_bdev_ext_io_opts *opts), 0);



DEFINE_STUB(spdk_bdev_writev_blocks_ext, int, (struct spdk_bdev_desc *desc,

		struct spdk_io_channel *ch, struct iovec *iov, int iovcnt, uint64_t offset_blocks,

		uint64_t num_blocks, spdk_bdev_io_completion_cb cb, void *cb_arg,

		struct spdk_bdev_ext_io_opts *opts), 0);



DEFINE_STUB(spdk_bdev_nvme_admin_passthru, int,

	    (struct spdk_bdev_desc *desc, struct spdk_io_channel *ch,

	     const struct spdk_nvme_cmd *cmd, void *buf, size_t nbytes,