From patchwork Wed Feb 18 14:00:05 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: 440987 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 495451400B6 for ; Thu, 19 Feb 2015 01:43:25 +1100 (AEDT) Received: from localhost ([::1]:51219 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO5qV-0001lq-I7 for incoming@patchwork.ozlabs.org; Wed, 18 Feb 2015 09:43:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45555) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO5mp-00045i-Qq for qemu-devel@nongnu.org; Wed, 18 Feb 2015 09:39:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YO5mn-0001jv-DP for qemu-devel@nongnu.org; Wed, 18 Feb 2015 09:39:35 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:48945 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO5mn-0001ix-1B for qemu-devel@nongnu.org; Wed, 18 Feb 2015 09:39:33 -0500 Received: from kvm.sw.ru ([10.30.16.253]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id t1IE0U3w024597; Wed, 18 Feb 2015 17:01:05 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Date: Wed, 18 Feb 2015 17:00:05 +0300 Message-Id: <1424268014-13293-6-git-send-email-vsementsov@parallels.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1424268014-13293-1-git-send-email-vsementsov@parallels.com> References: <1424268014-13293-1-git-send-email-vsementsov@parallels.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, quintela@redhat.com, dgilbert@redhat.com, vsementsov@parallels.com, stefanha@redhat.com, den@openvz.org, amit.shah@redhat.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH RFC v3 05/14] 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. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block.c | 40 ++++++++++++++++++++++++++++++++++++++++ include/block/block.h | 5 +++++ 2 files changed, 45 insertions(+) diff --git a/block.c b/block.c index a127fd2..aaa08b8 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) */ @@ -5398,6 +5404,31 @@ void bdrv_dirty_bitmap_make_anon(BdrvDirtyBitmap *bitmap) bitmap->name = NULL; } +HBitmap *bdrv_create_meta_bitmap(BdrvDirtyBitmap *bitmap, + uint64_t granularity) +{ + uint64_t sector_granularity; + + assert((granularity & (granularity - 1)) == 0); + + granularity *= 8 * bdrv_dirty_bitmap_granularity(bitmap); + sector_granularity = granularity >> 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, @@ -5532,6 +5563,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; @@ -5659,6 +5693,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, @@ -5666,6 +5703,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 c6a928d..f2c62f6 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" @@ -487,6 +488,10 @@ void bdrv_dirty_bitmap_deserialize_zeroes(BdrvDirtyBitmap *bitmap, uint64_t start, uint64_t count); void bdrv_dirty_bitmap_deserialize_finish(BdrvDirtyBitmap *bitmap); +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);