Commit 6e03e49b authored by Artur Paszkiewicz's avatar Artur Paszkiewicz Committed by Tomasz Zawadzki
Browse files

module/raid: make struct raid_bdev_io_channel private to bdev_raid 



Define getters for accessing only the necessary raid_ch data from the
raid modules.

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


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

module/bdev/raid/bdev_raid.c

+26 −0
Original line number Diff line number Diff line
@@ -20,6 +20,18 @@ struct raid_all_tailq g_raid_bdev_list = TAILQ_HEAD_INITIALIZER(g_raid_bdev_list 


static TAILQ_HEAD(, raid_bdev_module) g_raid_modules = TAILQ_HEAD_INITIALIZER(g_raid_modules);



/*

 * raid_bdev_io_channel is the context of spdk_io_channel for raid bdev device. It

 * contains the relationship of raid bdev io channel with base bdev io channels.

 */

struct raid_bdev_io_channel {

	/* Array of IO channels of base bdevs */

	struct spdk_io_channel	**base_channel;



	/* Private raid module IO channel */

	struct spdk_io_channel	*module_channel;

};



static struct raid_bdev_module *

raid_bdev_module_find(enum raid_level level)

{
@@ -46,6 +58,20 @@ raid_bdev_module_list_add(struct raid_bdev_module *raid_module) 
	}

}



struct spdk_io_channel *

raid_bdev_channel_get_base_channel(struct raid_bdev_io_channel *raid_ch, uint8_t idx)

{

	return raid_ch->base_channel[idx];

}



void *

raid_bdev_channel_get_module_ctx(struct raid_bdev_io_channel *raid_ch)

{

	assert(raid_ch->module_channel != NULL);



	return spdk_io_channel_get_ctx(raid_ch->module_channel);

}



/* Function declarations */

static void	raid_bdev_examine(struct spdk_bdev *bdev);

static int	raid_bdev_init(void);

module/bdev/raid/bdev_raid.h

