qcow2-bitmaps: rewrite reopening logic
v5 cover qcow2-bitmaps: rewrite reopening logic
Hi all!
Bitmaps reopening is buggy, reopening-rw just not working at all and reopening-ro may lead to producing broken incremental backup if we do temporary snapshot in a meantime.
v5:
01: - add Max's r-b
- fix s/QSIMPLE_INIT/QTAILQ_INIT/ in a comment
02: - add Max's and John's a-b
03: - improve test to check bitmap hashes in more safe way 07: - drop wrong statement from commit message
- log events by hand
08: - drop 'the' from comment
- add Corruption in case of existent IN_USE on RO->RW reopen
09: - add Max's a-b and John's r-b
v4: Drop complicated solution around reopening logic [Kevin], fix
the existing bug in a simplest way
Vladimir Sementsov-Ogievskiy (9):
block: switch reopen queue from QSIMPLEQ to QTAILQ
block: reverse order for reopen commits
iotests: add test-case to 165 to test reopening qcow2 bitmaps to RW block/qcow2-bitmap: get rid of bdrv_has_changed_persistent_bitmaps block/qcow2-bitmap: drop qcow2_reopen_bitmaps_rw_hint() block/qcow2-bitmap: do not remove bitmaps on reopen-ro
iotests: add test 260 to check bitmap life after snapshot + commit block/qcow2-bitmap: fix and improve qcow2_reopen_bitmaps_rw
qcow2-bitmap: move bitmap reopen-rw code to qcow2_reopen_commit
block/qcow2.h | 5 +- include/block/block.h | 2 +- include/block/block_int.h | 6 -- include/block/dirty-bitmap.h | 1 - block.c | 53 +++++------ block/dirty-bitmap.c | 12 --- block/qcow2-bitmap.c | 164 ++++++++++++++++++++++------------- block/qcow2.c | 17 +++- tests/qemu-iotests/165 | 57 +++++++++++- tests/qemu-iotests/165.out | 4 +- tests/qemu-iotests/260 | 89 +++++++++++++++++++ tests/qemu-iotests/260.out | 52 +++++++++++ tests/qemu-iotests/group | 1 + 13 files changed, 343 insertions(+), 120 deletions(-) create mode 100755 tests/qemu-iotests/260 create mode 100644 tests/qemu-iotests/260.out
Signature · 1 line
2.21.0
PATCH v5 1/9 block: switch reopen queue from QSIMPLEQ to QTAILQ
We'll need reverse-foreach in the following commit, QTAILQ support it, so move to QTAILQ.
--- include/block/block.h | 2 +- block.c | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-)
include/block/block.h +1 -1
@@ -195,7 +195,7 @@ typedef struct HDGeometry {#define BDRV_BLOCK_EOF 0x20#define BDRV_BLOCK_RECURSE 0x40 -typedef QSIMPLEQ_HEAD(BlockReopenQueue, BlockReopenQueueEntry) BlockReopenQueue; +typedef QTAILQ_HEAD(BlockReopenQueue, BlockReopenQueueEntry) BlockReopenQueue; typedef struct BDRVReopenState { BlockDriverState *bs;
block.c +12 -12
@@ -1719,7 +1719,7 @@ typedef struct BlockReopenQueueEntry {bool prepared;bool perms_checked;BDRVReopenState state; -QSIMPLEQ_ENTRY (BlockReopenQueueEntry) entry; +QTAILQ_ENTRY (BlockReopenQueueEntry) entry; } BlockReopenQueueEntry;/*
@@ -1732,7 +1732,7 @@ static int bdrv_reopen_get_flags(BlockReopenQueue *q, BlockDriverState *bs)BlockReopenQueueEntry *entry;if (q !=NULL ) { - QSIMPLEQ_FOREACH(entry, q, entry) { + QTAILQ_FOREACH(entry, q, entry) {if (entry->state.bs == bs) {return entry->state.flags; }
@@ -3249,7 +3249,7 @@ static bool bdrv_recurse_has_child(BlockDriverState *bs,* Adds a BlockDriverState to a simple queue for an atomic, transactional * reopen of multiple devices. * -* bs_queue can either be an existing BlockReopenQueue that has had QSIMPLE_INIT +* bs_queue can either be an existing BlockReopenQueue that has had QTAILQ_INIT * already performed, or alternatively may be NULL a new BlockReopenQueue will * be created and initialized. This newly created BlockReopenQueue should be * passed back in for subsequent calls that are intended to be of the same
@@ -3290,7 +3290,7 @@ static BlockReopenQueue *bdrv_reopen_queue_child(BlockReopenQueue *bs_queue,if (bs_queue ==NULL ) { bs_queue =g_new0 (BlockReopenQueue,1 ); -QSIMPLEQ_INIT (bs_queue); +QTAILQ_INIT (bs_queue); }if (!options) {
@@ -3298,7 +3298,7 @@ static BlockReopenQueue *bdrv_reopen_queue_child(BlockReopenQueue *bs_queue, }/* Check if this BlockDriverState is already in the queue */ - QSIMPLEQ_FOREACH(bs_entry, bs_queue, entry) { + QTAILQ_FOREACH(bs_entry, bs_queue, entry) {if (bs == bs_entry->state.bs) {break ; }
@@ -3354,7 +3354,7 @@ static BlockReopenQueue *bdrv_reopen_queue_child(BlockReopenQueue *bs_queue,if (!bs_entry) { bs_entry =g_new0 (BlockReopenQueueEntry,1 ); -QSIMPLEQ_INSERT_TAIL (bs_queue, bs_entry, entry); +QTAILQ_INSERT_TAIL (bs_queue, bs_entry, entry); }else {qobject_unref (bs_entry->state.options);qobject_unref (bs_entry->state.explicit_options);
@@ -3455,7 +3455,7 @@ int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, Error **errp)assert (bs_queue !=NULL ); - QSIMPLEQ_FOREACH(bs_entry, bs_queue, entry) { + QTAILQ_FOREACH(bs_entry, bs_queue, entry) {assert (bs_entry->state.bs->quiesce_counter >0 );if (bdrv_reopen_prepare (&bs_entry->state, bs_queue, errp)) { goto cleanup;
@@ -3463,7 +3463,7 @@ int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, Error **errp) bs_entry->prepared = true; } - QSIMPLEQ_FOREACH(bs_entry, bs_queue, entry) { + QTAILQ_FOREACH(bs_entry, bs_queue, entry) {BDRVReopenState *state = &bs_entry->state; ret =bdrv_check_perm (state->bs, bs_queue, state->perm, state->shared_perm,NULL ,NULL , errp);
@@ -3489,13 +3489,13 @@ int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, Error **errp)/* If we reach this point, we have success and just need to apply the * changes */ - QSIMPLEQ_FOREACH(bs_entry, bs_queue, entry) { + QTAILQ_FOREACH(bs_entry, bs_queue, entry) {bdrv_reopen_commit (&bs_entry->state); } ret =0 ; cleanup_perm: - QSIMPLEQ_FOREACH_SAFE(bs_entry, bs_queue, entry, next) { + QTAILQ_FOREACH_SAFE(bs_entry, bs_queue, entry, next) {BDRVReopenState *state = &bs_entry->state;if (!bs_entry->perms_checked) {
@@ -3512,7 +3512,7 @@ cleanup_perm: } } cleanup: - QSIMPLEQ_FOREACH_SAFE(bs_entry, bs_queue, entry, next) { + QTAILQ_FOREACH_SAFE(bs_entry, bs_queue, entry, next) {if (ret) {if (bs_entry->prepared) {bdrv_reopen_abort (&bs_entry->state);
@@ -3552,7 +3552,7 @@ static BlockReopenQueueEntry *find_parent_in_reopen_queue(BlockReopenQueue *q, {BlockReopenQueueEntry *entry; - QSIMPLEQ_FOREACH(entry, q, entry) { + QTAILQ_FOREACH(entry, q, entry) {BlockDriverState *bs = entry->state.bs;BdrvChild *child;
Signature · 1 line
2.21.0
PATCH v5 2/9 block: reverse order for reopen commits
In reply to Vladimir Sementsov-OgievskiyIt's needed to fix reopening qcow2 with bitmaps to RW. Currently it can't work, as qcow2 needs write access to file child, to mark bitmaps in-image with IN_USE flag. But usually children goes after parents in reopen queue and file child is still RO on qcow2 reopen commit. Reverse reopen order to fix it.
--- block.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
block.c +9 -3
@@ -3486,10 +3486,16 @@ int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, Error **errp) bs_entry->perms_checked = true; } -/* If we reach this point, we have success and just need to apply the -* changes +/* +* If we reach this point, we have success and just need to apply the +* changes. +* +* Reverse order is used to comfort qcow2 driver: on commit it need to write +* IN_USE flag to the image, to mark bitmaps in the image as invalid. But +* children are usually goes after parents in reopen-queue, so go from last +* to first element. */ - QTAILQ_FOREACH(bs_entry, bs_queue, entry) { + QTAILQ_FOREACH_REVERSE(bs_entry, bs_queue, entry) {bdrv_reopen_commit (&bs_entry->state); }
Signature · 1 line
2.21.0
PATCH v5 3/9 iotests: add test-case to 165 to test reopening qcow2 bitmaps to RW
In reply to Vladimir Sementsov-OgievskiyReopening bitmaps to RW was broken prior to previous commit. Check that it works now.
--- tests/qemu-iotests/165 | 57 ++++++++++++++++++++++++++++++++++++-- tests/qemu-iotests/165.out | 4 +-- 2 files changed, 57 insertions(+), 4 deletions(-)
tests/qemu-iotests/165 +55 -2
@@ -43,10 +43,10 @@ class TestPersistentDirtyBitmap(iotests.QMPTestCase): os.remove(disk) def mkVm(self): - return iotests.VM().add_drive(disk) + return iotests.VM().add_drive(disk, opts='node-name=node0') def mkVmRo(self): - return iotests.VM().add_drive(disk, opts='readonly=on') + return iotests.VM().add_drive(disk, opts='readonly=on,node-name=node0') def getSha256(self): result = self.vm.qmp('x-debug-block-dirty-bitmap-sha256',
@@ -102,6 +102,59 @@ class TestPersistentDirtyBitmap(iotests.QMPTestCase): self.vm.shutdown() + def test_reopen_rw(self): + self.vm = self.mkVm() + self.vm.launch() + self.qmpAddBitmap() + + # Calculate hashes + + self.writeRegions(regions1) + sha256_1 = self.getSha256() + + self.writeRegions(regions2) + sha256_2 = self.getSha256() + assert sha256_1 != sha256_2 # Otherwise, it's not very interesting. + + result = self.vm.qmp('block-dirty-bitmap-clear', node='drive0', + name='bitmap0') + self.assert_qmp(result, 'return', {}) + + # Start with regions1 + + self.writeRegions(regions1) + assert sha256_1 == self.getSha256() + + self.vm.shutdown() + + self.vm = self.mkVmRo() + self.vm.launch() + + assert sha256_1 == self.getSha256() + + # Check that we are in RO mode and can't modify bitmap. + self.writeRegions(regions2) + assert sha256_1 == self.getSha256() + + # Reopen to RW + result = self.vm.qmp('x-blockdev-reopen', **{ + 'node-name': 'node0', + 'driver': iotests.imgfmt, + 'file': { + 'driver': 'file', + 'filename': disk + }, + 'read-only': False + }) + self.assert_qmp(result, 'return', {}) + + # Check that bitmap is reopened to RW and we can write to it. + self.writeRegions(regions2) + assert sha256_2 == self.getSha256() + + self.vm.shutdown() + + if __name__ == '__main__': iotests.main(supported_fmts=['qcow2'], supported_protocols=['file'])
tests/qemu-iotests/165.out +2 -2
@@ -1,5 +1,5 @@ -. +.. ---------------------------------------------------------------------- -Ran 1 tests +Ran 2 tests OK
Signature · 1 line
2.21.0
Re: [PATCH v5 3/9] iotests: add test-case to 165 to test reopening qcow2 bitmaps to RW
Quoted 92 lines · Vladimir Sementsov-Ogievskiy
Reopening bitmaps to RW was broken prior to previous commit. Check that it works now.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- tests/qemu-iotests/165 | 57 ++++++++++++++++++++++++++++++++++++-- tests/qemu-iotests/165.out | 4 +-- 2 files changed, 57 insertions(+), 4 deletions(-)tests/qemu-iotests/165 +55
-2@@ -43,10 +43,10 @@ class TestPersistentDirtyBitmap(iotests.QMPTestCase): os.remove(disk) def mkVm(self): - return iotests.VM().add_drive(disk) + return iotests.VM().add_drive(disk, opts='node-name=node0') def mkVmRo(self): - return iotests.VM().add_drive(disk, opts='readonly=on') + return iotests.VM().add_drive(disk, opts='readonly=on,node-name=node0') def getSha256(self): result = self.vm.qmp('x-debug-block-dirty-bitmap-sha256',@@ -102,6 +102,59 @@ class TestPersistentDirtyBitmap(iotests.QMPTestCase): self.vm.shutdown() + def test_reopen_rw(self): + self.vm = self.mkVm() + self.vm.launch() + self.qmpAddBitmap() + + # Calculate hashes + + self.writeRegions(regions1) + sha256_1 = self.getSha256() + + self.writeRegions(regions2) + sha256_2 = self.getSha256() + assert sha256_1 != sha256_2 # Otherwise, it's not very interesting. + + result = self.vm.qmp('block-dirty-bitmap-clear', node='drive0', + name='bitmap0') + self.assert_qmp(result, 'return', {}) + + # Start with regions1 + + self.writeRegions(regions1) + assert sha256_1 == self.getSha256() + + self.vm.shutdown() + + self.vm = self.mkVmRo() + self.vm.launch() + + assert sha256_1 == self.getSha256() + + # Check that we are in RO mode and can't modify bitmap. + self.writeRegions(regions2) + assert sha256_1 == self.getSha256() + + # Reopen to RW + result = self.vm.qmp('x-blockdev-reopen', **{ + 'node-name': 'node0', + 'driver': iotests.imgfmt, + 'file': { + 'driver': 'file', + 'filename': disk + }, + 'read-only': False + }) + self.assert_qmp(result, 'return', {}) + + # Check that bitmap is reopened to RW and we can write to it. + self.writeRegions(regions2) + assert sha256_2 == self.getSha256() + + self.vm.shutdown() + + if __name__ == '__main__': iotests.main(supported_fmts=['qcow2'], supported_protocols=['file'])tests/qemu-iotests/165.out +0
-0
tests/qemu-iotests/165.out line 5
Quoted 7 lines
tests/qemu-iotests/165.out +2
-2@@ -1,5 +1,5 @@ -. +.. ---------------------------------------------------------------------- -Ran 1 tests +Ran 2 tests OK
PATCH v5 4/9 block/qcow2-bitmap: get rid of bdrv_has_changed_persistent_bitmaps
In reply to Vladimir Sementsov-OgievskiyFirstly, no reason to optimize failure path. Then, function name is
ambiguous: it checks for readonly and similar things, but someone may think that it will ignore normal bitmaps which was just unchanged, and this is in bad relation with the fact that we should drop IN_USE flag for unchanged bitmaps in the image.
--- include/block/dirty-bitmap.h | 1 - block/dirty-bitmap.c | 12 ------------ block/qcow2-bitmap.c | 23 +++++++++++++---------- 3 files changed, 13 insertions(+), 23 deletions(-)
include/block/dirty-bitmap.h +0 -1
@@ -104,7 +104,6 @@ bool bdrv_has_readonly_bitmaps(BlockDriverState *bs);bool bdrv_dirty_bitmap_get_autoload (const BdrvDirtyBitmap *bitmap);bool bdrv_dirty_bitmap_get_persistence (BdrvDirtyBitmap *bitmap);bool bdrv_dirty_bitmap_inconsistent (const BdrvDirtyBitmap *bitmap); -bool bdrv_has_changed_persistent_bitmaps (BlockDriverState *bs);BdrvDirtyBitmap *bdrv_dirty_bitmap_next (BlockDriverState *bs,BdrvDirtyBitmap *bitmap);char *bdrv_dirty_bitmap_sha256 (const BdrvDirtyBitmap *bitmap,Error **errp);
block/dirty-bitmap.c +0 -12
@@ -778,18 +778,6 @@ bool bdrv_dirty_bitmap_inconsistent(const BdrvDirtyBitmap *bitmap)return bitmap->inconsistent; } -bool bdrv_has_changed_persistent_bitmaps (BlockDriverState *bs) -{ -BdrvDirtyBitmap *bm; - QLIST_FOREACH(bm, &bs->dirty_bitmaps, list) { -if (bm->persistent && !bm->readonly && !bm->skip_store) { -return true; - } - } - -return false; -} -BdrvDirtyBitmap *bdrv_dirty_bitmap_next (BlockDriverState *bs,BdrvDirtyBitmap *bitmap) {
block/qcow2-bitmap.c +13 -10
@@ -1456,16 +1456,7 @@ void qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs, Error **errp)Qcow2Bitmap *bm; QSIMPLEQ_HEAD(, Qcow2BitmapTable) drop_tables;Qcow2BitmapTable *tb, *tb_next; - -if (!bdrv_has_changed_persistent_bitmaps (bs)) { -/* nothing to do */ -return ; - } - -if (!can_write (bs)) { -error_setg (errp,"No write access" ); -return ; - } +bool need_write = false;QSIMPLEQ_INIT (&drop_tables);
@@ -1493,6 +1484,8 @@ void qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs, Error **errp)continue ; } + need_write = true; +if (check_constraints_on_bitmap (bs, name, granularity, errp) <0 ) {error_prepend (errp,"Bitmap '%s' doesn't satisfy the constraints: " , name);
@@ -1531,6 +1524,15 @@ void qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs, Error **errp) bm->dirty_bitmap = bitmap; } +if (!need_write) { + goto success; + } + +if (!can_write (bs)) { +error_setg (errp,"No write access" ); + goto fail; + } +/* allocate clusters and store bitmaps */ QSIMPLEQ_FOREACH(bm, bm_list, entry) {if (bm->dirty_bitmap ==NULL ) {
@@ -1572,6 +1574,7 @@ void qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs, Error **errp)bdrv_release_dirty_bitmap (bs, bm->dirty_bitmap); } +success:bitmap_list_free (bm_list);return ;
Signature · 1 line
2.21.0
PATCH v5 5/9 block/qcow2-bitmap: drop qcow2_reopen_bitmaps_rw_hint()
In reply to Vladimir Sementsov-OgievskiyThe function is unused, drop it.
--- block/qcow2.h | 2 -- block/qcow2-bitmap.c | 15 +-------------- 2 files changed, 1 insertion(+), 16 deletions(-)
block/qcow2.h +0 -2
@@ -737,8 +737,6 @@ int qcow2_check_bitmaps_refcounts(BlockDriverState *bs, BdrvCheckResult *res,bool qcow2_load_dirty_bitmaps (BlockDriverState *bs,Error **errp);Qcow2BitmapInfoList *qcow2_get_bitmap_info_list (BlockDriverState *bs,Error **errp); -int qcow2_reopen_bitmaps_rw_hint (BlockDriverState *bs,bool *header_updated, -Error **errp);int qcow2_reopen_bitmaps_rw (BlockDriverState *bs,Error **errp);int qcow2_truncate_bitmaps_check (BlockDriverState *bs,Error **errp);void qcow2_store_persistent_dirty_bitmaps (BlockDriverState *bs,Error **errp);
block/qcow2-bitmap.c +1 -14
@@ -1102,8 +1102,7 @@ Qcow2BitmapInfoList *qcow2_get_bitmap_info_list(BlockDriverState *bs,return list; } -int qcow2_reopen_bitmaps_rw_hint (BlockDriverState *bs,bool *header_updated, -Error **errp) +int qcow2_reopen_bitmaps_rw (BlockDriverState *bs,Error **errp) {BDRVQcow2State *s = bs->opaque;Qcow2BitmapList *bm_list;
@@ -1111,10 +1110,6 @@ int qcow2_reopen_bitmaps_rw_hint(BlockDriverState *bs, bool *header_updated,GSList *ro_dirty_bitmaps =NULL ;int ret =0 ; -if (header_updated !=NULL ) { - *header_updated = false; - } -if (s->nb_bitmaps ==0 ) {/* No bitmaps - nothing to do */ return 0 ;
@@ -1156,9 +1151,6 @@ int qcow2_reopen_bitmaps_rw_hint(BlockDriverState *bs, bool *header_updated,error_setg_errno (errp, -ret,"Can't update bitmap directory" ); goto out; } -if (header_updated !=NULL ) { - *header_updated = true; - }g_slist_foreach (ro_dirty_bitmaps, set_readonly_helper, false); }
@@ -1169,11 +1161,6 @@ out:return ret; } -int qcow2_reopen_bitmaps_rw (BlockDriverState *bs,Error **errp) -{ -return qcow2_reopen_bitmaps_rw_hint (bs,NULL , errp); -} -/* Checks to see if it's safe to resize bitmaps */ int qcow2_truncate_bitmaps_check (BlockDriverState *bs,Error **errp) {
Signature · 1 line
2.21.0
PATCH v5 6/9 block/qcow2-bitmap: do not remove bitmaps on reopen-ro
In reply to Vladimir Sementsov-Ogievskiyqcow2_reopen_bitmaps_ro wants to store bitmaps and then mark them all readonly. But the latter don't work, as qcow2_store_persistent_dirty_bitmaps removes bitmaps after storing. It's OK for inactivation but bad idea for reopen-ro. And this leads to the following bug:
Assume we have persistent bitmap 'bitmap0'.
Create external snapshot
bitmap0 is stored and therefore removed
Commit snapshot
now we have no bitmaps
Do some writes from guest (*)
they are not marked in bitmap
Shutdown
Start
bitmap0 is loaded as valid, but it is actually broken! It misses writes (*)
Incremental backup
it will be inconsistent
So, let's stop removing bitmaps on reopen-ro. But don't rejoice:
reopening bitmaps to rw is broken too, so the whole scenario will not work after this patch and we can't enable corresponding test cases in 260 iotests still. Reopening bitmaps rw will be fixed in the following patches.
--- block/qcow2.h | 3 ++- block/qcow2-bitmap.c | 49 ++++++++++++++++++++++++++++++-------------- block/qcow2.c | 2 +- 3 files changed, 37 insertions(+), 17 deletions(-)
block/qcow2.h +2 -1
@@ -739,7 +739,8 @@ Qcow2BitmapInfoList *qcow2_get_bitmap_info_list(BlockDriverState *bs, Error **errp);int qcow2_reopen_bitmaps_rw (BlockDriverState *bs,Error **errp);int qcow2_truncate_bitmaps_check (BlockDriverState *bs,Error **errp); -void qcow2_store_persistent_dirty_bitmaps (BlockDriverState *bs,Error **errp); +void qcow2_store_persistent_dirty_bitmaps (BlockDriverState *bs, +bool release_stored,Error **errp);int qcow2_reopen_bitmaps_ro (BlockDriverState *bs,Error **errp); bool qcow2_can_store_new_dirty_bitmap(BlockDriverState *bs, const char *name,
block/qcow2-bitmap.c +34 -15
68 lines not on this page · raw message
block/qcow2.c +1 -1
@@ -2359,7 +2359,7 @@ static int qcow2_inactivate(BlockDriverState *bs)int ret, result =0 ;Error *local_err =NULL ; -qcow2_store_persistent_dirty_bitmaps (bs, &local_err); +qcow2_store_persistent_dirty_bitmaps (bs, true, &local_err);if (local_err !=NULL ) { result = -EINVAL ; error_reportf_err(local_err, "Lost persistent bitmaps during "
Signature · 1 line
2.21.0
PATCH v5 7/9 iotests: add test 260 to check bitmap life after snapshot + commit
In reply to Vladimir Sementsov-Ogievskiy--- tests/qemu-iotests/260 | 89 ++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/260.out | 52 ++++++++++++++++++++++ tests/qemu-iotests/group | 1 + 3 files changed, 142 insertions(+) create mode 100755 tests/qemu-iotests/260 create mode 100644 tests/qemu-iotests/260.out
tests/qemu-iotests/260 new file +89 -0
@@ -0,0 +1,89 @@ +#!/usr/bin/env python +# +# Tests for temporary external snapshot when we have bitmaps. +# +# Copyright (c) 2019 Virtuozzo International GmbH. All rights reserved. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +import iotests +from iotests import qemu_img_create, file_path, log, filter_qmp_event + +iotests.verify_image_format(supported_fmts=['qcow2']) + +base, top = file_path('base', 'top') +size = 64 * 1024 * 3 + + +def print_bitmap(msg, vm): + result = vm.qmp('query-block')['return'][0] + if 'dirty-bitmaps' in result: + bitmap = result['dirty-bitmaps'][0] + log('{}: name={} dirty-clusters={}'.format(msg, bitmap['name'], + bitmap['count'] // 64 // 1024)) + else: + log(msg + ': not found') + + +def test(persistent, restart): + assert persistent or not restart + log("\nTestcase {}persistent {} restart\n".format( + '' if persistent else 'non-', 'with' if restart else 'without')) + + qemu_img_create('-f', iotests.imgfmt, base, str(size)) + + vm = iotests.VM().add_drive(base) + vm.launch() + + vm.qmp_log('block-dirty-bitmap-add', node='drive0', name='bitmap0', + persistent=persistent) + vm.hmp_qemu_io('drive0', 'write 0 64K') + print_bitmap('initial bitmap', vm) + + vm.qmp_log('blockdev-snapshot-sync', device='drive0', snapshot_file=top, + format=iotests.imgfmt, filters=[iotests.filter_qmp_testfiles]) + vm.hmp_qemu_io('drive0', 'write 64K 512') + print_bitmap('check that no bitmaps are in snapshot', vm) + + if restart: + log("... Restart ...") + vm.shutdown() + vm = iotests.VM().add_drive(top) + vm.launch() + + vm.qmp_log('block-commit', device='drive0', top=top, + filters=[iotests.filter_qmp_testfiles]) + ev = vm.events_wait((('BLOCK_JOB_READY', None), + ('BLOCK_JOB_COMPLETED', None))) + log(filter_qmp_event(ev)) + if (ev['event'] == 'BLOCK_JOB_COMPLETED'): + vm.shutdown() + log(vm.get_log()) + exit() + + vm.qmp_log('block-job-complete', device='drive0') + ev = vm.event_wait('BLOCK_JOB_COMPLETED') + log(filter_qmp_event(ev)) + print_bitmap('check bitmap after commit', vm) + + vm.hmp_qemu_io('drive0', 'write 128K 64K') + print_bitmap('check updated bitmap', vm) + + vm.shutdown() + + +test(persistent=False, restart=False) +test(persistent=True, restart=False) +test(persistent=True, restart=True)
tests/qemu-iotests/260.out new file +52 -0
52 lines not on this page · raw message
tests/qemu-iotests/group +1 -0
@@ -273,6 +273,7 @@ 256 rw quick 257 rw 258 rw quick +260 rw auto quick 262 rw quick migration 263 rw quick 265 rw auto quick
Signature · 1 line
2.21.0
PATCH v5 8/9 block/qcow2-bitmap: fix and improve qcow2_reopen_bitmaps_rw
In reply to Vladimir Sementsov-Ogievskiy- Correct check for write access to file child, and in correct place (only if we want to write).
- Support reopen rw -> rw (which will be used in following commit), for example, !bdrv_dirty_bitmap_readonly() is not a corruption if bitmap is marked IN_USE in the image.
- Consider unexpected bitmap as a corruption and check other combinations of in-image and in-RAM bitmaps.
--- block/qcow2-bitmap.c | 77 +++++++++++++++++++++++++++++++++----------- 1 file changed, 58 insertions(+), 19 deletions(-)
block/qcow2-bitmap.c +58 -19
@@ -1108,18 +1108,14 @@ int qcow2_reopen_bitmaps_rw(BlockDriverState *bs, Error **errp)Qcow2BitmapList *bm_list;Qcow2Bitmap *bm;GSList *ro_dirty_bitmaps =NULL ; -int ret =0 ; +int ret = -EINVAL ; +bool need_header_update = false;if (s->nb_bitmaps ==0 ) {/* No bitmaps - nothing to do */ return 0 ; } -if (!can_write (bs)) { -error_setg (errp,"Can't write to the image on reopening bitmaps rw" ); -return -EINVAL ; - } - bm_list =bitmap_list_load (bs, s->bitmap_directory_offset, s->bitmap_directory_size, errp);if (bm_list ==NULL ) {
@@ -1128,32 +1124,75 @@ int qcow2_reopen_bitmaps_rw(BlockDriverState *bs, Error **errp) QSIMPLEQ_FOREACH(bm, bm_list, entry) {BdrvDirtyBitmap *bitmap =bdrv_find_dirty_bitmap (bs, bm->name); -if (bitmap ==NULL ) { -continue ; - } -if (!bdrv_dirty_bitmap_readonly (bitmap)) { -error_setg (errp,"Bitmap %s was loaded prior to rw-reopen, but was " -"not marked as readonly. This is a bug, something went " -"wrong. All of the bitmaps may be corrupted" , bm->name); - ret = -EINVAL ; +if (!bitmap) { +error_setg (errp,"Unexpected bitmap '%s' in image '%s'" , + bm->name, bs->filename); goto out; } - bm->flags |=BME_FLAG_IN_USE ; - ro_dirty_bitmaps =g_slist_append (ro_dirty_bitmaps, bitmap); +if (!(bm->flags &BME_FLAG_IN_USE )) { +if (!bdrv_dirty_bitmap_readonly (bitmap)) { +error_setg (errp,"Corruption: bitmap '%s' is not marked IN_USE " +"in the image '%s' and not marked readonly in RAM" , + bm->name, bs->filename); + goto out; + } +if (bdrv_dirty_bitmap_inconsistent (bitmap)) { +error_setg (errp,"Corruption: bitmap '%s' is inconsistent but " +"is not marked IN_USE in the image '%s'" , bm->name, + bs->filename); + goto out; + } + + bm->flags |=BME_FLAG_IN_USE ; + need_header_update = true; + }else { +/* +* What if flags already has BME_FLAG_IN_USE ? +* +* 1. if we are reopening RW -> RW it's OK, of course. +* 2. if we are reopening RO -> RW: +* 2.1 if @bitmap is inconsistent, it's OK. It means that it was +* inconsistent (IN_USE) when we loaded it +* 2.2 if @bitmap is not inconsistent. This seems to be impossible +* and implies third party interaction. Let's error-out for +* safety. +*/ +if (bdrv_dirty_bitmap_readonly (bitmap) && + !bdrv_dirty_bitmap_inconsistent (bitmap)) + { +error_setg (errp,"Corruption: bitmap '%s' is marked IN_USE " +"in the image '%s' but it is readonly and " +"consistent in RAM" , + bm->name, bs->filename); + goto out; + } + } + +if (bdrv_dirty_bitmap_readonly (bitmap)) { + ro_dirty_bitmaps =g_slist_append (ro_dirty_bitmaps, bitmap); + } } -if (ro_dirty_bitmaps !=NULL ) { +if (need_header_update) { +if (!can_write (bs->file->bs) || !(bs->file->perm &BLK_PERM_WRITE )) { +error_setg (errp,"Failed to reopen bitmaps rw: no write access " +"the protocol file" ); + goto out; + } +/* in_use flags must be updated */ ret =update_ext_header_and_dir_in_place (bs, bm_list);if (ret <0 ) { -error_setg_errno (errp, -ret,"Can't update bitmap directory" ); +error_setg_errno (errp, -ret,"Cannot update bitmap directory" ); goto out; } -g_slist_foreach (ro_dirty_bitmaps, set_readonly_helper, false); } +g_slist_foreach (ro_dirty_bitmaps, set_readonly_helper, false); + ret =0 ; + out:g_slist_free (ro_dirty_bitmaps);bitmap_list_free (bm_list);
Signature · 1 line
2.21.0
PATCH v5 9/9 qcow2-bitmap: move bitmap reopen-rw code to qcow2_reopen_commit
In reply to Vladimir Sementsov-OgievskiyThe only reason I can imagine for this strange code at the very-end of bdrv_reopen_commit is the fact that bs->read_only updated after calling drv->bdrv_reopen_commit in bdrv_reopen_commit. And in the same time, prior to previous commit, qcow2_reopen_bitmaps_rw did a wrong check for being writable, when actually it only need writable file child not self.
So, as it's fixed, let's move things to correct place.
--- include/block/block_int.h | 6 ------ block.c | 19 ------------------- block/qcow2.c | 15 ++++++++++++++- 3 files changed, 14 insertions(+), 26 deletions(-)
include/block/block_int.h +0 -6
@@ -546,12 +546,6 @@ struct BlockDriver { uint64_t parent_perm, uint64_t parent_shared, uint64_t *nperm, uint64_t *nshared); -/** -* Bitmaps should be marked as 'IN_USE' in the image on reopening image -* as rw. This handler should realize it. It also should unset readonly -* field of BlockDirtyBitmap's in case of success. -*/ -int (*bdrv_reopen_bitmaps_rw)(BlockDriverState *bs,Error **errp); bool (*bdrv_can_store_new_dirty_bitmap)(BlockDriverState *bs, const char *name, uint32_t granularity,
block.c +0 -19
@@ -3935,16 +3935,12 @@ void bdrv_reopen_commit(BDRVReopenState *reopen_state)BlockDriver *drv;BlockDriverState *bs;BdrvChild *child; -bool old_can_write, new_can_write;assert (reopen_state !=NULL ); bs = reopen_state->bs; drv = bs->drv;assert (drv !=NULL ); - old_can_write = - !bdrv_is_read_only (bs) && !(bdrv_get_flags (bs) &BDRV_O_INACTIVE ); -/* If there are any driver level actions to take */ if (drv->bdrv_reopen_commit) { drv->bdrv_reopen_commit (reopen_state);
@@ -3988,21 +3984,6 @@ void bdrv_reopen_commit(BDRVReopenState *reopen_state) }bdrv_refresh_limits (bs,NULL ); - - new_can_write = - !bdrv_is_read_only (bs) && !(bdrv_get_flags (bs) &BDRV_O_INACTIVE ); -if (!old_can_write && new_can_write && drv->bdrv_reopen_bitmaps_rw) { -Error *local_err =NULL ; -if (drv->bdrv_reopen_bitmaps_rw (bs, &local_err) <0 ) { -/* This is not fatal, bitmaps just left read-only, so all following -* writes will fail. User can remove read-only bitmaps to unblock -* writes. -*/ -error_reportf_err (local_err, -"%s: Failed to make dirty bitmaps writable: " , -bdrv_get_node_name (bs)); - } - } }/*
block/qcow2.c +14 -1
@@ -1834,6 +1834,20 @@ fail:static void qcow2_reopen_commit (BDRVReopenState *state) {qcow2_update_options_commit (state->bs, state->opaque); +if (state->flags &BDRV_O_RDWR ) { +Error *local_err =NULL ; + +if (qcow2_reopen_bitmaps_rw (state->bs, &local_err) <0 ) { +/* +* This is not fatal, bitmaps just left read-only, so all following +* writes will fail. User can remove read-only bitmaps to unblock +* writes or retry reopen. +*/ +error_reportf_err (local_err, +"%s: Failed to make dirty bitmaps writable: " , +bdrv_get_node_name (state->bs)); + } + }g_free (state->opaque); }
@@ -5262,7 +5276,6 @@ BlockDriver bdrv_qcow2 = { .bdrv_detach_aio_context = qcow2_detach_aio_context, .bdrv_attach_aio_context = qcow2_attach_aio_context, - .bdrv_reopen_bitmaps_rw = qcow2_reopen_bitmaps_rw, .bdrv_can_store_new_dirty_bitmap = qcow2_can_store_new_dirty_bitmap, .bdrv_remove_persistent_dirty_bitmap = qcow2_remove_persistent_dirty_bitmap, };
Signature · 1 line
2.21.0
Quoted 31 lines · Vladimir Sementsov-Ogievskiy
Hi all!
Bitmaps reopening is buggy, reopening-rw just not working at all and reopening-ro may lead to producing broken incremental backup if we do temporary snapshot in a meantime.
v5:
01: - add Max's r-b
- fix s/QSIMPLE_INIT/QTAILQ_INIT/ in a comment
02: - add Max's and John's a-b
03: - improve test to check bitmap hashes in more safe way 07: - drop wrong statement from commit message
- log events by hand
08: - drop 'the' from comment
- add Corruption in case of existentIN_USEonRO->RWreopen
09: - add Max's a-b and John's r-bv4: Drop complicated solution around reopening logic [Kevin], fix
the existing bug in a simplest wayVladimir Sementsov-Ogievskiy (9):
block: switch reopen queue from QSIMPLEQ to QTAILQ
block: reverse order for reopen commits
iotests: add test-case to 165 to test reopening qcow2 bitmaps to RWblock/qcow2-bitmap: get rid ofbdrv_has_changed_persistent_bitmapsblock/qcow2-bitmap: dropqcow2_reopen_bitmaps_rw_hint()block/qcow2-bitmap: do not remove bitmaps on reopen-ro
iotests: add test 260 to check bitmap life after snapshot + commitblock/qcow2-bitmap: fix and improveqcow2_reopen_bitmaps_rw
qcow2-bitmap: move bitmap reopen-rw code toqcow2_reopen_commit
Quoted 17 lines
block/qcow2.h | 5 +- include/block/block.h | 2 +- include/block/block_int.h | 6 -- include/block/dirty-bitmap.h | 1 - block.c | 53 +++++------ block/dirty-bitmap.c | 12 --- block/qcow2-bitmap.c | 164 ++++++++++++++++++++++------------- block/qcow2.c | 17 +++- tests/qemu-iotests/165 | 57 +++++++++++- tests/qemu-iotests/165.out | 4 +- tests/qemu-iotests/260 | 89 +++++++++++++++++++ tests/qemu-iotests/260.out | 52 +++++++++++ tests/qemu-iotests/group | 1 + 13 files changed, 343 insertions(+), 120 deletions(-) create mode 100755 tests/qemu-iotests/260 create mode 100644 tests/qemu-iotests/260.out
With the understanding that there are caveats that make this unsafe, but less unsafe and is a strict improvement:
John Snow
AppliedQuoted 31 lines · Vladimir Sementsov-Ogievskiy
Hi all!
Bitmaps reopening is buggy, reopening-rw just not working at all and reopening-ro may lead to producing broken incremental backup if we do temporary snapshot in a meantime.
v5:
01: - add Max's r-b
- fix s/QSIMPLE_INIT/QTAILQ_INIT/ in a comment
02: - add Max's and John's a-b
03: - improve test to check bitmap hashes in more safe way 07: - drop wrong statement from commit message
- log events by hand
08: - drop 'the' from comment
- add Corruption in case of existentIN_USEonRO->RWreopen
09: - add Max's a-b and John's r-bv4: Drop complicated solution around reopening logic [Kevin], fix
the existing bug in a simplest wayVladimir Sementsov-Ogievskiy (9):
block: switch reopen queue from QSIMPLEQ to QTAILQ
block: reverse order for reopen commits
iotests: add test-case to 165 to test reopening qcow2 bitmaps to RWblock/qcow2-bitmap: get rid ofbdrv_has_changed_persistent_bitmapsblock/qcow2-bitmap: dropqcow2_reopen_bitmaps_rw_hint()block/qcow2-bitmap: do not remove bitmaps on reopen-ro
iotests: add test 260 to check bitmap life after snapshot + commitblock/qcow2-bitmap: fix and improveqcow2_reopen_bitmaps_rw
qcow2-bitmap: move bitmap reopen-rw code toqcow2_reopen_commit
Quoted 17 lines
block/qcow2.h | 5 +- include/block/block.h | 2 +- include/block/block_int.h | 6 -- include/block/dirty-bitmap.h | 1 - block.c | 53 +++++------ block/dirty-bitmap.c | 12 --- block/qcow2-bitmap.c | 164 ++++++++++++++++++++++------------- block/qcow2.c | 17 +++- tests/qemu-iotests/165 | 57 +++++++++++- tests/qemu-iotests/165.out | 4 +- tests/qemu-iotests/260 | 89 +++++++++++++++++++ tests/qemu-iotests/260.out | 52 +++++++++++ tests/qemu-iotests/group | 1 + 13 files changed, 343 insertions(+), 120 deletions(-) create mode 100755 tests/qemu-iotests/260 create mode 100644 tests/qemu-iotests/260.out
Provisionally staged, pending feedback from Kevin.
Some minor rebase conflicts against the current bitmaps branch:
012/17:[----] [-C] 'block/qcow2-bitmap: get rid of bdrv_has_changed_persistent_bitmaps'
014/17:[0004] [FC] 'block/qcow2-bitmap: do not remove bitmaps on reopen-ro' 017/17:[----] [-C] 'qcow2-bitmap: move bitmap reopen-rw code to qcow2_reopen_commit'
12: just context against changed _first and _next prototypes. 14: the signature of bdrv_release_dirty_bitmap has changed, which incurs a change in the refactor.
17: bdrv_can_store... has changed to bdrv_co_can_store...
Same for bdrv_remove_persistent.
Thanks, applied to my bitmaps tree:
https://github.com/jnsnow/qemu/commits/bitmaps
https://github.com/jnsnow/qemu.git
--js
Quoted 70 lines · John Snow
Quoted 45 lines · Vladimir Sementsov-Ogievskiy
Hi all!
Bitmaps reopening is buggy, reopening-rw just not working at all and reopening-ro may lead to producing broken incremental backup if we do temporary snapshot in a meantime.
v5:
01: - add Max's r-b
- fix s/QSIMPLE_INIT/QTAILQ_INIT/ in a comment
02: - add Max's and John's a-b
03: - improve test to check bitmap hashes in more safe way 07: - drop wrong statement from commit message
- log events by hand
08: - drop 'the' from comment
- add Corruption in case of existentIN_USEonRO->RWreopen
09: - add Max's a-b and John's r-bv4: Drop complicated solution around reopening logic [Kevin], fix
the existing bug in a simplest wayVladimir Sementsov-Ogievskiy (9):
block: switch reopen queue from QSIMPLEQ to QTAILQ
block: reverse order for reopen commits
iotests: add test-case to 165 to test reopening qcow2 bitmaps to RWblock/qcow2-bitmap: get rid ofbdrv_has_changed_persistent_bitmapsblock/qcow2-bitmap: dropqcow2_reopen_bitmaps_rw_hint()block/qcow2-bitmap: do not remove bitmaps on reopen-ro
iotests: add test 260 to check bitmap life after snapshot + commitblock/qcow2-bitmap: fix and improveqcow2_reopen_bitmaps_rw
qcow2-bitmap: move bitmap reopen-rw code toqcow2_reopen_commitblock/qcow2.h | 5 +- include/block/block.h | 2 +- include/block/block_int.h | 6 -- include/block/dirty-bitmap.h | 1 - block.c | 53 +++++------ block/dirty-bitmap.c | 12 --- block/qcow2-bitmap.c | 164 ++++++++++++++++++++++------------- block/qcow2.c | 17 +++- tests/qemu-iotests/165 | 57 +++++++++++- tests/qemu-iotests/165.out | 4 +- tests/qemu-iotests/260 | 89 +++++++++++++++++++ tests/qemu-iotests/260.out | 52 +++++++++++ tests/qemu-iotests/group | 1 + 13 files changed, 343 insertions(+), 120 deletions(-)Quoted 3 lines
create mode 100755 tests/qemu-iotests/260
create mode 100644 tests/qemu-iotests/260.outProvisionally staged, pending feedback from Kevin.
Some minor rebase conflicts against the current bitmaps branch:
012/17:[----] [-C] '
block/qcow2-bitmap: get rid ofbdrv_has_changed_persistent_bitmaps'
014/17:[0004] [FC] 'block/qcow2-bitmap: do not remove bitmaps on reopen-ro' 017/17:[----] [-C] 'qcow2-bitmap: move bitmap reopen-rw code toqcow2_reopen_commit'12: just context against changed
_firstand_nextprototypes. 14: the signature ofbdrv_release_dirty_bitmaphas changed, which incurs a change in the refactor.
17:bdrv_can_store... has changed tobdrv_co_can_store...
Same forbdrv_remove_persistent.
Quoted 5 lines
Thanks, applied to my bitmaps tree:
https://github.com/jnsnow/qemu/commits/bitmaps
https://github.com/jnsnow/qemu.git
Thanks a lot!
Signature · 2 lines
Best regards, Vladimir