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

module/raid: simplify raid_bdev_queue_io_wait()

Browse Source 
Pass raid_io instead of bdev_io to raid_bdev_queue_io_wait() and its
callbacks to eliminate unnecessary type conversions. Pass bdev and
io_channel directly as parameters instead of passing a base device
index.

Signed-off-by: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
Change-Id: Iecbf351ec1598b29709e7ccff2efb1776faf11f9
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/471086
Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Artur Paszkiewicz 2019-10-10 12:39:08 +02:00 committed by Tomasz Zawadzki
parent 235cc2c956
commit ae70d6a4a6
3 changed files with 25 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -315,35 +315,30 @@ raid_bdev_base_io_completion(struct spdk_bdev_io *bdev_io, bool success, void *c
* raid_bdev_queue_io_wait function processes the IO which failed to submit. * raid_bdev_queue_io_wait function processes the IO which failed to submit.
* It will try to queue the IOs after storing the context to bdev wait queue logic. * It will try to queue the IOs after storing the context to bdev wait queue logic.
* params: * params:
* raid_bdev_io - pointer to raid bdev_io * raid_io - pointer to raid_bdev_io
* pd_idx - base_dev index in raid_bdev * bdev - the block device that the IO is submitted to
* cb_fn - callback when the spdk_bdev_io for base_bdev becomes available * ch - io channel
* cb_fn - callback when the spdk_bdev_io for bdev becomes available
* returns: * returns:
* none * none
*/ */
void void
raid_bdev_queue_io_wait(struct spdk_bdev_io *raid_bdev_io, uint8_t pd_idx, raid_bdev_queue_io_wait(struct raid_bdev_io *raid_io, struct spdk_bdev *bdev,
spdk_bdev_io_wait_cb cb_fn) struct spdk_io_channel *ch, spdk_bdev_io_wait_cb cb_fn)
{ {
struct raid_bdev_io *raid_io = (struct raid_bdev_io *)raid_bdev_io->driver_ctx; raid_io->waitq_entry.bdev = bdev;
struct raid_bdev *raid_bdev = raid_io->raid_bdev;
raid_io->waitq_entry.bdev = raid_bdev->base_bdev_info[pd_idx].bdev;
raid_io->waitq_entry.cb_fn = cb_fn; raid_io->waitq_entry.cb_fn = cb_fn;
raid_io->waitq_entry.cb_arg = raid_bdev_io; raid_io->waitq_entry.cb_arg = raid_io;
spdk_bdev_queue_io_wait(raid_bdev->base_bdev_info[pd_idx].bdev, spdk_bdev_queue_io_wait(bdev, ch, &raid_io->waitq_entry);
raid_io->raid_ch->base_channel[pd_idx],
&raid_io->waitq_entry);
} }
static void static void
raid_bdev_submit_reset_request(struct raid_bdev_io *raid_io); raid_bdev_submit_reset_request(struct raid_bdev_io *raid_io);
static void static void
_raid_bdev_submit_reset_request(void *_bdev_io) _raid_bdev_submit_reset_request(void *_raid_io)
{ {
struct spdk_bdev_io *bdev_io = _bdev_io; struct raid_bdev_io *raid_io = _raid_io;
struct raid_bdev_io *raid_io = (struct raid_bdev_io *)bdev_io->driver_ctx;
raid_bdev_submit_reset_request(raid_io); raid_bdev_submit_reset_request(raid_io);
} }
@ -382,7 +377,7 @@ raid_bdev_submit_reset_request(struct raid_bdev_io *raid_io)
if (ret == 0) { if (ret == 0) {
raid_io->base_bdev_io_submitted++; raid_io->base_bdev_io_submitted++;
} else if (ret == -ENOMEM) { } else if (ret == -ENOMEM) {
raid_bdev_queue_io_wait(bdev_io, i, raid_bdev_queue_io_wait(raid_io, base_info->bdev, base_ch,
_raid_bdev_submit_reset_request); _raid_bdev_submit_reset_request);
return; return;
} else { } else {

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

@ -275,7 +275,7 @@ raid0_submit_null_payload_request(struct raid_bdev_io *raid_io);
void void
raid_bdev_base_io_completion(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg); raid_bdev_base_io_completion(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg);
void void
raid_bdev_queue_io_wait(struct spdk_bdev_io *raid_bdev_io, uint8_t pd_idx, raid_bdev_queue_io_wait(struct raid_bdev_io *raid_io, struct spdk_bdev *bdev,
spdk_bdev_io_wait_cb cb_fn); struct spdk_io_channel *ch, spdk_bdev_io_wait_cb cb_fn);
#endif /* SPDK_BDEV_RAID_INTERNAL_H */ #endif /* SPDK_BDEV_RAID_INTERNAL_H */

36
module/bdev/raid/raid0.c
View File

@ -66,7 +66,12 @@ raid0_bdev_io_completion(struct spdk_bdev_io *bdev_io, bool success, void *cb_ar
} }
static void static void
raid0_waitq_io_process(void *ctx); _raid0_submit_rw_request(void *_raid_io)
{
struct raid_bdev_io *raid_io = _raid_io;
raid0_submit_rw_request(raid_io);
}
/* /*
* brief: * brief:
@ -139,7 +144,8 @@ raid0_submit_rw_request(struct raid_bdev_io *raid_io)
} }
if (ret == -ENOMEM) { if (ret == -ENOMEM) {
raid_bdev_queue_io_wait(bdev_io, pd_idx, raid0_waitq_io_process); raid_bdev_queue_io_wait(raid_io, base_info->bdev, base_ch,
_raid0_submit_rw_request);
} else if (ret != 0) { } else if (ret != 0) {
SPDK_ERRLOG("bdev io submit error not due to ENOMEM, it should not happen\n"); SPDK_ERRLOG("bdev io submit error not due to ENOMEM, it should not happen\n");
assert(false); assert(false);
@ -147,25 +153,6 @@ raid0_submit_rw_request(struct raid_bdev_io *raid_io)
} }
} }
/*
* brief:
* raid0_waitq_io_process function is the callback function
* registered by raid bdev module to bdev when bdev_io was unavailable
* for raid0 bdevs.
* params:
* ctx - pointer to raid_bdev_io
* returns:
* none
*/
static void
raid0_waitq_io_process(void *ctx)
{
struct spdk_bdev_io *bdev_io = ctx;
struct raid_bdev_io *raid_io = (struct raid_bdev_io *)bdev_io->driver_ctx;
raid0_submit_rw_request(raid_io);
}
/* raid0 IO range */ /* raid0 IO range */
struct raid_bdev_io_range { struct raid_bdev_io_range {
uint64_t strip_size; uint64_t strip_size;
@ -262,10 +249,9 @@ _raid0_split_io_range(struct raid_bdev_io_range *io_range, uint8_t disk_idx,
} }
static void static void
_raid0_submit_null_payload_request(void *_bdev_io) _raid0_submit_null_payload_request(void *_raid_io)
{ {
struct spdk_bdev_io *bdev_io = _bdev_io; struct raid_bdev_io *raid_io = _raid_io;
struct raid_bdev_io *raid_io = (struct raid_bdev_io *)bdev_io->driver_ctx;
raid0_submit_null_payload_request(raid_io); raid0_submit_null_payload_request(raid_io);
} }
@ -336,7 +322,7 @@ raid0_submit_null_payload_request(struct raid_bdev_io *raid_io)
if (ret == 0) { if (ret == 0) {
raid_io->base_bdev_io_submitted++; raid_io->base_bdev_io_submitted++;
} else if (ret == -ENOMEM) { } else if (ret == -ENOMEM) {
raid_bdev_queue_io_wait(bdev_io, disk_idx, raid_bdev_queue_io_wait(raid_io, base_info->bdev, base_ch,
_raid0_submit_null_payload_request); _raid0_submit_null_payload_request);
return; return;
} else { } else {