Commit 614ca6d2 authored by Artur Paszkiewicz's avatar Artur Paszkiewicz Committed by Tomasz Zawadzki
Browse files

module/raid: add wrappers for base bdev io functions 



These will be used by the next patch for implementing base bdev data
offset.

Change-Id: Ib225474672a6980b797ab21b2b5a118709406dd2
Signed-off-by: default avatarArtur Paszkiewicz <artur.paszkiewicz@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/18151


Reviewed-by: default avatarSlawomir Ptak <slawomir.ptak@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent e39760fd

module/bdev/raid/bdev_raid.h

+48 −0
Original line number Diff line number Diff line
@@ -276,4 +276,52 @@ void raid_bdev_queue_io_wait(struct raid_bdev_io *raid_io, struct spdk_bdev *bde 
void raid_bdev_io_complete(struct raid_bdev_io *raid_io, enum spdk_bdev_io_status status);

void raid_bdev_module_stop_done(struct raid_bdev *raid_bdev);



/**

 * 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,

			   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, offset_blocks, num_blocks, cb,

					  cb_arg, 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,

			    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, offset_blocks, num_blocks, cb,

					   cb_arg, opts);

}



/**

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

 */

static inline int

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

		       uint64_t offset_blocks, uint64_t num_blocks,

		       spdk_bdev_io_completion_cb cb, void *cb_arg)

{

	return spdk_bdev_unmap_blocks(base_info->desc, ch, offset_blocks, num_blocks, cb, cb_arg);

}



/**

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

 */

static inline int

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

		       uint64_t offset_blocks, uint64_t num_blocks,

		       spdk_bdev_io_completion_cb cb, void *cb_arg)

{

	return spdk_bdev_flush_blocks(base_info->desc, ch, offset_blocks, num_blocks, cb, cb_arg);

}



#endif /* SPDK_BDEV_RAID_INTERNAL_H */

module/bdev/raid/concat.c

