From 48b4a2545ac2d46b256ad777a0e826bef228de8d Mon Sep 17 00:00:00 2001 From: Xiaodong Liu Date: Mon, 25 Feb 2019 00:27:50 +0800 Subject: [PATCH] bdev/raid: add io_expected in struct raid_bdev_io base_bdev_io_expected can be used for the situation that IO requries multiple and uncertain number of base bdevs. Change-Id: I912400f839c02c95606bc94e7c8ad4946e90b6bf Signed-off-by: Xiaodong Liu Reviewed-on: https://review.gerrithub.io/c/446009 Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Jim Harris Reviewed-by: Changpeng Liu --- lib/bdev/raid/bdev_raid.c | 6 ++++-- lib/bdev/raid/bdev_raid.h | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/bdev/raid/bdev_raid.c b/lib/bdev/raid/bdev_raid.c index 687dd1d59..a592f19b7 100644 --- a/lib/bdev/raid/bdev_raid.c +++ b/lib/bdev/raid/bdev_raid.c @@ -479,7 +479,6 @@ static void 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 raid_bdev *raid_bdev = (struct raid_bdev *)parent_io->bdev->ctxt; struct raid_bdev_io *raid_io = (struct raid_bdev_io *)parent_io->driver_ctx; spdk_bdev_free_io(bdev_io); @@ -489,7 +488,7 @@ raid_bdev_base_io_completion(struct spdk_bdev_io *bdev_io, bool success, void *c } raid_io->base_bdev_io_completed++; - if (raid_io->base_bdev_io_completed == raid_bdev->num_base_bdevs) { + if (raid_io->base_bdev_io_completed == raid_io->base_bdev_io_expected) { spdk_bdev_io_complete(parent_io, raid_io->base_bdev_io_status); } } @@ -584,11 +583,14 @@ static void _raid_bdev_submit_reset_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io) { struct raid_bdev_io *raid_io; + struct raid_bdev *raid_bdev; + raid_bdev = (struct raid_bdev *)bdev_io->bdev->ctxt; raid_io = (struct raid_bdev_io *)bdev_io->driver_ctx; raid_io->ch = ch; raid_io->base_bdev_io_submitted = 0; raid_io->base_bdev_io_completed = 0; + raid_io->base_bdev_io_expected = raid_bdev->num_base_bdevs; raid_io->base_bdev_io_status = SPDK_BDEV_IO_STATUS_SUCCESS; _raid_bdev_submit_reset_request_next(bdev_io); } diff --git a/lib/bdev/raid/bdev_raid.h b/lib/bdev/raid/bdev_raid.h index b016fc111..2fc9c101c 100644 --- a/lib/bdev/raid/bdev_raid.h +++ b/lib/bdev/raid/bdev_raid.h @@ -143,6 +143,7 @@ struct raid_bdev_io { /* Used for tracking progress on io requests sent to member disks. */ uint8_t base_bdev_io_submitted; uint8_t base_bdev_io_completed; + uint8_t base_bdev_io_expected; uint8_t base_bdev_io_status; };