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

bdev/raid: change related names for base_bdev involved

Browse Source 
The elements and functions which are used for raid reset io,
can also be used for other potential raid IO requests which
need multiple base_bdev involved.

Change-Id: Ide7ea190fdbd29da9f9fa22862a0a7c162509697
Signed-off-by: Xiaodong Liu <xiaodong.liu@intel.com>
Reviewed-on: https://review.gerrithub.io/c/441308
Reviewed-by: wuzhouhui <wuzhouhui@kingsoft.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Xiaodong Liu 2019-01-21 21:09:15 +08:00 committed by Changpeng Liu
parent f18b39f1a5
commit 31c528414f
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/bdev/raid/bdev_raid.c
View File

@ -467,16 +467,16 @@ raid_bdev_start_rw_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev
/* /*
* brief: * brief:
* raid_bdev_reset_completion is the completion callback for member disk resets * raid_bdev_base_io_completion is the completion callback for member disk requests
* params: * params:
* bdev_io - pointer to member disk reset bdev_io * bdev_io - pointer to member disk requested bdev_io
* success - true if reset was successful, false if unsuccessful * success - true if successful, false if unsuccessful
* cb_arg - callback argument (parent reset bdev_io) * cb_arg - callback argument (parent raid bdev_io)
* returns: * returns:
* none * none
*/ */
static void static void
raid_bdev_reset_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)
{ {
struct spdk_bdev_io *parent_io = cb_arg; struct spdk_bdev_io *parent_io = cb_arg;
struct raid_bdev *raid_bdev = (struct raid_bdev *)parent_io->bdev->ctxt; struct raid_bdev *raid_bdev = (struct raid_bdev *)parent_io->bdev->ctxt;
@ -485,12 +485,12 @@ raid_bdev_reset_completion(struct spdk_bdev_io *bdev_io, bool success, void *cb_
spdk_bdev_free_io(bdev_io); spdk_bdev_free_io(bdev_io);
if (!success) { if (!success) {
raid_io->base_bdev_reset_status = SPDK_BDEV_IO_STATUS_FAILED; raid_io->base_bdev_io_status = SPDK_BDEV_IO_STATUS_FAILED;
} }
raid_io->base_bdev_reset_completed++; raid_io->base_bdev_io_completed++;
if (raid_io->base_bdev_reset_completed == raid_bdev->num_base_bdevs) { if (raid_io->base_bdev_io_completed == raid_bdev->num_base_bdevs) {
spdk_bdev_io_complete(parent_io, raid_io->base_bdev_reset_status); spdk_bdev_io_complete(parent_io, raid_io->base_bdev_io_status);
} }
} }
@ -518,13 +518,13 @@ _raid_bdev_submit_reset_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);
while (raid_io->base_bdev_reset_submitted < raid_bdev->num_base_bdevs) { while (raid_io->base_bdev_io_submitted < raid_bdev->num_base_bdevs) {
i = raid_io->base_bdev_reset_submitted; i = raid_io->base_bdev_io_submitted;
ret = spdk_bdev_reset(raid_bdev->base_bdev_info[i].desc, ret = spdk_bdev_reset(raid_bdev->base_bdev_info[i].desc,
raid_ch->base_channel[i], raid_ch->base_channel[i],
raid_bdev_reset_completion, bdev_io); raid_bdev_base_io_completion, bdev_io);
if (ret == 0) { if (ret == 0) {
raid_io->base_bdev_reset_submitted++; raid_io->base_bdev_io_submitted++;
} else if (ret == -ENOMEM) { } else if (ret == -ENOMEM) {
raid_io->waitq_entry.bdev = raid_bdev->base_bdev_info[i].bdev; raid_io->waitq_entry.bdev = raid_bdev->base_bdev_info[i].bdev;
raid_io->waitq_entry.cb_fn = _raid_bdev_submit_reset_request_next; raid_io->waitq_entry.cb_fn = _raid_bdev_submit_reset_request_next;
@ -558,9 +558,9 @@ _raid_bdev_submit_reset_request(struct spdk_io_channel *ch, struct spdk_bdev_io
raid_io = (struct raid_bdev_io *)bdev_io->driver_ctx; raid_io = (struct raid_bdev_io *)bdev_io->driver_ctx;
raid_io->ch = ch; raid_io->ch = ch;
raid_io->base_bdev_reset_submitted = 0; raid_io->base_bdev_io_submitted = 0;
raid_io->base_bdev_reset_completed = 0; raid_io->base_bdev_io_completed = 0;
raid_io->base_bdev_reset_status = SPDK_BDEV_IO_STATUS_SUCCESS; raid_io->base_bdev_io_status = SPDK_BDEV_IO_STATUS_SUCCESS;
_raid_bdev_submit_reset_request_next(bdev_io); _raid_bdev_submit_reset_request_next(bdev_io);
} }

8
lib/bdev/raid/bdev_raid.h
View File

@ -140,10 +140,10 @@ struct raid_bdev_io {
/* Original channel for this IO, used in queuing logic */ /* Original channel for this IO, used in queuing logic */
struct spdk_io_channel *ch; struct spdk_io_channel *ch;
/* Used for tracking progress on resets sent to member disks. */ /* Used for tracking progress on io requests sent to member disks. */
uint8_t base_bdev_reset_submitted; uint8_t base_bdev_io_submitted;
uint8_t base_bdev_reset_completed; uint8_t base_bdev_io_completed;
uint8_t base_bdev_reset_status; uint8_t base_bdev_io_status;
}; };
/* /*