From 869dc3d0f19b192a3ccc5d86b9cce8d5d7479421 Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Sun, 6 Sep 2015 08:13:37 +0200 Subject: [PATCH 2/8] mirror: Speed up bitmap initial scanning Message-id: <1441527217-25655-1-git-send-email-famz@redhat.com> Patchwork-id: 67673 O-Subject: [RHEL-7.2 qemu-kvm-rhev PATCH] mirror: Speed up bitmap initial scanning Bugzilla: 1259229 RH-Acked-by: Miroslav Rezanina RH-Acked-by: Kevin Wolf RH-Acked-by: Stefan Hajnoczi Limiting to sectors_per_chunk for each bdrv_is_allocated_above is slow, because the underlying protocol driver would issue much more queries than necessary. We should coalesce the query. Signed-off-by: Fam Zheng Reviewed-by: Stefan Hajnoczi Message-id: <1436413678-7114-4-git-send-email-famz@redhat.com> Signed-off-by: Stefan Hajnoczi (cherry picked from commit 999006975840f8cdf2038a587d852a6cbfe58e3b) Signed-off-by: Fam Zheng Conflicts: block/mirror.c Contextual conflict. We don't have "block: Ensure consistent bitmap function prototypes" in RHEL. Signed-off-by: Miroslav Rezanina --- block/mirror.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index d06a0be..7c2c27d 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -399,7 +399,7 @@ static void coroutine_fn mirror_run(void *opaque) MirrorBlockJob *s = opaque; MirrorExitData *data; BlockDriverState *bs = s->common.bs; - int64_t sector_num, end, sectors_per_chunk, length; + int64_t sector_num, end, length; uint64_t last_pause_ns; BlockDriverInfo bdi; char backing_filename[2]; /* we only need 2 characters because we are only @@ -453,7 +453,6 @@ static void coroutine_fn mirror_run(void *opaque) goto immediate_exit; } - sectors_per_chunk = s->granularity >> BDRV_SECTOR_BITS; mirror_free_init(s); last_pause_ns = qemu_clock_get_ns(QEMU_CLOCK_REALTIME); @@ -461,7 +460,9 @@ static void coroutine_fn mirror_run(void *opaque) /* First part, loop on the sectors and initialize the dirty bitmap. */ BlockDriverState *base = s->base; for (sector_num = 0; sector_num < end; ) { - int64_t next = (sector_num | (sectors_per_chunk - 1)) + 1; + /* Just to make sure we are not exceeding int limit. */ + int nb_sectors = MIN(INT_MAX >> BDRV_SECTOR_BITS, + end - sector_num); int64_t now = qemu_clock_get_ns(QEMU_CLOCK_REALTIME); if (now - last_pause_ns > SLICE_TIME) { @@ -473,8 +474,7 @@ static void coroutine_fn mirror_run(void *opaque) goto immediate_exit; } - ret = bdrv_is_allocated_above(bs, base, - sector_num, next - sector_num, &n); + ret = bdrv_is_allocated_above(bs, base, sector_num, nb_sectors, &n); if (ret < 0) { goto immediate_exit; @@ -483,10 +483,8 @@ static void coroutine_fn mirror_run(void *opaque) assert(n > 0); if (ret == 1) { bdrv_set_dirty_bitmap(bs, s->dirty_bitmap, sector_num, n); - sector_num = next; - } else { - sector_num += n; } + sector_num += n; } } -- 1.8.3.1