Commit 6127461c authored by matthewb's avatar matthewb Committed by Ben Walker
Browse files

lib/bdev: Added iov to spdk_bdev_zcopy_start 



Adding iov to the spdk_bdev_zcopy_start function enable spdk_bdev_zcopy_start to
be used by transport layers as the iov is owned by the transport command

Signed-off-by: default avatarmatthewb <matthew.burbridge@hpe.com>
Change-Id: I6d2be7f49566048bf25b7711ada8d2fb49fea6ee
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6816


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarMichael Haeuptle <michaelhaeuptle@gmail.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 51d7f9b1

CHANGELOG.md

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ Rados Cluster names. 
Removed ZCOPY emulation: The bdev module can be checked to see if it supports ZCOPY

and if not supported then use existing READ/WRITE commands.



Added iov to spdk_bdev_zcopy_start



## v21.04:



### accel

include/spdk/bdev.h

+3 −1
Original line number Diff line number Diff line
@@ -1226,6 +1226,8 @@ int spdk_bdev_comparev_and_writev_blocks(struct spdk_bdev_desc *desc, struct spd 
 *

 * \param desc Block device descriptor

 * \param ch I/O channel. Obtained by calling spdk_bdev_get_io_channel().

 * \param iov A scatter gather list to be populated with the buffers

 * \param iovcnt The maximum number of elements in iov.

 * \param offset_blocks The offset, in blocks, from the start of the block device.

 * \param num_blocks The number of blocks.

 * \param populate Whether the data buffer should be populated with the
@@ -1239,11 +1241,11 @@ int spdk_bdev_comparev_and_writev_blocks(struct spdk_bdev_desc *desc, struct spd 
 * negated errno on failure, in which case the callback will not be called.

 */

int spdk_bdev_zcopy_start(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch,

			  struct iovec *iov, int iovcnt,

			  uint64_t offset_blocks, uint64_t num_blocks,

			  bool populate,

			  spdk_bdev_io_completion_cb cb, void *cb_arg);





/**

 * Submit a request to release a data buffer representing a range of blocks.

 *

lib/bdev/bdev.c

+3 −2
Original line number Diff line number Diff line
@@ -4315,6 +4315,7 @@ spdk_bdev_comparev_and_writev_blocks(struct spdk_bdev_desc *desc, struct spdk_io 


int

spdk_bdev_zcopy_start(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch,

		      struct iovec *iov, int iovcnt,

		      uint64_t offset_blocks, uint64_t num_blocks,

		      bool populate,

		      spdk_bdev_io_completion_cb cb, void *cb_arg)
@@ -4345,8 +4346,8 @@ spdk_bdev_zcopy_start(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, 
	bdev_io->type = SPDK_BDEV_IO_TYPE_ZCOPY;

	bdev_io->u.bdev.num_blocks = num_blocks;

	bdev_io->u.bdev.offset_blocks = offset_blocks;

	bdev_io->u.bdev.iovs = NULL;

	bdev_io->u.bdev.iovcnt = 0;

	bdev_io->u.bdev.iovs = iov;

	bdev_io->u.bdev.iovcnt = iovcnt;

	bdev_io->u.bdev.md_buf = NULL;

	bdev_io->u.bdev.zcopy.populate = populate ? 1 : 0;

	bdev_io->u.bdev.zcopy.commit = 0;

lib/bdev/part.c

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ spdk_bdev_part_submit_request(struct spdk_bdev_part_channel *ch, struct spdk_bde 
				     bdev_part_complete_io, bdev_io);

		break;

	case SPDK_BDEV_IO_TYPE_ZCOPY:

		rc = spdk_bdev_zcopy_start(base_desc, base_ch, remapped_offset,

		rc = spdk_bdev_zcopy_start(base_desc, base_ch, NULL, 0, remapped_offset,

					   bdev_io->u.bdev.num_blocks, bdev_io->u.bdev.zcopy.populate,

					   bdev_part_complete_zcopy_io, bdev_io);

		break;

module/bdev/passthru/vbdev_passthru.c

+2 −1
Original line number Diff line number Diff line
@@ -347,7 +347,8 @@ vbdev_passthru_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *b 
				     _pt_complete_io, bdev_io);

		break;

	case SPDK_BDEV_IO_TYPE_ZCOPY:

		rc = spdk_bdev_zcopy_start(pt_node->base_desc, pt_ch->base_ch, bdev_io->u.bdev.offset_blocks,

		rc = spdk_bdev_zcopy_start(pt_node->base_desc, pt_ch->base_ch, NULL, 0,

					   bdev_io->u.bdev.offset_blocks,

					   bdev_io->u.bdev.num_blocks, bdev_io->u.bdev.zcopy.populate,

					   _pt_complete_zcopy_io, bdev_io);

		break;