Commit 9bb02b9f authored by Ben Walker's avatar Ben Walker Committed by Jim Harris
Browse files

bdev: Move iov element outside of union 



This is potentially useful for more types of commands.

Change-Id: Ifbde7ae35294f581b8360891579836fd6f9573a6
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/416869


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 61469cf4

include/spdk/bdev_module.h

+3 −3
Original line number Diff line number Diff line
@@ -309,11 +309,11 @@ struct spdk_bdev_io { 
	/** Enumerated value representing the I/O type. */

	uint8_t type;



	union {

		struct {

			/** For basic IO case, use our own iovec element. */

	/** A single iovec element for use by this bdev_io. */

	struct iovec iov;



	union {

		struct {

			/** For SG buffer cases, array of iovecs to transfer. */

			struct iovec *iovs;

lib/bdev/bdev.c

+29 −14
Original line number Diff line number Diff line
@@ -380,9 +380,22 @@ spdk_bdev_get_by_name(const char *bdev_name) 
static void

spdk_bdev_io_set_buf(struct spdk_bdev_io *bdev_io, void *buf)

{

	struct iovec **iovs;

	int *iovcnt;



	assert(bdev_io->internal.get_buf_cb != NULL);

	assert(buf != NULL);

	assert(bdev_io->u.bdev.iovs != NULL);



	iovs = &bdev_io->u.bdev.iovs;

	iovcnt = &bdev_io->u.bdev.iovcnt;



	if (*iovs == NULL || *iovcnt == 0) {

		*iovs = &bdev_io->iov;

		*iovcnt = 1;

	}



	(*iovs)[0].iov_base = (void *)((unsigned long)((char *)buf + 512) & ~511UL);

	(*iovs)[0].iov_len = bdev_io->internal.buf_len;



	bdev_io->internal.buf = buf;

	bdev_io->u.bdev.iovs[0].iov_base = (void *)((unsigned long)((char *)buf + 512) & ~511UL);
@@ -1689,9 +1702,9 @@ spdk_bdev_read_blocks(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, 


	bdev_io->internal.ch = channel;

	bdev_io->type = SPDK_BDEV_IO_TYPE_READ;

	bdev_io->u.bdev.iov.iov_base = buf;

	bdev_io->u.bdev.iov.iov_len = num_blocks * bdev->blocklen;

	bdev_io->u.bdev.iovs = &bdev_io->u.bdev.iov;

	bdev_io->u.bdev.iovs = &bdev_io->iov;

	bdev_io->u.bdev.iovs[0].iov_base = buf;

	bdev_io->u.bdev.iovs[0].iov_len = num_blocks * bdev->blocklen;

	bdev_io->u.bdev.iovcnt = 1;

	bdev_io->u.bdev.num_blocks = num_blocks;

	bdev_io->u.bdev.offset_blocks = offset_blocks;
@@ -1784,9 +1797,9 @@ spdk_bdev_write_blocks(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, 


	bdev_io->internal.ch = channel;

	bdev_io->type = SPDK_BDEV_IO_TYPE_WRITE;

	bdev_io->u.bdev.iov.iov_base = buf;

	bdev_io->u.bdev.iov.iov_len = num_blocks * bdev->blocklen;

	bdev_io->u.bdev.iovs = &bdev_io->u.bdev.iov;

	bdev_io->u.bdev.iovs = &bdev_io->iov;

	bdev_io->u.bdev.iovs[0].iov_base = buf;

	bdev_io->u.bdev.iovs[0].iov_len = num_blocks * bdev->blocklen;

	bdev_io->u.bdev.iovcnt = 1;

	bdev_io->u.bdev.num_blocks = num_blocks;

	bdev_io->u.bdev.offset_blocks = offset_blocks;
@@ -1905,9 +1918,9 @@ spdk_bdev_write_zeroes_blocks(struct spdk_bdev_desc *desc, struct spdk_io_channe 
		}



		bdev_io->type = SPDK_BDEV_IO_TYPE_WRITE;

		bdev_io->u.bdev.iov.iov_base = g_bdev_mgr.zero_buffer;

		bdev_io->u.bdev.iov.iov_len = len;

		bdev_io->u.bdev.iovs = &bdev_io->u.bdev.iov;

		bdev_io->u.bdev.iovs = &bdev_io->iov;

		bdev_io->u.bdev.iovs[0].iov_base = g_bdev_mgr.zero_buffer;

		bdev_io->u.bdev.iovs[0].iov_len = len;

		bdev_io->u.bdev.iovcnt = 1;

		bdev_io->u.bdev.num_blocks = len / spdk_bdev_get_block_size(bdev);

		bdev_io->u.bdev.split_remaining_num_blocks = num_blocks - bdev_io->u.bdev.num_blocks;
@@ -1970,10 +1983,12 @@ spdk_bdev_unmap_blocks(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, 


	bdev_io->internal.ch = channel;

	bdev_io->type = SPDK_BDEV_IO_TYPE_UNMAP;

	bdev_io->u.bdev.iov.iov_base = NULL;

	bdev_io->u.bdev.iov.iov_len = 0;

	bdev_io->u.bdev.iovs = &bdev_io->u.bdev.iov;



	bdev_io->u.bdev.iovs = &bdev_io->iov;

	bdev_io->u.bdev.iovs[0].iov_base = NULL;

	bdev_io->u.bdev.iovs[0].iov_len = 0;

	bdev_io->u.bdev.iovcnt = 1;



	bdev_io->u.bdev.offset_blocks = offset_blocks;

	bdev_io->u.bdev.num_blocks = num_blocks;

	spdk_bdev_io_init(bdev_io, bdev, cb_arg, cb);
@@ -3158,7 +3173,7 @@ spdk_bdev_write_zeroes_split(struct spdk_bdev_io *bdev_io, bool success, void *c 
		       ZERO_BUFFER_SIZE);



	bdev_io->u.bdev.offset_blocks = bdev_io->u.bdev.split_current_offset_blocks;

	bdev_io->u.bdev.iov.iov_len = len;

	bdev_io->u.bdev.iovs[0].iov_len = len;

	bdev_io->u.bdev.num_blocks = len / spdk_bdev_get_block_size(bdev_io->bdev);

	bdev_io->u.bdev.split_remaining_num_blocks -= bdev_io->u.bdev.num_blocks;

	bdev_io->u.bdev.split_current_offset_blocks += bdev_io->u.bdev.num_blocks;

lib/bdev/virtio/bdev_virtio_scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ bdev_virtio_unmap(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io) 
	uint64_t offset_blocks, num_blocks;

	uint16_t cmd_len;



	buf = bdev_io->u.bdev.iov.iov_base;

	buf = bdev_io->u.bdev.iovs[0].iov_base;



	offset_blocks = bdev_io->u.bdev.offset_blocks;

	num_blocks = bdev_io->u.bdev.num_blocks;