From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50078) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsZ7t-00008Q-Mn for qemu-devel@nongnu.org; Wed, 13 May 2015 12:03:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YsZ7n-0005zh-Fd for qemu-devel@nongnu.org; Wed, 13 May 2015 12:03:17 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:30977 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsZ7m-0005rh-Vy for qemu-devel@nongnu.org; Wed, 13 May 2015 12:03:11 -0400 From: Vladimir Sementsov-Ogievskiy Date: Wed, 13 May 2015 18:29:59 +0300 Message-Id: <1431531007-10269-5-git-send-email-vsementsov@parallels.com> In-Reply-To: <1431531007-10269-1-git-send-email-vsementsov@parallels.com> References: <1431531007-10269-1-git-send-email-vsementsov@parallels.com> Subject: [Qemu-devel] [PATCH 04/12] block: add meta bitmaps List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, quintela@redhat.com, dgilbert@redhat.com, vsementsov@parallels.com, stefanha@redhat.com, den@openvz.org, amit.shah@redhat.com, pbonzini@redhat.com, jsnow@redhat.com Meta bitmap is a 'dirty bitmap' for the BdrvDirtyBitmap. It tracks changes (set/unset) of this BdrvDirtyBitmap. It is needed for live migration of block dirty bitmaps. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ include/block/block.h | 7 +++++++ 2 files changed, 51 insertions(+) diff --git a/block.c b/block.c index 8376e8d..a167eb6 100644 --- a/block.c +++ b/block.c @@ -58,9 +58,15 @@ * (3) successor is set: frozen mode. * A frozen bitmap cannot be renamed, deleted, anonymized, cleared, set, * or enabled. A frozen bitmap can only abdicate() or reclaim(). + * + * Meta bitmap: + * Meta bitmap is a 'dirty bitmap' for the BdrvDirtyBitmap. It tracks changes + * (set/unset) of this BdrvDirtyBitmap. It is needed for live migration of + * block dirty bitmaps. */ struct BdrvDirtyBitmap { HBitmap *bitmap; /* Dirty sector bitmap implementation */ + HBitmap *meta_bitmap; /* Meta bitmap */ BdrvDirtyBitmap *successor; /* Anonymous child; implies frozen status */ char *name; /* Optional non-empty unique ID */ int64_t size; /* Size of the bitmap (Number of sectors) */ @@ -3062,6 +3068,35 @@ void bdrv_dirty_bitmap_make_anon(BdrvDirtyBitmap *bitmap) bitmap->name = NULL; } +HBitmap *bdrv_create_meta_bitmap(BdrvDirtyBitmap *bitmap, + uint64_t chunk_size) +{ + uint64_t sector_granularity; + + assert((chunk_size & (chunk_size - 1)) == 0); + + /* one chunk is corresponding to one bit of the meta bitmap, and each bit + * of the chunk is corresponding to 'bdrv_dirty_bitmap_granularity(bitmap)' + * bytes of the node */ + sector_granularity = + (chunk_size * 8 * bdrv_dirty_bitmap_granularity(bitmap)) + >> BDRV_SECTOR_BITS; + assert(sector_granularity); + + bitmap->meta_bitmap = + hbitmap_alloc(bitmap->size, ffsll(sector_granularity) - 1); + + return bitmap->meta_bitmap; +} + +void bdrv_release_meta_bitmap(BdrvDirtyBitmap *bitmap) +{ + if (bitmap->meta_bitmap) { + hbitmap_free(bitmap->meta_bitmap); + bitmap->meta_bitmap = NULL; + } +} + BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs, uint32_t granularity, const char *name, @@ -3212,6 +3247,9 @@ void bdrv_release_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap) assert(!bdrv_dirty_bitmap_frozen(bm)); QLIST_REMOVE(bitmap, list); hbitmap_free(bitmap->bitmap); + if (bitmap->meta_bitmap) { + hbitmap_free(bitmap->meta_bitmap); + } g_free(bitmap->name); g_free(bitmap); return; @@ -3297,6 +3335,9 @@ void bdrv_set_dirty_bitmap(BdrvDirtyBitmap *bitmap, { assert(bdrv_dirty_bitmap_enabled(bitmap)); hbitmap_set(bitmap->bitmap, cur_sector, nr_sectors); + if (bitmap->meta_bitmap) { + hbitmap_set(bitmap->meta_bitmap, cur_sector, nr_sectors); + } } void bdrv_reset_dirty_bitmap(BdrvDirtyBitmap *bitmap, @@ -3304,6 +3345,9 @@ void bdrv_reset_dirty_bitmap(BdrvDirtyBitmap *bitmap, { assert(bdrv_dirty_bitmap_enabled(bitmap)); hbitmap_reset(bitmap->bitmap, cur_sector, nr_sectors); + if (bitmap->meta_bitmap) { + hbitmap_set(bitmap->meta_bitmap, cur_sector, nr_sectors); + } } void bdrv_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap) diff --git a/include/block/block.h b/include/block/block.h index 1c16906..2d91161 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -4,6 +4,7 @@ #include "block/aio.h" #include "qemu-common.h" #include "qemu/option.h" +#include "qemu/hbitmap.h" #include "block/coroutine.h" #include "block/accounting.h" #include "qapi/qmp/qobject.h" @@ -497,6 +498,12 @@ void bdrv_dirty_bitmap_deserialize_zeroes(BdrvDirtyBitmap *bitmap, uint64_t start, uint64_t count); void bdrv_dirty_bitmap_deserialize_finish(BdrvDirtyBitmap *bitmap); +/* chunk size here is number of bytes of the @bitmap data per one bit of the + * meta bitmap being created */ +HBitmap *bdrv_create_meta_bitmap(BdrvDirtyBitmap *bitmap, + uint64_t granularity); +void bdrv_release_meta_bitmap(BdrvDirtyBitmap *bitmap); + void bdrv_enable_copy_on_read(BlockDriverState *bs); void bdrv_disable_copy_on_read(BlockDriverState *bs); -- 1.9.1