[PULL,06/14] mirror: optimize dirty bitmap filling in mirror_run a bit

Commit Message

Jeff Cody July 20, 2016, 12:20 a.m. UTC

From: "Denis V. Lunev" <[e-mail]>

There is no need to scan allocation tables if we have mark_all_dirty flag
set. Just mark it all dirty.

Signed-off-by: Denis V. Lunev <[e-mail]>
Reviewed-by: Vladimir Sementsov-Ogievskiy<[e-mail]>
Reviewed-by: Eric Blake <[e-mail]>
Reviewed-by: John Snow <[e-mail]>
Reviewed-by: Fam Zheng <[e-mail]>
Message-id: [e-mail]
CC: Stefan Hajnoczi <[e-mail]>
CC: Kevin Wolf <[e-mail]>
CC: Max Reitz <[e-mail]>
CC: Jeff Cody <[e-mail]>
Signed-off-by: Jeff Cody <[e-mail]>
---
 block/mirror.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Patch

diff --git a/block/mirror.c b/block/mirror.c
index 0e74666..b7b1ded 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -533,11 +533,15 @@  static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s)
     BlockDriverState *base = s->base;
     BlockDriverState *bs = blk_bs(s->common.blk);
     BlockDriverState *target_bs = blk_bs(s->target);
-    bool mark_all_dirty = base == NULL && !bdrv_has_zero_init(target_bs);
     int ret, n;
 
     end = s->bdev_length / BDRV_SECTOR_SIZE;
 
+    if (base == NULL && !bdrv_has_zero_init(target_bs)) {
+        bdrv_set_dirty_bitmap(s->dirty_bitmap, 0, end);
+        return 0;
+    }
+
     /* First part, loop on the sectors and initialize the dirty bitmap.  */
     for (sector_num = 0; sector_num < end; ) {
         /* Just to make sure we are not exceeding int limit. */
@@ -556,7 +560,7 @@  static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s)
         }
 
         assert(n > 0);
-        if (ret == 1 || mark_all_dirty) {
+        if (ret == 1) {
             bdrv_set_dirty_bitmap(s->dirty_bitmap, sector_num, n);
         }
         sector_num += n;