Commit 2c9dfc37 authored by Slawomir Ptak's avatar Slawomir Ptak Committed by Tomasz Zawadzki
Browse files

module/raid: Move the RAID I/O wrappers 



Move the RAID I/O wrappers from the header to the C file,
since those functions need to be extended with some additional
logic related to DIF/DIX handling.

Change-Id: I7cce52b950ebb75905e43874a3b44b041adb0df2
Signed-off-by: default avatarSlawomir Ptak <slawomir.ptak@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/21898


Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Reviewed-by: default avatarArtur Paszkiewicz <artur.paszkiewicz@intel.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
parent d112ea1a

module/bdev/raid/bdev_raid.c

+26 −0
Original line number Diff line number Diff line
@@ -481,6 +481,32 @@ raid_bdev_destruct(void *ctx) 
	return 1;

}



/**

 * Raid bdev I/O read/write wrapper for spdk_bdev_readv_blocks_ext function.

 */

int

raid_bdev_readv_blocks_ext(struct raid_base_bdev_info *base_info, 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)

{

	return spdk_bdev_readv_blocks_ext(base_info->desc, ch, iov, iovcnt,

					  base_info->data_offset + offset_blocks, num_blocks, cb, cb_arg, opts);

}



/**

 * Raid bdev I/O read/write wrapper for spdk_bdev_writev_blocks_ext function.

 */

int

raid_bdev_writev_blocks_ext(struct raid_base_bdev_info *base_info, 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)

{

	return spdk_bdev_writev_blocks_ext(base_info->desc, ch, iov, iovcnt,

					   base_info->data_offset + offset_blocks, num_blocks, cb, cb_arg, opts);

}



void

raid_bdev_io_complete(struct raid_bdev_io *raid_io, enum spdk_bdev_io_status status)

{

module/bdev/raid/bdev_raid.h

+8 −18
Original line number Diff line number Diff line
@@ -372,28 +372,18 @@ raid_bdev_base_bdev_slot(struct raid_base_bdev_info *base_info) 
/**

 * Raid bdev I/O read/write wrapper for spdk_bdev_readv_blocks_ext function.

 */

static inline int

raid_bdev_readv_blocks_ext(struct raid_base_bdev_info *base_info, struct spdk_io_channel *ch,

int raid_bdev_readv_blocks_ext(struct raid_base_bdev_info *base_info, 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)

{

	return spdk_bdev_readv_blocks_ext(base_info->desc, ch, iov, iovcnt,

					  base_info->data_offset + offset_blocks, num_blocks, cb, cb_arg, opts);

}

			       struct spdk_bdev_ext_io_opts *opts);



/**

 * Raid bdev I/O read/write wrapper for spdk_bdev_writev_blocks_ext function.

 */

static inline int

raid_bdev_writev_blocks_ext(struct raid_base_bdev_info *base_info, struct spdk_io_channel *ch,

int raid_bdev_writev_blocks_ext(struct raid_base_bdev_info *base_info, 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)

{

	return spdk_bdev_writev_blocks_ext(base_info->desc, ch, iov, iovcnt,

					   base_info->data_offset + offset_blocks, num_blocks, cb, cb_arg, opts);

}

				struct spdk_bdev_ext_io_opts *opts);



/**

 * Raid bdev I/O read/write wrapper for spdk_bdev_unmap_blocks function.

test/unit/lib/bdev/raid/common.c

+20 −0
Original line number Diff line number Diff line
@@ -244,3 +244,23 @@ raid_bdev_io_complete_part(struct raid_bdev_io *raid_io, uint64_t completed, 
		return false;

	}

}



int

raid_bdev_readv_blocks_ext(struct raid_base_bdev_info *base_info, 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)

{

	return spdk_bdev_readv_blocks_ext(base_info->desc, ch, iov, iovcnt,

					  base_info->data_offset + offset_blocks, num_blocks, cb, cb_arg, opts);

}



int

raid_bdev_writev_blocks_ext(struct raid_base_bdev_info *base_info, 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)

{

	return spdk_bdev_writev_blocks_ext(base_info->desc, ch, iov, iovcnt,

					   base_info->data_offset + offset_blocks, num_blocks, cb, cb_arg, opts);

}