From patchwork Wed Nov 11 15:16:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 542939 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4998C140281 for ; Thu, 12 Nov 2015 03:02:42 +1100 (AEDT) Received: from localhost ([::1]:41468 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwXr6-0006Z3-CC for incoming@patchwork.ozlabs.org; Wed, 11 Nov 2015 11:02:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55796) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwXkk-0004sb-9y for qemu-devel@nongnu.org; Wed, 11 Nov 2015 10:57:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZwXia-0003DB-WB for qemu-devel@nongnu.org; Wed, 11 Nov 2015 10:56:06 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:36687 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwXia-00037z-K1 for qemu-devel@nongnu.org; Wed, 11 Nov 2015 10:53:52 -0500 Received: from kvm.sw.ru ([10.28.8.145]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id tABFHHou005675; Wed, 11 Nov 2015 18:17:30 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Date: Wed, 11 Nov 2015 18:16:34 +0300 Message-Id: <1447255003-2043-5-git-send-email-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1447255003-2043-1-git-send-email-vsementsov@virtuozzo.com> References: <1447255003-2043-1-git-send-email-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 Cc: kwolf@redhat.com, peter.maydell@linaro.org, vsementsov@virtuozzo.com, quintela@redhat.com, dgilbert@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, amit.shah@redhat.com, den@openvz.org, jsnow@redhat.com Subject: [Qemu-devel] [PATCH 04/13] block: add meta bitmaps X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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. Reviewed-by: John Snow 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 1171dbb..05307bc 100644 --- a/block.c +++ b/block.c @@ -61,9 +61,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) */ @@ -3145,6 +3151,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, ctz64(sector_granularity)); + + 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, @@ -3305,6 +3340,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; @@ -3390,6 +3428,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, @@ -3397,6 +3438,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 5b9c2d6..7deb8e8 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -5,6 +5,7 @@ #include "qemu-common.h" #include "qemu/option.h" #include "qemu/coroutine.h" +#include "qemu/hbitmap.h" #include "block/accounting.h" #include "qapi/qmp/qobject.h" #include "qapi-types.h" @@ -511,6 +512,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);