[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 092/100] block: release persistent bitmaps on inactiv
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 092/100] block: release persistent bitmaps on inactivate |
Date: |
Fri, 7 Jul 2017 19:08:47 +0200 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
We should release them here to reload on invalidate cache.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>
---
block.c | 4 ++++
block/dirty-bitmap.c | 29 +++++++++++++++++++++++------
include/block/dirty-bitmap.h | 1 +
3 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/block.c b/block.c
index 1d44165..913bb43 100644
--- a/block.c
+++ b/block.c
@@ -4082,6 +4082,10 @@ static int bdrv_inactivate_recurse(BlockDriverState *bs,
}
}
+ /* At this point persistent bitmaps should be already stored by the format
+ * driver */
+ bdrv_release_persistent_dirty_bitmaps(bs);
+
return 0;
}
diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
index b2ca78b..543bddb 100644
--- a/block/dirty-bitmap.c
+++ b/block/dirty-bitmap.c
@@ -356,15 +356,20 @@ void bdrv_dirty_bitmap_truncate(BlockDriverState *bs)
bdrv_dirty_bitmaps_unlock(bs);
}
+static bool bdrv_dirty_bitmap_has_name(BdrvDirtyBitmap *bitmap)
+{
+ return !!bdrv_dirty_bitmap_name(bitmap);
+}
+
/* Called with BQL taken. */
-static void bdrv_do_release_matching_dirty_bitmap(BlockDriverState *bs,
- BdrvDirtyBitmap *bitmap,
- bool only_named)
+static void bdrv_do_release_matching_dirty_bitmap(
+ BlockDriverState *bs, BdrvDirtyBitmap *bitmap,
+ bool (*cond)(BdrvDirtyBitmap *bitmap))
{
BdrvDirtyBitmap *bm, *next;
bdrv_dirty_bitmaps_lock(bs);
QLIST_FOREACH_SAFE(bm, &bs->dirty_bitmaps, list, next) {
- if ((!bitmap || bm == bitmap) && (!only_named || bm->name)) {
+ if ((!bitmap || bm == bitmap) && (!cond || cond(bm))) {
assert(!bm->active_iterators);
assert(!bdrv_dirty_bitmap_frozen(bm));
assert(!bm->meta);
@@ -389,7 +394,7 @@ out:
/* Called with BQL taken. */
void bdrv_release_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap)
{
- bdrv_do_release_matching_dirty_bitmap(bs, bitmap, false);
+ bdrv_do_release_matching_dirty_bitmap(bs, bitmap, NULL);
}
/**
@@ -400,7 +405,19 @@ void bdrv_release_dirty_bitmap(BlockDriverState *bs,
BdrvDirtyBitmap *bitmap)
*/
void bdrv_release_named_dirty_bitmaps(BlockDriverState *bs)
{
- bdrv_do_release_matching_dirty_bitmap(bs, NULL, true);
+ bdrv_do_release_matching_dirty_bitmap(bs, NULL,
bdrv_dirty_bitmap_has_name);
+}
+
+/**
+ * Release all persistent dirty bitmaps attached to a BDS (for use in
+ * bdrv_inactivate_recurse()).
+ * There must not be any frozen bitmaps attached.
+ * This function does not remove persistent bitmaps from the storage.
+ */
+void bdrv_release_persistent_dirty_bitmaps(BlockDriverState *bs)
+{
+ bdrv_do_release_matching_dirty_bitmap(bs, NULL,
+ bdrv_dirty_bitmap_get_persistance);
}
/**
diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h
index 93d97f0..a79a58d 100644
--- a/include/block/dirty-bitmap.h
+++ b/include/block/dirty-bitmap.h
@@ -25,6 +25,7 @@ BdrvDirtyBitmap *bdrv_find_dirty_bitmap(BlockDriverState *bs,
void bdrv_dirty_bitmap_make_anon(BdrvDirtyBitmap *bitmap);
void bdrv_release_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap);
void bdrv_release_named_dirty_bitmaps(BlockDriverState *bs);
+void bdrv_release_persistent_dirty_bitmaps(BlockDriverState *bs);
void bdrv_remove_persistent_dirty_bitmap(BlockDriverState *bs,
const char *name,
Error **errp);
--
1.8.3.1
- [Qemu-block] [PULL 081/100] qcow2: add persistent dirty bitmaps support, (continued)
- [Qemu-block] [PULL 081/100] qcow2: add persistent dirty bitmaps support, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 083/100] block: add bdrv_can_store_new_dirty_bitmap, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 087/100] qmp: add x-debug-block-dirty-bitmap-sha256, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 084/100] qcow2: add .bdrv_can_store_new_dirty_bitmap, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 086/100] qmp: add autoload parameter to block-dirty-bitmap-add, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 088/100] iotests: test qcow2 persistent dirty bitmap, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 085/100] qmp: add persistent flag to block-dirty-bitmap-add, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 089/100] block/dirty-bitmap: add bdrv_remove_persistent_dirty_bitmap, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 093/100] iotests: skip 159 & 170 with luks format, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 091/100] qmp: block-dirty-bitmap-remove: remove persistent, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 092/100] block: release persistent bitmaps on inactivate,
Kevin Wolf <=
- [Qemu-block] [PULL 090/100] qcow2: add .bdrv_remove_persistent_dirty_bitmap, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 094/100] iotests: fix remainining tests to work with LUKS, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 095/100] iotests: reduce PBKDF iterations when testing LUKS, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 096/100] iotests: add more LUKS hash combination tests, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 098/100] iotests: Use absolute paths for executables, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 100/100] tests: Avoid non-portable 'echo -ARG', Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 099/100] iotests: Add test for colon handling, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 097/100] iotests: chown LUKS device before qemu-io launches, Kevin Wolf, 2017/07/07
- Re: [Qemu-block] [Qemu-devel] [PULL 000/100] Block layer patches, Peter Maydell, 2017/07/10