ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

module/raid: remove struct raid_fn_table

Browse Source 
Something similar will be re-introduced in the upcoming patches, but
remove this for now to simplify refactoring.

Signed-off-by: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
Change-Id: I6b520a63ecfe9a1ae0c855507601c8aeeca03e8a
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/471075
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Artur Paszkiewicz 2019-10-08 11:37:56 +02:00 committed by Jim Harris
parent f614a7014c
commit ef775d6453
2 changed files with 8 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
module/bdev/raid/bdev_raid.c
View File

@ -415,9 +415,9 @@ raid_bdev_io_submit_fail_process(struct raid_bdev *raid_bdev, struct spdk_bdev_i
spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_FAILED); spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_FAILED);
} else { } else {
/* Queue the IO to bdev layer wait queue */ /* Queue the IO to bdev layer wait queue */
pd_idx = raid_bdev->fn_table->get_curr_base_index(raid_bdev, raid_io); pd_idx = raid0_get_curr_base_bdev_index(raid_bdev, raid_io);
raid_io->waitq_entry.bdev = raid_bdev->base_bdev_info[pd_idx].bdev; raid_io->waitq_entry.bdev = raid_bdev->base_bdev_info[pd_idx].bdev;
raid_io->waitq_entry.cb_fn = raid_bdev->fn_table->waitq_io_process; raid_io->waitq_entry.cb_fn = raid0_waitq_io_process;
raid_io->waitq_entry.cb_arg = raid_io; raid_io->waitq_entry.cb_arg = raid_io;
raid_ch = spdk_io_channel_get_ctx(raid_io->ch); raid_ch = spdk_io_channel_get_ctx(raid_io->ch);
if (spdk_bdev_queue_io_wait(raid_bdev->base_bdev_info[pd_idx].bdev, if (spdk_bdev_queue_io_wait(raid_bdev->base_bdev_info[pd_idx].bdev,
@ -709,7 +709,7 @@ _raid_bdev_submit_null_payload_request_next(void *_bdev_io)
raid_io = (struct raid_bdev_io *)bdev_io->driver_ctx; raid_io = (struct raid_bdev_io *)bdev_io->driver_ctx;
raid_ch = spdk_io_channel_get_ctx(raid_io->ch); raid_ch = spdk_io_channel_get_ctx(raid_io->ch);
raid_bdev->fn_table->get_io_range(&io_range, raid_bdev->num_base_bdevs, _raid0_get_io_range(&io_range, raid_bdev->num_base_bdevs,
raid_bdev->strip_size, raid_bdev->strip_size_shift, raid_bdev->strip_size, raid_bdev->strip_size_shift,
bdev_io->u.bdev.offset_blocks, bdev_io->u.bdev.num_blocks); bdev_io->u.bdev.offset_blocks, bdev_io->u.bdev.num_blocks);
@ -725,7 +725,7 @@ _raid_bdev_submit_null_payload_request_next(void *_bdev_io)
*/ */
disk_idx = (io_range.start_disk + raid_io->base_bdev_io_submitted) % raid_bdev->num_base_bdevs; disk_idx = (io_range.start_disk + raid_io->base_bdev_io_submitted) % raid_bdev->num_base_bdevs;
raid_bdev->fn_table->split_io_range(&io_range, disk_idx, &offset_in_disk, &nblocks_in_disk); _raid0_split_io_range(&io_range, disk_idx, &offset_in_disk, &nblocks_in_disk);
switch (bdev_io->type) { switch (bdev_io->type) {
case SPDK_BDEV_IO_TYPE_UNMAP: case SPDK_BDEV_IO_TYPE_UNMAP:
@ -799,16 +799,12 @@ static void
raid_bdev_get_buf_cb(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io, raid_bdev_get_buf_cb(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io,
bool success) bool success)
{ {
struct raid_bdev *raid_bdev;
raid_bdev = (struct raid_bdev *)bdev_io->bdev->ctxt;
if (!success) { if (!success) {
spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_FAILED); spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_FAILED);
return; return;
} }
raid_bdev->fn_table->start_rw_request(ch, bdev_io); raid0_start_rw_request(ch, bdev_io);
} }
/* /*
@ -825,17 +821,13 @@ raid_bdev_get_buf_cb(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io,
static void static void
raid_bdev_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io) raid_bdev_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io)
{ {
struct raid_bdev *raid_bdev;
raid_bdev = (struct raid_bdev *)bdev_io->bdev->ctxt;
switch (bdev_io->type) { switch (bdev_io->type) {
case SPDK_BDEV_IO_TYPE_READ: case SPDK_BDEV_IO_TYPE_READ:
spdk_bdev_io_get_buf(bdev_io, raid_bdev_get_buf_cb, spdk_bdev_io_get_buf(bdev_io, raid_bdev_get_buf_cb,
bdev_io->u.bdev.num_blocks * bdev_io->bdev->blocklen); bdev_io->u.bdev.num_blocks * bdev_io->bdev->blocklen);
break; break;
case SPDK_BDEV_IO_TYPE_WRITE: case SPDK_BDEV_IO_TYPE_WRITE:
raid_bdev->fn_table->start_rw_request(ch, bdev_io); raid0_start_rw_request(ch, bdev_io);
break; break;
case SPDK_BDEV_IO_TYPE_RESET: case SPDK_BDEV_IO_TYPE_RESET:
@ -1515,14 +1507,6 @@ raid_bdev_init(void)
return 0; return 0;
} }
static const struct raid_fn_table g_raid0_fn_table = {
.start_rw_request = raid0_start_rw_request,
.get_curr_base_index = raid0_get_curr_base_bdev_index,
.waitq_io_process = raid0_waitq_io_process,
.get_io_range = _raid0_get_io_range,
.split_io_range = _raid0_split_io_range,
};
/* /*
* brief: * brief:
* raid_bdev_create allocates raid bdev based on passed configuration * raid_bdev_create allocates raid bdev based on passed configuration
@ -1565,7 +1549,6 @@ raid_bdev_create(struct raid_bdev_config *raid_cfg)
switch (raid_bdev->raid_level) { switch (raid_bdev->raid_level) {
case RAID0: case RAID0:
raid_bdev->fn_table = &g_raid0_fn_table;
break; break;
default: default:
SPDK_ERRLOG("invalid raid level %u\n", raid_bdev->raid_level); SPDK_ERRLOG("invalid raid level %u\n", raid_bdev->raid_level);

16
module/bdev/raid/bdev_raid.h
View File

@ -112,19 +112,6 @@ struct raid_bdev_io_range {
uint8_t n_disks_involved; uint8_t n_disks_involved;
}; };
struct raid_bdev;
struct raid_fn_table {
void (*start_rw_request)(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io);
void (*waitq_io_process)(void *ctx);
uint8_t (*get_curr_base_index)(struct raid_bdev *raid_bdev, struct raid_bdev_io *raid_io);
void (*get_io_range)(struct raid_bdev_io_range *io_range,
uint8_t num_base_bdevs, uint64_t strip_size, uint64_t strip_size_shift,
uint64_t offset_blocks, uint64_t num_blocks);
void (*split_io_range)(struct raid_bdev_io_range *io_range, uint8_t disk_idx,
uint64_t *_offset_in_disk, uint64_t *_nblocks_in_disk);
};
/* /*
* raid_bdev is the single entity structure which contains SPDK block device * raid_bdev is the single entity structure which contains SPDK block device
* and the information related to any raid bdev either configured or * and the information related to any raid bdev either configured or
@ -175,9 +162,6 @@ struct raid_bdev {
/* Set to true if destroy of this raid bdev is started. */ /* Set to true if destroy of this raid bdev is started. */
bool destroy_started; bool destroy_started;
/* function table for RAID operations */
const struct raid_fn_table *fn_table;
}; };
/* /*