[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/13] block: add meta bitmaps
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-devel] [PATCH 04/13] block: add meta bitmaps |
Date: |
Wed, 11 Nov 2015 18:16:34 +0300 |
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 <address@hidden>
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
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);
--
2.1.4
- [Qemu-devel] [PATCH 03/13] block: tiny refactoring: minimize hbitmap_(set/reset) usage, (continued)
- [Qemu-devel] [PATCH 03/13] block: tiny refactoring: minimize hbitmap_(set/reset) usage, Vladimir Sementsov-Ogievskiy, 2015/11/11
- [Qemu-devel] [PATCH 12/13] iotests: add default node-name, Vladimir Sementsov-Ogievskiy, 2015/11/11
- [Qemu-devel] [PATCH 05/13] block: add bdrv_next_dirty_bitmap(), Vladimir Sementsov-Ogievskiy, 2015/11/11
- [Qemu-devel] [PATCH 10/13] iotests: add add_incoming_migration to VM class, Vladimir Sementsov-Ogievskiy, 2015/11/11
- [Qemu-devel] [PATCH 07/13] migration/qemu-file: add qemu_put_counted_string(), Vladimir Sementsov-Ogievskiy, 2015/11/11
- [Qemu-devel] [PATCH 11/13] qapi: add md5 checksum of last dirty bitmap level to query-block, Vladimir Sementsov-Ogievskiy, 2015/11/11
- [Qemu-devel] [PATCH 06/13] qapi: add dirty-bitmaps migration capability, Vladimir Sementsov-Ogievskiy, 2015/11/11
- [Qemu-devel] [PATCH 09/13] iotests: maintain several vms in test, Vladimir Sementsov-Ogievskiy, 2015/11/11
- [Qemu-devel] [PATCH 01/13] hbitmap: serialization, Vladimir Sementsov-Ogievskiy, 2015/11/11
- [Qemu-devel] [PATCH 13/13] iotests: add dirty bitmap migration test, Vladimir Sementsov-Ogievskiy, 2015/11/11
- [Qemu-devel] [PATCH 04/13] block: add meta bitmaps,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-devel] [PATCH 02/13] block: BdrvDirtyBitmap serialization interface, Vladimir Sementsov-Ogievskiy, 2015/11/11
- [Qemu-devel] [PATCH 08/13] migration: add migration/block-dirty-bitmap.c, Vladimir Sementsov-Ogievskiy, 2015/11/11