+4 −4
Original line number Diff line number Diff line
@@ -110,12 +110,12 @@ concat_submit_rw_request(struct raid_bdev_io *raid_io) 
	io_opts.metadata = bdev_io->u.bdev.md_buf;



	if (bdev_io->type == SPDK_BDEV_IO_TYPE_READ) {

		ret = spdk_bdev_readv_blocks_ext(base_info->desc, base_ch,

		ret = raid_bdev_readv_blocks_ext(base_info, base_ch,

						 bdev_io->u.bdev.iovs, bdev_io->u.bdev.iovcnt,

						 pd_lba, pd_blocks, concat_bdev_io_completion,

						 raid_io, &io_opts);

	} else if (bdev_io->type == SPDK_BDEV_IO_TYPE_WRITE) {

		ret = spdk_bdev_writev_blocks_ext(base_info->desc, base_ch,

		ret = raid_bdev_writev_blocks_ext(base_info, base_ch,

						  bdev_io->u.bdev.iovs, bdev_io->u.bdev.iovcnt,

						  pd_lba, pd_blocks, concat_bdev_io_completion,

						  raid_io, &io_opts);
@@ -242,12 +242,12 @@ concat_submit_null_payload_request(struct raid_bdev_io *raid_io) 
		base_ch = raid_io->raid_ch->base_channel[i];

		switch (bdev_io->type) {

		case SPDK_BDEV_IO_TYPE_UNMAP:

			ret = spdk_bdev_unmap_blocks(base_info->desc, base_ch,

			ret = raid_bdev_unmap_blocks(base_info, base_ch,

						     pd_lba, pd_blocks,

						     concat_base_io_complete, raid_io);

			break;

		case SPDK_BDEV_IO_TYPE_FLUSH:

			ret = spdk_bdev_flush_blocks(base_info->desc, base_ch,

			ret = raid_bdev_flush_blocks(base_info, base_ch,

						     pd_lba, pd_blocks,

						     concat_base_io_complete, raid_io);

			break;

module/bdev/raid/raid0.c

+4 −4
Original line number Diff line number Diff line
@@ -111,12 +111,12 @@ raid0_submit_rw_request(struct raid_bdev_io *raid_io) 
	io_opts.metadata = bdev_io->u.bdev.md_buf;



	if (bdev_io->type == SPDK_BDEV_IO_TYPE_READ) {

		ret = spdk_bdev_readv_blocks_ext(base_info->desc, base_ch,

		ret = raid_bdev_readv_blocks_ext(base_info, base_ch,

						 bdev_io->u.bdev.iovs, bdev_io->u.bdev.iovcnt,

						 pd_lba, pd_blocks, raid0_bdev_io_completion,

						 raid_io, &io_opts);

	} else if (bdev_io->type == SPDK_BDEV_IO_TYPE_WRITE) {

		ret = spdk_bdev_writev_blocks_ext(base_info->desc, base_ch,

		ret = raid_bdev_writev_blocks_ext(base_info, base_ch,

						  bdev_io->u.bdev.iovs, bdev_io->u.bdev.iovcnt,

						  pd_lba, pd_blocks, raid0_bdev_io_completion,

						  raid_io, &io_opts);
@@ -303,13 +303,13 @@ raid0_submit_null_payload_request(struct raid_bdev_io *raid_io) 


		switch (bdev_io->type) {

		case SPDK_BDEV_IO_TYPE_UNMAP:

			ret = spdk_bdev_unmap_blocks(base_info->desc, base_ch,

			ret = raid_bdev_unmap_blocks(base_info, base_ch,

						     offset_in_disk, nblocks_in_disk,

						     raid0_base_io_complete, raid_io);

			break;



		case SPDK_BDEV_IO_TYPE_FLUSH:

			ret = spdk_bdev_flush_blocks(base_info->desc, base_ch,

			ret = raid_bdev_flush_blocks(base_info, base_ch,

						     offset_in_disk, nblocks_in_disk,

						     raid0_base_io_complete, raid_io);

			break;

module/bdev/raid/raid1.c

+2 −2
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ raid1_submit_read_request(struct raid_bdev_io *raid_io) 
	raid_io->base_bdev_io_remaining = 1;



	raid1_init_ext_io_opts(bdev_io, &io_opts);

	ret = spdk_bdev_readv_blocks_ext(base_info->desc, base_ch,

	ret = raid_bdev_readv_blocks_ext(base_info, base_ch,

					 bdev_io->u.bdev.iovs, bdev_io->u.bdev.iovcnt,

					 pd_lba, pd_blocks, raid1_read_bdev_io_completion,

					 raid_io, &io_opts);
@@ -183,7 +183,7 @@ raid1_submit_write_request(struct raid_bdev_io *raid_io) 
			continue;

		}



		ret = spdk_bdev_writev_blocks_ext(base_info->desc, base_ch,

		ret = raid_bdev_writev_blocks_ext(base_info, base_ch,

						  bdev_io->u.bdev.iovs, bdev_io->u.bdev.iovcnt,

						  pd_lba, pd_blocks, raid1_write_bdev_io_completion,

						  raid_io, &io_opts);

module/bdev/raid/raid5f.c

+3 −3
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ raid5f_chunk_submit(struct chunk *chunk) 
			return 0;

		}



		ret = spdk_bdev_writev_blocks_ext(base_info->desc, base_ch, chunk->iovs, chunk->iovcnt,

		ret = raid_bdev_writev_blocks_ext(base_info, base_ch, chunk->iovs, chunk->iovcnt,

						  base_offset_blocks, raid_bdev->strip_size,

						  raid5f_chunk_complete_bdev_io, chunk,

						  &chunk->ext_opts);
@@ -479,7 +479,7 @@ raid5f_chunk_submit(struct chunk *chunk) 


		base_offset_blocks += stripe_req->reconstruct.chunk_offset;



		ret = spdk_bdev_readv_blocks_ext(base_info->desc, base_ch, chunk->iovs, chunk->iovcnt,

		ret = raid_bdev_readv_blocks_ext(base_info, base_ch, chunk->iovs, chunk->iovcnt,

						 base_offset_blocks, bdev_io->u.bdev.num_blocks,

						 raid5f_chunk_complete_bdev_io, chunk,

						 &chunk->ext_opts);
@@ -785,7 +785,7 @@ raid5f_submit_read_request(struct raid_bdev_io *raid_io, uint64_t stripe_index, 
		return raid5f_submit_reconstruct_read(raid_io, stripe_index, chunk_idx, chunk_offset);

	}



	ret = spdk_bdev_readv_blocks_ext(base_info->desc, base_ch, bdev_io->u.bdev.iovs,

	ret = raid_bdev_readv_blocks_ext(base_info, base_ch, bdev_io->u.bdev.iovs,

					 bdev_io->u.bdev.iovcnt,

					 base_offset_blocks, bdev_io->u.bdev.num_blocks, raid5f_chunk_read_complete, raid_io,

					 &io_opts);