+4 −11
Original line number Diff line number Diff line
@@ -201,17 +201,7 @@ struct raid_bdev { 
#define RAID_FOR_EACH_BASE_BDEV(r, i) \

	for (i = r->base_bdev_info; i < r->base_bdev_info + r->num_base_bdevs; i++)



/*

 * raid_bdev_io_channel is the context of spdk_io_channel for raid bdev device. It

 * contains the relationship of raid bdev io channel with base bdev io channels.

 */

struct raid_bdev_io_channel {

	/* Array of IO channels of base bdevs */

	struct spdk_io_channel	**base_channel;



	/* Private raid module IO channel */

	struct spdk_io_channel	*module_channel;

};

struct raid_bdev_io_channel;



/* TAIL head for raid bdev list */

TAILQ_HEAD(raid_all_tailq, raid_bdev);
@@ -233,6 +223,9 @@ const char *raid_bdev_state_to_str(enum raid_bdev_state state); 
void raid_bdev_write_info_json(struct raid_bdev *raid_bdev, struct spdk_json_write_ctx *w);

int raid_bdev_remove_base_bdev(struct spdk_bdev *base_bdev, raid_bdev_remove_base_bdev_cb cb_fn,

			       void *cb_ctx);

struct spdk_io_channel *raid_bdev_channel_get_base_channel(struct raid_bdev_io_channel *raid_ch,

		uint8_t idx);

void *raid_bdev_channel_get_module_ctx(struct raid_bdev_io_channel *raid_ch);



/*

 * RAID module descriptor

module/bdev/raid/concat.c

+2 −3
Original line number Diff line number Diff line
@@ -100,8 +100,7 @@ concat_submit_rw_request(struct raid_bdev_io *raid_io) 
	 * function and function callback context

	 */

	assert(raid_ch != NULL);

	assert(raid_ch->base_channel);

	base_ch = raid_ch->base_channel[pd_idx];

	base_ch = raid_bdev_channel_get_base_channel(raid_ch, pd_idx);



	io_opts.size = sizeof(io_opts);

	io_opts.memory_domain = raid_io->memory_domain;
@@ -236,7 +235,7 @@ concat_submit_null_payload_request(struct raid_bdev_io *raid_io) 
			continue;

		}

		base_info = &raid_bdev->base_bdev_info[i];

		base_ch = raid_io->raid_ch->base_channel[i];

		base_ch = raid_bdev_channel_get_base_channel(raid_io->raid_ch, i);

		switch (raid_io->type) {

		case SPDK_BDEV_IO_TYPE_UNMAP:

			ret = raid_bdev_unmap_blocks(base_info, base_ch,

module/bdev/raid/raid0.c

+2 −3
Original line number Diff line number Diff line
@@ -101,8 +101,7 @@ raid0_submit_rw_request(struct raid_bdev_io *raid_io) 
	 * function and function callback context

	 */

	assert(raid_ch != NULL);

	assert(raid_ch->base_channel);

	base_ch = raid_ch->base_channel[pd_idx];

	base_ch = raid_bdev_channel_get_base_channel(raid_ch, pd_idx);



	io_opts.size = sizeof(io_opts);

	io_opts.memory_domain = raid_io->memory_domain;
@@ -294,7 +293,7 @@ raid0_submit_null_payload_request(struct raid_bdev_io *raid_io) 
		 */

		disk_idx = (io_range.start_disk + raid_io->base_bdev_io_submitted) % raid_bdev->num_base_bdevs;

		base_info = &raid_bdev->base_bdev_info[disk_idx];

		base_ch = raid_io->raid_ch->base_channel[disk_idx];

		base_ch = raid_bdev_channel_get_base_channel(raid_io->raid_ch, disk_idx);



		_raid0_split_io_range(&io_range, disk_idx, &offset_in_disk, &nblocks_in_disk);

module/bdev/raid/raid1.c

+6 −6
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ static void 
raid1_channel_inc_read_counters(struct raid_bdev_io_channel *raid_ch, uint8_t idx,

				uint64_t num_blocks)

{

	struct raid1_io_channel *raid1_ch = spdk_io_channel_get_ctx(raid_ch->module_channel);

	struct raid1_io_channel *raid1_ch = raid_bdev_channel_get_module_ctx(raid_ch);



	assert(raid1_ch->read_blocks_outstanding[idx] <= UINT64_MAX - num_blocks);

	raid1_ch->read_blocks_outstanding[idx] += num_blocks;
@@ -32,7 +32,7 @@ static void 
raid1_channel_dec_read_counters(struct raid_bdev_io_channel *raid_ch, uint8_t idx,

				uint64_t num_blocks)

{

	struct raid1_io_channel *raid1_ch = spdk_io_channel_get_ctx(raid_ch->module_channel);

	struct raid1_io_channel *raid1_ch = raid_bdev_channel_get_module_ctx(raid_ch);



	assert(raid1_ch->read_blocks_outstanding[idx] >= num_blocks);

	raid1_ch->read_blocks_outstanding[idx] -= num_blocks;
@@ -90,13 +90,13 @@ raid1_init_ext_io_opts(struct spdk_bdev_ext_io_opts *opts, struct raid_bdev_io * 
static uint8_t

raid1_channel_next_read_base_bdev(struct raid_bdev *raid_bdev, struct raid_bdev_io_channel *raid_ch)

{

	struct raid1_io_channel *raid1_ch = spdk_io_channel_get_ctx(raid_ch->module_channel);

	struct raid1_io_channel *raid1_ch = raid_bdev_channel_get_module_ctx(raid_ch);

	uint64_t read_blocks_min = UINT64_MAX;

	uint8_t idx = UINT8_MAX;

	uint8_t i;



	for (i = 0; i < raid_bdev->num_base_bdevs; i++) {

		if (raid_ch->base_channel[i] != NULL &&

		if (raid_bdev_channel_get_base_channel(raid_ch, i) != NULL &&

		    raid1_ch->read_blocks_outstanding[i] < read_blocks_min) {

			read_blocks_min = raid1_ch->read_blocks_outstanding[i];

			idx = i;
@@ -124,7 +124,7 @@ raid1_submit_read_request(struct raid_bdev_io *raid_io) 
	}



	base_info = &raid_bdev->base_bdev_info[idx];

	base_ch = raid_ch->base_channel[idx];

	base_ch = raid_bdev_channel_get_base_channel(raid_ch, idx);



	raid_io->base_bdev_io_remaining = 1;
@@ -163,7 +163,7 @@ raid1_submit_write_request(struct raid_bdev_io *raid_io) 
	raid1_init_ext_io_opts(&io_opts, raid_io);

	for (idx = raid_io->base_bdev_io_submitted; idx < raid_bdev->num_base_bdevs; idx++) {

		base_info = &raid_bdev->base_bdev_info[idx];

		base_ch = raid_io->raid_ch->base_channel[idx];

		base_ch = raid_bdev_channel_get_base_channel(raid_io->raid_ch, idx);



		if (base_ch == NULL) {

			/* skip a missing base bdev's slot */