From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42138) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c4XS8-0006Fy-TQ for qemu-devel@nongnu.org; Wed, 09 Nov 2016 13:18:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c4XS3-0004U0-28 for qemu-devel@nongnu.org; Wed, 09 Nov 2016 13:18:28 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:37078 helo=relay.sw.ru) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c4XS2-0004RU-Kz for qemu-devel@nongnu.org; Wed, 09 Nov 2016 13:18:22 -0500 From: Vladimir Sementsov-Ogievskiy Date: Wed, 9 Nov 2016 21:17:46 +0300 Message-Id: <1478715476-132280-12-git-send-email-vsementsov@virtuozzo.com> In-Reply-To: <1478715476-132280-1-git-send-email-vsementsov@virtuozzo.com> References: <1478715476-132280-1-git-send-email-vsementsov@virtuozzo.com> Subject: [Qemu-devel] [PATCH 11/21] block: introduce persistent dirty bitmaps List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org, qemu-devel@nongnu.org Cc: kwolf@redhat.com, mreitz@redhat.com, armbru@redhat.com, eblake@redhat.com, jsnow@redhat.com, famz@redhat.com, den@openvz.org, stefanha@redhat.com, vsementsov@virtuozzo.com, pbonzini@redhat.com New field BdrvDirtyBitmap.persistent means, that bitmap should be saved on bdrv_close, using format driver. Format driver should maintain bitmap storing. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block.c | 31 +++++++++++++++++++++++++++++++ block/dirty-bitmap.c | 26 ++++++++++++++++++++++++++ block/qcow2-bitmap.c | 1 + include/block/block.h | 1 + include/block/block_int.h | 2 ++ include/block/dirty-bitmap.h | 6 ++++++ 6 files changed, 67 insertions(+) diff --git a/block.c b/block.c index 61c048f..2429384 100644 --- a/block.c +++ b/block.c @@ -2319,6 +2319,7 @@ void bdrv_reopen_abort(BDRVReopenState *reopen_state) static void bdrv_close(BlockDriverState *bs) { BdrvAioNotifier *ban, *ban_next; + Error *local_err = NULL; assert(!bs->job); assert(!bs->refcnt); @@ -2327,6 +2328,11 @@ static void bdrv_close(BlockDriverState *bs) bdrv_flush(bs); bdrv_drain(bs); /* in case flush left pending I/O */ + bdrv_store_persistent_dirty_bitmaps(bs, &local_err); + if (local_err != NULL) { + error_report_err(local_err); + error_report("Persistent bitmaps are lost"); + } bdrv_release_named_dirty_bitmaps(bs); assert(QLIST_EMPTY(&bs->dirty_bitmaps)); @@ -4105,3 +4111,28 @@ void bdrv_load_autoloading_dirty_bitmaps(BlockDriverState *bs, Error **errp) bs->drv->bdrv_load_autoloading_dirty_bitmaps(bs, errp); } } + +void bdrv_store_persistent_dirty_bitmaps(BlockDriverState *bs, Error **errp) +{ + BlockDriver *drv = bs->drv; + + if (!bdrv_has_persistent_bitmaps(bs)) { + return; + } + + if (!drv) { + error_setg_errno(errp, ENOMEDIUM, + "Can't store persistent bitmaps to %s", + bdrv_get_device_or_node_name(bs)); + return; + } + + if (!drv->bdrv_store_persistent_dirty_bitmaps) { + error_setg_errno(errp, ENOTSUP, + "Can't store persistent bitmaps to %s", + bdrv_get_device_or_node_name(bs)); + return; + } + + drv->bdrv_store_persistent_dirty_bitmaps(bs, errp); +} diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c index 2d27494..4d026df 100644 --- a/block/dirty-bitmap.c +++ b/block/dirty-bitmap.c @@ -44,6 +44,7 @@ struct BdrvDirtyBitmap { int64_t size; /* Size of the bitmap (Number of sectors) */ bool disabled; /* Bitmap is read-only */ int active_iterators; /* How many iterators are active */ + bool persistent; /* bitmap must be saved to owner disk image */ bool autoload; /* For persistent bitmaps: bitmap must be autoloaded on image opening */ QLIST_ENTRY(BdrvDirtyBitmap) list; @@ -73,6 +74,7 @@ void bdrv_dirty_bitmap_make_anon(BdrvDirtyBitmap *bitmap) g_free(bitmap->name); bitmap->name = NULL; + bitmap->persistent = false; bitmap->autoload = false; } @@ -242,6 +244,8 @@ BdrvDirtyBitmap *bdrv_dirty_bitmap_abdicate(BlockDriverState *bs, bitmap->name = NULL; successor->name = name; bitmap->successor = NULL; + successor->persistent = bitmap->persistent; + bitmap->persistent = false; successor->autoload = bitmap->autoload; bitmap->autoload = false; bdrv_release_dirty_bitmap(bs, bitmap); @@ -556,3 +560,25 @@ bool bdrv_dirty_bitmap_get_autoload(const BdrvDirtyBitmap *bitmap) { return bitmap->autoload; } + +void bdrv_dirty_bitmap_set_persistance(BdrvDirtyBitmap *bitmap, bool persistent) +{ + bitmap->persistent = persistent; +} + +bool bdrv_dirty_bitmap_get_persistance(BdrvDirtyBitmap *bitmap) +{ + return bitmap->persistent; +} + +bool bdrv_has_persistent_bitmaps(BlockDriverState *bs) +{ + BdrvDirtyBitmap *bm; + QLIST_FOREACH(bm, &bs->dirty_bitmaps, list) { + if (bm->persistent) { + return true; + } + } + + return false; +} diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c index 2c93435..f06de8e 100644 --- a/block/qcow2-bitmap.c +++ b/block/qcow2-bitmap.c @@ -634,6 +634,7 @@ void qcow2_load_autoloading_dirty_bitmaps(BlockDriverState *bs, Error **errp) goto fail; } + bdrv_dirty_bitmap_set_persistance(bitmap, true); bdrv_dirty_bitmap_set_autoload(bitmap, true); bm->flags |= BME_FLAG_IN_USE; created_dirty_bitmaps = diff --git a/include/block/block.h b/include/block/block.h index d1129c5..d23133b 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -525,5 +525,6 @@ void bdrv_add_child(BlockDriverState *parent, BlockDriverState *child, void bdrv_del_child(BlockDriverState *parent, BdrvChild *child, Error **errp); void bdrv_load_autoloading_dirty_bitmaps(BlockDriverState *bs, Error **errp); +void bdrv_store_persistent_dirty_bitmaps(BlockDriverState *bs, Error **errp); #endif diff --git a/include/block/block_int.h b/include/block/block_int.h index c8bc61f..1adb699 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -324,6 +324,8 @@ struct BlockDriver { void (*bdrv_load_autoloading_dirty_bitmaps)(BlockDriverState *bs, Error **errp); + void (*bdrv_store_persistent_dirty_bitmaps)(BlockDriverState *bs, + Error **errp); QLIST_ENTRY(BlockDriver) list; }; diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h index 45a389a..8dbd16b 100644 --- a/include/block/dirty-bitmap.h +++ b/include/block/dirty-bitmap.h @@ -77,4 +77,10 @@ void bdrv_dirty_bitmap_deserialize_finish(BdrvDirtyBitmap *bitmap); void bdrv_dirty_bitmap_set_autoload(BdrvDirtyBitmap *bitmap, bool autoload); bool bdrv_dirty_bitmap_get_autoload(const BdrvDirtyBitmap *bitmap); +void bdrv_dirty_bitmap_set_persistance(BdrvDirtyBitmap *bitmap, + bool persistent); +bool bdrv_dirty_bitmap_get_persistance(BdrvDirtyBitmap *bitmap); + +bool bdrv_has_persistent_bitmaps(BlockDriverState *bs); + #endif -- 1.8.3.1