qcow2: persistent dirty bitmaps
v9 cover qcow2: persistent dirty bitmaps
Hi all!
There is a new update of qcow2-bitmap series - v9.
web: https://src.openvz.org/users/vsementsov/repos/qemu/browse?at=qcow2-bitmap-v9
git: https://src.openvz.org/scm/~vsementsov/qemu.git (tag qcow2-bitmap-v9)
v9:
rebase on master!
01-04,06,07: John's r-b
03: rewording in comment ("The concurrent resetting ..."), John's r-b 07: reword error messages
commit message: dirty bitmap -> bitmap
09: fix uninitialized ret in bitmap_list_store() (fix compilation warning) 18: fix compilation of tests/test-hbitmap
also, change constants names for qcow2: DIRTY_BITMAP -> BITMAP (as it is not dirty bitmaps extension, but just bitmaps extension), QCOW -> QCOW2 (bitmaps are only for qcow2)
v8:
Patches 01-06 are mostly unchanged, except for spelling and wording. 02 - add Eric's r-b
03,04 - add Max's r-b
07-09 is refactored "bitmap-read" part of the feature. Main changes:
- introduce bitmap list - normal list, which represents bitmap directory. Function bitmap_list_load loads bitmap directory, checks everything and creates normal list.
- introduce .bdrv_load_autoloading_dirty_bitmaps : instead of loading bitmaps in qcow2_open, lets load them only in bdrv_open, to avoid reloading in bdrv_snapshot_goto
- do not delete bitmaps after read, but mark them IN_USE
10 has contextual changes and rewording of comment. I've added Max's r-b, hope it's ok.
11: add error_report("Persistent bitmaps are lost") in case of failed bitmap store
12: add Max's r-b
13 is refactored "bitmap-store" part of the feature. see 07-09 description
- for now I just free old clusters and allocate new. This will be improved with a separate patch.
patch about "delete bitmaps on truncate" is removed. This case will be handled later. IN_USE, autoclear, check-constraints things are merged into other patches.
14-15 are mew patches, to early check possibility of creating persistent bitmap with
specified name and granularity in specified BDS
16-17: spelling, rewording, indenting, tiny code simplifying, check can_store (by 14-15),
s/if (autoload && !persistent)/if (has_autoload && !persistent)/, rebase (deleted qmp-commands.hx)
18: alternative to md5 in query-block:
- separated qmp command -x-debug-block-dirty-bitmap-sha256
- as adviced by Daniel P. Berrange in my parallel thread:
- sha256 instead of md5
- use qcrypto_hash_* instead of GChecksum
- fix bug =) (size was wrong in hbitmap_md5)
19: s/3999/3fff/, use x-debug-block-dirty-bitmap-sha256
20: new patch to rename and publish inc_refcounts
21: some fixes and refactoring mostyly by Max's comments.
Max, Eric, great tanks for your review!
I hope, I've covered most of your comments by this update.
TODO:
- handle reopening image RO->RW and incoming migration, set IN_USE for existing loaded bitmaps in these cases.
- reuse old, already allocated data clusters for bitmaps storing
- truncate bitmaps in the image on truncate
v7:
https://src.openvz.org/users/vsementsov/repos/qemu/browse?at=refs%2Ftags%2Fqcow2-bitmap-v7
based on block-next (https://github.com/XanClic/qemu/commits/block-next)
- a lot of refactoring and reordering of patches.
- dead code removed (bdrv_dirty_bitmap_load, etc.)
- do not maintain extra data for now
- do not store dirty bitmap directory in memory (as we use it seldom, we can just reread if needed)
By Kevin's review:
01 - commit message changed: fix->improvement (as it was not a bug) 03 - r-b
04 - r-b
05 - add 21 patch to fix spec, also, removed all (I hope) mentions of
"Bitmap Header", switch to one unified name for it - "Bitmap Directory Entry", to avoid misunderstanding with Qcow2 header. (also, add patch 22, to fix it in spec)
v6.06 - improve for_each_dir_entry loop, reorder patches, other small fixes v6.07 ~> v7.09 - dead code removed, I've moved to one function
.bdrv_store_persistent_bitmaps and have wrapper and callback in one patch (with also some other staff. If it not ok, I can split them)
v6.08 - about keeping bitmap directory instead of bitmap list: no I don't keep
it at all.
v6.16 - old bdrv_ bitmap-storing related functions are removed. The new one is
bdrv_store_persistent_bitmaps.
v6:
https://src.openvz.org/users/vsementsov/repos/qemu/browse?at=refs%2Ftags%2Fqcow2-bitmap-v6
based on block-next (https://github.com/XanClic/qemu/commits/block-next)
There are a lot of changes, reorderings and additions in comparement with v5. One principal thing: now bitmaps are removed from image after loading instead of marking them in_use. It is simpler and we do not need to store superfluous data. Also, we are no more interested in command line interface to dirty bitmaps. So it is dropped. If someone needs it I can add it later.
Vladimir Sementsov-Ogievskiy (21):
specs/qcow2: fix bitmap granularity qemu-specific note specs/qcow2: do not use wording 'bitmap header'
hbitmap: improve dirty iter
tests: add hbitmap iter test
block: fix bdrv_dirty_bitmap_granularity signature block/dirty-bitmap: add deserialize_ones func
qcow2: add bitmaps extension
block: introduce auto-loading bitmaps
qcow2: add .bdrv_load_autoloading_dirty_bitmaps block/dirty-bitmap: add autoload field to BdrvDirtyBitmap
block: introduce persistent dirty bitmaps block/dirty-bitmap: add bdrv_dirty_bitmap_next()
qcow2: add .bdrv_store_persistent_dirty_bitmaps()
block: add bdrv_can_store_dirty_bitmap
qcow2: add .bdrv_can_store_dirty_bitmap
qmp: add persistent flag to block-dirty-bitmap-add
qmp: add autoload parameter to block-dirty-bitmap-add
qmp: add x-debug-block-dirty-bitmap-sha256
iotests: test qcow2 persistent dirty bitmap
qcow2-refcount: rename inc_refcounts() and make it public
qcow2-bitmap: refcounts
block.c | 67 +++ block/Makefile.objs | 2 +- block/dirty-bitmap.c | 63 ++- block/qcow2-bitmap.c | 1230 ++++++++++++++++++++++++++++++++++++++++++ block/qcow2-refcount.c | 59 +- block/qcow2.c | 111 +++- block/qcow2.h | 39 ++ blockdev.c | 64 ++- docs/qmp-commands.txt | 7 + docs/specs/qcow2.txt | 8 +- include/block/block.h | 5 + include/block/block_int.h | 7 + include/block/dirty-bitmap.h | 18 +- include/qemu/hbitmap.h | 49 +- qapi/block-core.json | 37 +- tests/Makefile.include | 2 +- tests/qemu-iotests/165 | 89 +++ tests/qemu-iotests/165.out | 5 + tests/qemu-iotests/group | 1 + tests/test-hbitmap.c | 19 + util/hbitmap.c | 51 +- 21 files changed, 1872 insertions(+), 61 deletions(-) create mode 100644 block/qcow2-bitmap.c create mode 100755 tests/qemu-iotests/165 create mode 100644 tests/qemu-iotests/165.out
Signature · 1 line
1.8.3.1
PATCH v9 1/21 specs/qcow2: fix bitmap granularity qemu-specific note
--- docs/specs/qcow2.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
docs/specs/qcow2.txt +1 -2
@@ -472,8 +472,7 @@ Structure of a bitmap directory entry: 17: granularity_bits Granularity bits. Valid values: 0 - 63. - Note: Qemu currently doesn't support granularity_bits - greater than 31. + Note: Qemu currently supports only values 9 - 31. Granularity is calculated as granularity = 1 << granularity_bits
Signature · 1 line
1.8.3.1
PATCH v9 2/21 specs/qcow2: do not use wording 'bitmap header'
In reply to Vladimir Sementsov-OgievskiyA bitmap directory entry is sometimes called a 'bitmap header'. This patch leaves only one name - 'bitmap directory entry'. The name 'bitmap header' creates misunderstandings with 'qcow2 header' and 'qcow2 bitmap header extension' (which is extension of qcow2 header)
--- docs/specs/qcow2.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
docs/specs/qcow2.txt +2 -3
@@ -201,7 +201,7 @@ The fields of the bitmaps extension are: 8 - 15: bitmap_directory_size Size of the bitmap directory in bytes. It is the cumulative - size of all (nb_bitmaps) bitmap headers. + size of all (nb_bitmaps) bitmap directory entries. 16 - 23: bitmap_directory_offset Offset into the image file at which the bitmap directory
@@ -426,8 +426,7 @@ Each bitmap saved in the image is described in a bitmap directory entry. The bitmap directory is a contiguous area in the image file, whose starting offset and length are given by the header extension fields bitmap_directory_offset and bitmap_directory_size. The entries of the bitmap directory have variable -length, depending on the lengths of the bitmap name and extra data. These -entries are also called bitmap headers. +length, depending on the lengths of the bitmap name and extra data. Structure of a bitmap directory entry:
Signature · 1 line
1.8.3.1
PATCH v9 3/21 hbitmap: improve dirty iter
In reply to Vladimir Sementsov-OgievskiyMake dirty iter resistant to resetting bits in corresponding HBitmap.
--- include/qemu/hbitmap.h | 26 ++++---------------------- util/hbitmap.c | 23 ++++++++++++++++++++++- 2 files changed, 26 insertions(+), 23 deletions(-)
include/qemu/hbitmap.h +4 -22
@@ -243,10 +243,9 @@ void hbitmap_free(HBitmap *hb);* the lowest-numbered bit that is set in @hb, starting at @first. * * Concurrent setting of bits is acceptable, and will at worst cause the -* iteration to miss some of those bits. Resetting bits before the current -* position of the iterator is also okay. However, concurrent resetting of -* bits can lead to unexpected behavior if the iterator has not yet reached -* those bits. +* iteration to miss some of those bits. +* +* The concurrent resetting of bits is OK. */ void hbitmap_iter_init (HBitmapIter *hbi,const HBitmap *hb,uint64_t first);
@@ -285,24 +284,7 @@ void hbitmap_free_meta(HBitmap *hb);* Return the next bit that is set in @hbi's associated HBitmap, * or -1 if all remaining bits are zero. */ -static inline int64_t hbitmap_iter_next (HBitmapIter *hbi) -{ -unsigned long cur = hbi->cur[HBITMAP_LEVELS -1 ]; -int64_t item; - -if (cur ==0 ) { - cur =hbitmap_iter_skip_words (hbi); -if (cur ==0 ) { -return -1 ; - } - } - -/* The next call will resume work from the next bit. */ - hbi->cur[HBITMAP_LEVELS -1 ] = cur & (cur -1 ); - item = ((uint64_t )hbi->pos <<BITS_PER_LEVEL ) +ctzl (cur); - -return item << hbi->granularity; -} +int64_t hbitmap_iter_next (HBitmapIter *hbi);/** * hbitmap_iter_next_word:
util/hbitmap.c +22 -1
@@ -106,8 +106,9 @@ unsigned long hbitmap_iter_skip_words(HBitmapIter *hbi)unsigned long cur;do { - cur = hbi->cur[--i]; + i--; pos >>=BITS_PER_LEVEL ; + cur = hbi->cur[i] & hb->levels[i][pos]; }while (cur ==0 );/* Check for end of iteration. We always use fewer than BITS_PER_LONG
@@ -139,6 +140,26 @@ unsigned long hbitmap_iter_skip_words(HBitmapIter *hbi)return cur; } +int64_t hbitmap_iter_next (HBitmapIter *hbi) +{ +unsigned long cur = hbi->cur[HBITMAP_LEVELS -1 ] & + hbi->hb->levels[HBITMAP_LEVELS -1 ][hbi->pos]; +int64_t item; + +if (cur ==0 ) { + cur =hbitmap_iter_skip_words (hbi); +if (cur ==0 ) { +return -1 ; + } + } + +/* The next call will resume work from the next bit. */ + hbi->cur[HBITMAP_LEVELS -1 ] = cur & (cur -1 ); + item = ((uint64_t )hbi->pos <<BITS_PER_LEVEL ) +ctzl (cur); + +return item << hbi->granularity; +} +void hbitmap_iter_init (HBitmapIter *hbi,const HBitmap *hb,uint64_t first) {unsigned i, bit;
Signature · 1 line
1.8.3.1
PATCH v9 4/21 tests: add hbitmap iter test
In reply to Vladimir Sementsov-OgievskiyTest that hbitmap iter is resistant to bitmap resetting.
--- tests/test-hbitmap.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
tests/test-hbitmap.c +19 -0
@@ -898,6 +898,22 @@ static void hbitmap_test_add(const char *testpath, hbitmap_test_teardown); } +static void test_hbitmap_iter_and_reset (TestHBitmapData *data, +const void *unused) +{ +HBitmapIter hbi; + +hbitmap_test_init (data,L1 *2 ,0 ); +hbitmap_set (data->hb,0 , data->size); + +hbitmap_iter_init (&hbi, data->hb,BITS_PER_LONG -1 ); + +hbitmap_iter_next (&hbi); + +hbitmap_reset_all (data->hb); +hbitmap_iter_next (&hbi); +} +int main (int argc,char **argv) {g_test_init (&argc, &argv,NULL );
@@ -955,6 +971,9 @@ int main(int argc, char **argv) test_hbitmap_serialize_part);hbitmap_test_add ("/hbitmap/serialize/zeroes" , test_hbitmap_serialize_zeroes); + +hbitmap_test_add ("/hbitmap/iter/iter_and_reset" , + test_hbitmap_iter_and_reset);g_test_run ();return 0 ;
Signature · 1 line
1.8.3.1
PATCH v9 5/21 block: fix bdrv_dirty_bitmap_granularity signature
In reply to Vladimir Sementsov-OgievskiyMake getter signature const-correct. This allows other functions with const dirty bitmap parameter use bdrv_dirty_bitmap_granularity().
--- block/dirty-bitmap.c | 2 +- include/block/dirty-bitmap.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
block/dirty-bitmap.c +1 -1
@@ -388,7 +388,7 @@ uint32_t bdrv_get_default_bitmap_granularity(BlockDriverState *bs)return granularity; } -uint32_t bdrv_dirty_bitmap_granularity (BdrvDirtyBitmap *bitmap) +uint32_t bdrv_dirty_bitmap_granularity (const BdrvDirtyBitmap *bitmap) {return BDRV_SECTOR_SIZE <<hbitmap_granularity (bitmap->bitmap); }
include/block/dirty-bitmap.h +1 -1
@@ -29,7 +29,7 @@ void bdrv_disable_dirty_bitmap(BdrvDirtyBitmap *bitmap);void bdrv_enable_dirty_bitmap (BdrvDirtyBitmap *bitmap);BlockDirtyInfoList *bdrv_query_dirty_bitmaps (BlockDriverState *bs);uint32_t bdrv_get_default_bitmap_granularity (BlockDriverState *bs); -uint32_t bdrv_dirty_bitmap_granularity (BdrvDirtyBitmap *bitmap); +uint32_t bdrv_dirty_bitmap_granularity (const BdrvDirtyBitmap *bitmap);uint32_t bdrv_dirty_bitmap_meta_granularity (BdrvDirtyBitmap *bitmap);bool bdrv_dirty_bitmap_enabled (BdrvDirtyBitmap *bitmap);bool bdrv_dirty_bitmap_frozen (BdrvDirtyBitmap *bitmap);
Signature · 1 line
1.8.3.1
PATCH v9 6/21 block/dirty-bitmap: add deserialize_ones func
In reply to Vladimir Sementsov-OgievskiyAdd bdrv_dirty_bitmap_deserialize_ones() function, which is needed for qcow2 bitmap loading, to handle unallocated bitmap parts, marked as all-ones.
--- block/dirty-bitmap.c | 7 +++++++ include/block/dirty-bitmap.h | 3 +++ include/qemu/hbitmap.h | 15 +++++++++++++++ util/hbitmap.c | 17 +++++++++++++++++ 4 files changed, 42 insertions(+)
block/dirty-bitmap.c +7 -0
@@ -499,6 +499,13 @@ void bdrv_dirty_bitmap_deserialize_zeroes(BdrvDirtyBitmap *bitmap,hbitmap_deserialize_zeroes (bitmap->bitmap, start, count, finish); } +void bdrv_dirty_bitmap_deserialize_ones (BdrvDirtyBitmap *bitmap, +uint64_t start,uint64_t count, +bool finish) +{ +hbitmap_deserialize_ones (bitmap->bitmap, start, count, finish); +} +void bdrv_dirty_bitmap_deserialize_finish (BdrvDirtyBitmap *bitmap) {hbitmap_deserialize_finish (bitmap->bitmap);
include/block/dirty-bitmap.h +3 -0
@@ -70,6 +70,9 @@ void bdrv_dirty_bitmap_deserialize_part(BdrvDirtyBitmap *bitmap,void bdrv_dirty_bitmap_deserialize_zeroes (BdrvDirtyBitmap *bitmap,uint64_t start,uint64_t count,bool finish); +void bdrv_dirty_bitmap_deserialize_ones (BdrvDirtyBitmap *bitmap, +uint64_t start,uint64_t count, +bool finish);void bdrv_dirty_bitmap_deserialize_finish (BdrvDirtyBitmap *bitmap);#endif
include/qemu/hbitmap.h +15 -0
@@ -216,6 +216,21 @@ void hbitmap_deserialize_zeroes(HBitmap *hb, uint64_t start, uint64_t count, bool finish);/** +* hbitmap_deserialize_ones +* @hb: HBitmap to operate on. +* @start: First bit to restore. +* @count: Number of bits to restore. +* @finish: Whether to call hbitmap_deserialize_finish automatically. +* +* Fills the bitmap with ones. +* +* If @finish is false, caller must call hbitmap_serialize_finish before using +* the bitmap. +*/ +void hbitmap_deserialize_ones (HBitmap *hb,uint64_t start,uint64_t count, +bool finish); + +/** * hbitmap_deserialize_finish * @hb: HBitmap to operate on. *
util/hbitmap.c +17 -0
@@ -531,6 +531,23 @@ void hbitmap_deserialize_zeroes(HBitmap *hb, uint64_t start, uint64_t count, } } +void hbitmap_deserialize_ones (HBitmap *hb,uint64_t start,uint64_t count, +bool finish) +{ +uint64_t el_count; +unsigned long *first; + +if (!count) { +return ; + } +serialization_chunk (hb, start, count, &first, &el_count); + +memset (first,0xff , el_count *sizeof (unsigned long )); +if (finish) { +hbitmap_deserialize_finish (hb); + } +} +void hbitmap_deserialize_finish (HBitmap *bitmap) {int64_t i, size, prev_size;
Signature · 1 line
1.8.3.1
PATCH v9 7/21 qcow2: add bitmaps extension
In reply to Vladimir Sementsov-OgievskiyAdd bitmap extension as specified in docs/specs/qcow2.txt. For now, just mirror extension header into Qcow2 state and check constraints.
For now, disable image resize if it has bitmaps. It will be fixed later.
--- block/qcow2.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- block/qcow2.h | 24 +++++++++++++ 2 files changed, 129 insertions(+), 2 deletions(-)
block/qcow2.c +105 -2
@@ -63,6 +63,7 @@ typedef struct {#define QCOW2_EXT_MAGIC_END 0#define QCOW2_EXT_MAGIC_BACKING_FORMAT 0xE2792ACA#define QCOW2_EXT_MAGIC_FEATURE_TABLE 0x6803f857 +#define QCOW2_EXT_MAGIC_BITMAPS 0x23852875static int qcow2_probe (const uint8_t *buf,int buf_size,const char *filename) {
@@ -92,6 +93,7 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset,QCowExtension ext;uint64_t offset;int ret; +Qcow2BitmapHeaderExt bitmaps_ext;#ifdef DEBUG_EXT printf ("qcow2_read_extensions: start=%ld end=%ld\n" , start_offset, end_offset);
@@ -162,6 +164,81 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, }break ; +case QCOW2_EXT_MAGIC_BITMAPS : +if (ext.len !=sizeof (bitmaps_ext)) { +error_setg_errno (errp, -ret,"bitmaps_ext: " +"Invalid extension length" ); +return -EINVAL ; + } + +if (!(s->autoclear_features &QCOW2_AUTOCLEAR_BITMAPS )) { +fprintf (stderr, +"WARNING: a program lacking bitmap support modified " +"this file, so all bitmaps are now considered " +"inconsistent" ); +break ; + } + + ret =bdrv_pread (bs->file, offset, &bitmaps_ext, ext.len); +if (ret <0 ) { +error_setg_errno (errp, -ret,"bitmaps_ext: " +"Could not read ext header" ); +return ret; + } + +if (bitmaps_ext.reserved32 !=0 ) { +error_setg_errno (errp, -ret,"bitmaps_ext: " +"Reserved field is not zero" ); +return -EINVAL ; + } + +be32_to_cpus (&bitmaps_ext.nb_bitmaps); +be64_to_cpus (&bitmaps_ext.bitmap_directory_size); +be64_to_cpus (&bitmaps_ext.bitmap_directory_offset); + +if (bitmaps_ext.nb_bitmaps >QCOW2_MAX_BITMAPS ) { +error_setg (errp, +"bitmaps_ext: File %s has %" PRIu32" bitmaps, " +"exceeding the QEMU supported maximum of %d" , + bs->filename, bitmaps_ext.nb_bitmaps, +QCOW2_MAX_BITMAPS ); +return -EINVAL ; + } + +if (bitmaps_ext.nb_bitmaps ==0 ) { +error_setg (errp,"found bitmaps extension with zero bitmaps" ); +return -EINVAL ; + } + +if (bitmaps_ext.bitmap_directory_offset & (s->cluster_size -1 )) { +error_setg (errp,"bitmaps_ext: " +"invalid bitmap directory offset" ); +return -EINVAL ; + } + +if (bitmaps_ext.bitmap_directory_size > +QCOW2_MAX_BITMAP_DIRECTORY_SIZE ) { +error_setg (errp,"bitmaps_ext: " +"bitmap directory size (%" PRIu64") exceeds " +"the maximum supported size (%d)" , + bitmaps_ext.bitmap_directory_size, +QCOW2_MAX_BITMAP_DIRECTORY_SIZE ); +return -EINVAL ; + } + + s->nb_bitmaps = bitmaps_ext.nb_bitmaps; + s->bitmap_directory_offset = + bitmaps_ext.bitmap_directory_offset; + s->bitmap_directory_size = + bitmaps_ext.bitmap_directory_size; + +#ifdef DEBUG_EXT +printf ("Qcow2: Got bitmaps extension: " +"offset=%" PRIu64" nb_bitmaps=%" PRIu32"\n" , + s->bitmap_directory_offset, s->nb_bitmaps); +#endif +break ; +default :/* unknown magic - save it in case we need to rewrite the header */ {
@@ -1144,8 +1221,9 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, }/* Clear unknown autoclear feature bits */ -if (!bs->read_only && !(flags &BDRV_O_INACTIVE ) && s->autoclear_features) { - s->autoclear_features =0 ; +if (!bs->read_only && !(flags &BDRV_O_INACTIVE ) && + (s->autoclear_features & ~QCOW2_AUTOCLEAR_MASK )) { + s->autoclear_features &=QCOW2_AUTOCLEAR_MASK ; ret =qcow2_update_header (bs);if (ret <0 ) {error_setg_errno (errp, -ret,"Could not update qcow2 header" );
@@ -1944,6 +2022,24 @@ int qcow2_update_header(BlockDriverState *bs) buflen -= ret; } +if (s->nb_bitmaps >0 ) { +Qcow2BitmapHeaderExt bitmaps_header = { + .nb_bitmaps =cpu_to_be32 (s->nb_bitmaps), + .bitmap_directory_size = +cpu_to_be64 (s->bitmap_directory_size), + .bitmap_directory_offset = +cpu_to_be64 (s->bitmap_directory_offset) + }; + ret =header_ext_add (buf,QCOW2_EXT_MAGIC_BITMAPS , + &bitmaps_header,sizeof (bitmaps_header), + buflen); +if (ret <0 ) { + goto fail; + } + buf += ret; + buflen -= ret; + } +/* Keep unknown header extensions */ QLIST_FOREACH(uext, &s->unknown_header_ext, next) { ret =header_ext_add (buf, uext->magic, uext->data, uext->len, buflen);
@@ -2514,6 +2610,13 @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset)return -ENOTSUP ; } +/* cannot proceed if image has bitmaps */ +if (s->nb_bitmaps) { +/* TODO: resize bitmaps in the image */ +error_report ("Can't resize an image which has bitmaps" ); +return -ENOTSUP ; + } +/* shrinking is currently not supported */ if (offset < bs->total_sectors *512 ) {error_report ("qcow2 doesn't support shrinking images yet" );
block/qcow2.h +24 -0
@@ -52,6 +52,10 @@* space for snapshot names and IDs */ #define QCOW_MAX_SNAPSHOTS_SIZE (1024 * QCOW_MAX_SNAPSHOTS) +/* Bitmap header extension constraints */ +#define QCOW2_MAX_BITMAPS 65535 +#define QCOW2_MAX_BITMAP_DIRECTORY_SIZE (1024 * QCOW2_MAX_BITMAPS) +/* indicate that the refcount of the referenced cluster is exactly one. */ #define QCOW_OFLAG_COPIED (1ULL << 63)/* indicate that the cluster is compressed (they never have the copied flag) */
@@ -195,6 +199,15 @@ enum { QCOW2_COMPAT_FEAT_MASK = QCOW2_COMPAT_LAZY_REFCOUNTS, }; +/* Autoclear feature bits */ +enum { +QCOW2_AUTOCLEAR_BITMAPS_BITNR =0 , +QCOW2_AUTOCLEAR_BITMAPS = +1 <<QCOW2_AUTOCLEAR_BITMAPS_BITNR , + +QCOW2_AUTOCLEAR_MASK =QCOW2_AUTOCLEAR_BITMAPS , +}; +enum qcow2_discard_type {QCOW2_DISCARD_NEVER =0 ,QCOW2_DISCARD_ALWAYS ,
@@ -222,6 +235,13 @@ typedef uint64_t Qcow2GetRefcountFunc(const void *refcount_array,typedef void Qcow2SetRefcountFunc (void *refcount_array,uint64_t index,uint64_t value); +typedef struct Qcow2BitmapHeaderExt { +uint32_t nb_bitmaps; +uint32_t reserved32; +uint64_t bitmap_directory_size; +uint64_t bitmap_directory_offset; +} QEMU_PACKED Qcow2BitmapHeaderExt; + typedef struct BDRVQcow2State { int cluster_bits; int cluster_size;
@@ -263,6 +283,10 @@ typedef struct BDRVQcow2State {unsigned int nb_snapshots;QCowSnapshot *snapshots; +uint32_t nb_bitmaps; +uint64_t bitmap_directory_size; +uint64_t bitmap_directory_offset; +int flags;int qcow_version;bool use_lazy_refcounts;
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [PATCH 07/21] qcow2: add bitmaps extension
Quoted 41 lines · Vladimir Sementsov-Ogievskiy
Add bitmap extension as specified in
docs/specs/qcow2.txt. For now, just mirror extension header into Qcow2 state and check constraints.For now, disable image resize if it has bitmaps. It will be fixed later.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>Reviewed-by John Snow <[email protected]>--- block/qcow2.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- block/qcow2.h | 24 +++++++++++++ 2 files changed, 129 insertions(+), 2 deletions(-)block/qcow2.c +6
-0@@ -63,6 +63,7 @@ typedef struct {#define QCOW2_EXT_MAGIC_END 0#define QCOW2_EXT_MAGIC_BACKING_FORMAT 0xE2792ACA#define QCOW2_EXT_MAGIC_FEATURE_TABLE 0x6803f857 +#define QCOW2_EXT_MAGIC_BITMAPS 0x23852875static int qcow2_probe (const uint8_t *buf,int buf_size,const char *filename) {@@ -92,6 +93,7 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset,QCowExtension ext;uint64_t offset;int ret; +Qcow2BitmapHeaderExt bitmaps_ext;#ifdef DEBUG_EXT printf ("qcow2_read_extensions: start=%ld end=%ld\n" , start_offset, end_offset);@@ -162,6 +164,81 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, }break ; +case QCOW2_EXT_MAGIC_BITMAPS : +if (ext.len !=sizeof (bitmaps_ext)) { +error_setg_errno (errp, -ret,"bitmaps_ext: " +"Invalid extension length" );
block/qcow2.c static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, · line 180
Quoted 10 lines
block/qcow2.c +10
-0+return -EINVAL ; + } + +if (!(s->autoclear_features &QCOW2_AUTOCLEAR_BITMAPS )) { +fprintf (stderr, +"WARNING: a program lacking bitmap support modified " +"this file, so all bitmaps are now considered " +"inconsistent" ); +break ; + }
I think It would be nice if qemu-img check could remove all bitmaps and related data if this bit is not set. Otherwise, we're practically leaking data.
(But this can be added in a later patch.)
Re: [Qemu-devel] [PATCH 07/21] qcow2: add bitmaps extension
Quoted 47 lines · Max Reitz
Quoted 46 lines · Vladimir Sementsov-Ogievskiy
Add bitmap extension as specified in
docs/specs/qcow2.txt. For now, just mirror extension header into Qcow2 state and check constraints.For now, disable image resize if it has bitmaps. It will be fixed later.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>Reviewed-by John Snow <[email protected]>--- block/qcow2.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- block/qcow2.h | 24 +++++++++++++ 2 files changed, 129 insertions(+), 2 deletions(-)block/qcow2.c +11
-0@@ -63,6 +63,7 @@ typedef struct {#define QCOW2_EXT_MAGIC_END 0#define QCOW2_EXT_MAGIC_BACKING_FORMAT 0xE2792ACA#define QCOW2_EXT_MAGIC_FEATURE_TABLE 0x6803f857 +#define QCOW2_EXT_MAGIC_BITMAPS 0x23852875static int qcow2_probe (const uint8_t *buf,int buf_size,const char *filename) {@@ -92,6 +93,7 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset,QCowExtension ext;uint64_t offset;int ret; +Qcow2BitmapHeaderExt bitmaps_ext;#ifdef DEBUG_EXT printf ("qcow2_read_extensions: start=%ld end=%ld\n" , start_offset, end_offset);@@ -162,6 +164,81 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, }break ; +case QCOW2_EXT_MAGIC_BITMAPS : +if (ext.len !=sizeof (bitmaps_ext)) { +error_setg_errno (errp, -ret,"bitmaps_ext: " +"Invalid extension length" ); +return -EINVAL ; + } + +if (!(s->autoclear_features &QCOW2_AUTOCLEAR_BITMAPS )) { + fprintf(stderr,
Quoted 8 lines
block/qcow2.c static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, · line 180
Quoted 5 lines
block/qcow2.c +5
-0+"WARNING: a program lacking bitmap support modified " +"this file, so all bitmaps are now considered " + "inconsistent"); +break ; + }I think It would be nice if qemu-img check could remove all bitmaps and related data if this bit is not set. Otherwise, we're practically leaking data.
Is it safe? Can old version somehow reuse these clusters? Actually, all data will be removed on check, as there will be no refcounts if this bit is not set.
So, IMHO, only extension header should be deleted additionally in qemu-img check.
Quoted 5 lines
(But this can be added in a later patch.)
Reviewed-by Max Reitz <[email protected]>
Signature · 2 lines
Best regards, Vladimir
Re: [Qemu-devel] [PATCH 07/21] qcow2: add bitmaps extension
Quoted 60 lines · Vladimir Sementsov-Ogievskiy
Quoted 50 lines · Max Reitz
Quoted 49 lines · Vladimir Sementsov-Ogievskiy
Add bitmap extension as specified in
docs/specs/qcow2.txt. For now, just mirror extension header into Qcow2 state and check constraints.For now, disable image resize if it has bitmaps. It will be fixed later.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>Reviewed-by John Snow <[email protected]>--- block/qcow2.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- block/qcow2.h | 24 +++++++++++++ 2 files changed, 129 insertions(+), 2 deletions(-)block/qcow2.c +2
-0@@ -63,6 +63,7 @@ typedef struct {#define QCOW2_EXT_MAGIC_END 0#define QCOW2_EXT_MAGIC_BACKING_FORMAT 0xE2792ACA#define QCOW2_EXT_MAGIC_FEATURE_TABLE 0x6803f857 +#define QCOW2_EXT_MAGIC_BITMAPS 0x23852875static int qcow2_probe (const uint8_t *buf,int buf_size,const char *filename) {@@ -92,6 +93,7 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, QCowExtension ext;uint64_t offset;int ret; +Qcow2BitmapHeaderExt bitmaps_ext;#ifdef DEBUG_EXT printf("qcow2_read_extensions: start=%ld end=%ld\n",
start_offset,end_offset);block/qcow2.c +9
-0@@ -162,6 +164,81 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, } break; + case QCOW2_EXT_MAGIC_BITMAPS: + if (ext.len != sizeof(bitmaps_ext)) { + error_setg_errno(errp, -ret, "bitmaps_ext: " + "Invalid extension length"); + return -EINVAL; + } + + if (!(s->autoclear_features & QCOW2_AUTOCLEAR_BITMAPS)) { + fprintf(stderr, + "WARNING: a program lacking bitmap supportQuoted 8 lines
block/qcow2.c static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, · line 180
Quoted 5 lines
modified "
block/qcow2.c +4
-0+"this file, so all bitmaps are now considered " + "inconsistent"); +break ; + }I think It would be nice if qemu-img check could remove all bitmaps and related data if this bit is not set. Otherwise, we're practically leaking data.
Quoted 1 line
Is it safe? Can old version somehow reuse these clusters?
You're right, it can. It's not so easy then.
Quoted 3 lines
Actually, all
data will be removed on check, as there will be no refcounts if this bit is not set.
The refcounts will be there, but no references, right. So an old qemu-img check -r leaks will free the clusters.
We could still remove this extension field, right? Then the clusters are at least really leaked so that even a new qemu-img check -r leaks will free them.
Quoted 2 lines
So, IMHO, only extension header should be deleted additionally in qemu-img check.
I think we could remove it here instead of only in qemu-img check, but either way should be fine. Doing it in qemu-img check is probably cleaner, actually.
If you do it there, however, the warning should probably include a hint like "(Use 'qemu-img check -r leaks' to reclaim the space used for the bitmaps)".
Max
Re: [Qemu-devel] [PATCH 07/21] qcow2: add bitmaps extension
Quoted 73 lines · Max Reitz
Quoted 59 lines · Vladimir Sementsov-Ogievskiy
Quoted 50 lines · Max Reitz
Quoted 49 lines · Vladimir Sementsov-Ogievskiy
Add bitmap extension as specified in
docs/specs/qcow2.txt. For now, just mirror extension header into Qcow2 state and check constraints.For now, disable image resize if it has bitmaps. It will be fixed later.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>Reviewed-by John Snow <[email protected]>--- block/qcow2.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- block/qcow2.h | 24 +++++++++++++ 2 files changed, 129 insertions(+), 2 deletions(-)block/qcow2.c +2
-0@@ -63,6 +63,7 @@ typedef struct {#define QCOW2_EXT_MAGIC_END 0#define QCOW2_EXT_MAGIC_BACKING_FORMAT 0xE2792ACA#define QCOW2_EXT_MAGIC_FEATURE_TABLE 0x6803f857 +#define QCOW2_EXT_MAGIC_BITMAPS 0x23852875static int qcow2_probe (const uint8_t *buf,int buf_size,const char *filename) {@@ -92,6 +93,7 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, QCowExtension ext;uint64_t offset;int ret; +Qcow2BitmapHeaderExt bitmaps_ext;#ifdef DEBUG_EXT printf("qcow2_read_extensions: start=%ld end=%ld\n",
start_offset,end_offset);block/qcow2.c +9
-0@@ -162,6 +164,81 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, } break; + case QCOW2_EXT_MAGIC_BITMAPS: + if (ext.len != sizeof(bitmaps_ext)) { + error_setg_errno(errp, -ret, "bitmaps_ext: " + "Invalid extension length"); + return -EINVAL; + } + + if (!(s->autoclear_features & QCOW2_AUTOCLEAR_BITMAPS)) { + fprintf(stderr, + "WARNING: a program lacking bitmap supportQuoted 8 lines
block/qcow2.c static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, · line 180
Quoted 5 lines
modified "
block/qcow2.c +4
-0+"this file, so all bitmaps are now considered " + "inconsistent"); +break ; + }I think It would be nice if qemu-img check could remove all bitmaps and related data if this bit is not set. Otherwise, we're practically leaking data.
Quoted 1 line
Is it safe? Can old version somehow reuse these clusters?
You're right, it can. It's not so easy then.
Quoted 3 lines
Actually, all
data will be removed on check, as there will be no refcounts if this bit is not set.The refcounts will be there, but no references, right. So an old qemu-img check -r leaks will free the clusters.
We could still remove this extension field, right? Then the clusters are at least really leaked so that even a new qemu-img check -r leaks will free them.
Quoted 5 lines
Quoted 2 lines
So, IMHO, only extension header should be deleted additionally in qemu-img check.
I think we could remove it here instead of only in qemu-img check, but either way should be fine. Doing it in qemu-img check is probably cleaner, actually.
Now I think it would be more deterministic to clear extension header here, as, actually, it will be cleared on any future qcow2_update_header().
Quoted 7 lines
If you do it there, however, the warning should probably include a hint like "(Use 'qemu-img check -r leaks' to reclaim the space used for the bitmaps)".
Max
Signature · 2 lines
Best regards, Vladimir
PATCH v9 8/21 block: introduce auto-loading bitmaps
In reply to Vladimir Sementsov-OgievskiyAuto loading bitmaps are bitmaps store in the disk image, which should be loaded when the image is opened and become BdrvDirtyBitmaps for the corresponding drive.
--- block.c | 14 ++++++++++++++ include/block/block.h | 2 ++ include/block/block_int.h | 3 +++ 3 files changed, 19 insertions(+)
block.c +14 -0
@@ -1137,6 +1137,13 @@ static int bdrv_open_common(BlockDriverState *bs, BdrvChild *file, goto free_and_fail; } +bdrv_load_autoloading_dirty_bitmaps (bs, &local_err); +if (local_err) { +error_propagate (errp, local_err); + ret = -EINVAL ; + goto free_and_fail; + } +assert (bdrv_opt_mem_align (bs) !=0 );assert (bdrv_min_mem_align (bs) !=0 );assert (is_power_of_2 (bs->bl.request_alignment));
@@ -4093,3 +4100,10 @@ void bdrv_del_child(BlockDriverState *parent_bs, BdrvChild *child, Error **errp) parent_bs->drv->bdrv_del_child (parent_bs, child, errp); } + +void bdrv_load_autoloading_dirty_bitmaps (BlockDriverState *bs,Error **errp) +{ +if (bs->drv && bs->drv->bdrv_load_autoloading_dirty_bitmaps) { + bs->drv->bdrv_load_autoloading_dirty_bitmaps (bs, errp); + } +}
include/block/block.h +2 -0
@@ -552,4 +552,6 @@ void bdrv_add_child(BlockDriverState *parent, BlockDriverState *child, Error **errp);void bdrv_del_child (BlockDriverState *parent,BdrvChild *child,Error **errp); +void bdrv_load_autoloading_dirty_bitmaps (BlockDriverState *bs,Error **errp); +#endif
include/block/block_int.h +3 -0
@@ -320,6 +320,9 @@ struct BlockDriver {void (*bdrv_del_child)(BlockDriverState *parent,BdrvChild *child,Error **errp); +void (*bdrv_load_autoloading_dirty_bitmaps)(BlockDriverState *bs, +Error **errp); +QLIST_ENTRY (BlockDriver) list; };
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [PATCH 08/21] block: introduce auto-loading bitmaps
Quoted 1 line · Vladimir Sementsov-Ogievskiy
Auto loading bitmaps are bitmaps store in the disk image, which should
s/store/stored/
Quoted 18 lines
be loaded when the image is opened and become BdrvDirtyBitmaps for the corresponding drive.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block.c | 14 ++++++++++++++ include/block/block.h | 2 ++ include/block/block_int.h | 3 +++ 3 files changed, 19 insertions(+)block.c +0
-0@@ -1137,6 +1137,13 @@ static int bdrv_open_common(BlockDriverState *bs, BdrvChild *file, goto free_and_fail; }
block.c static int bdrv_open_common(BlockDriverState *bs, BdrvChild *file, · line 1149
Quoted 10 lines
block.c +7
-0+bdrv_load_autoloading_dirty_bitmaps (bs, &local_err); +if (local_err) { +error_propagate (errp, local_err); + ret = -EINVAL ; + goto free_and_fail; + } +assert (bdrv_opt_mem_align (bs) !=0 );assert (bdrv_min_mem_align (bs) !=0 );assert (is_power_of_2 (bs->bl.request_alignment));
These asserts should stay directly after the bdrv_refresh_limits() block (i.e. the bdrv_load_autoloading_dirty_bitmaps() call should be moved here, after them).
The rest looks good.
Max
Quoted 37 lines
block.c +7
-0@@ -4093,3 +4100,10 @@ void bdrv_del_child(BlockDriverState *parent_bs, BdrvChild *child, Error **errp) parent_bs->drv->bdrv_del_child (parent_bs, child, errp); } + +void bdrv_load_autoloading_dirty_bitmaps (BlockDriverState *bs,Error **errp) +{ +if (bs->drv && bs->drv->bdrv_load_autoloading_dirty_bitmaps) { + bs->drv->bdrv_load_autoloading_dirty_bitmaps (bs, errp); + } +}include/block/block.h +2
-0@@ -552,4 +552,6 @@ void bdrv_add_child(BlockDriverState *parent, BlockDriverState *child, Error **errp);void bdrv_del_child (BlockDriverState *parent,BdrvChild *child,Error **errp); +void bdrv_load_autoloading_dirty_bitmaps (BlockDriverState *bs,Error **errp); +#endif include/block/block_int.h +3
-0@@ -320,6 +320,9 @@ struct BlockDriver {void (*bdrv_del_child)(BlockDriverState *parent,BdrvChild *child,Error **errp); +void (*bdrv_load_autoloading_dirty_bitmaps)(BlockDriverState *bs, +Error **errp); +QLIST_ENTRY (BlockDriver) list; };
Re: [Qemu-devel] [PATCH 08/21] block: introduce auto-loading bitmaps
In reply to Vladimir Sementsov-OgievskiyQuoted 57 lines · Vladimir Sementsov-Ogievskiy
Auto loading bitmaps are bitmaps store in the disk image, which should be loaded when the image is opened and become BdrvDirtyBitmaps for the corresponding drive.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block.c | 14 ++++++++++++++ include/block/block.h | 2 ++ include/block/block_int.h | 3 +++ 3 files changed, 19 insertions(+)block.c +14
-0@@ -1137,6 +1137,13 @@ static int bdrv_open_common(BlockDriverState *bs, BdrvChild *file, goto free_and_fail; } +bdrv_load_autoloading_dirty_bitmaps (bs, &local_err); +if (local_err) { +error_propagate (errp, local_err); + ret = -EINVAL ; + goto free_and_fail; + } +assert (bdrv_opt_mem_align (bs) !=0 );assert (bdrv_min_mem_align (bs) !=0 );assert (is_power_of_2 (bs->bl.request_alignment));@@ -4093,3 +4100,10 @@ void bdrv_del_child(BlockDriverState *parent_bs, BdrvChild *child, Error **errp) parent_bs->drv->bdrv_del_child (parent_bs, child, errp); } + +void bdrv_load_autoloading_dirty_bitmaps (BlockDriverState *bs,Error **errp) +{ +if (bs->drv && bs->drv->bdrv_load_autoloading_dirty_bitmaps) { + bs->drv->bdrv_load_autoloading_dirty_bitmaps (bs, errp); + } +}include/block/block.h +2
-0@@ -552,4 +552,6 @@ void bdrv_add_child(BlockDriverState *parent, BlockDriverState *child, Error **errp);void bdrv_del_child (BlockDriverState *parent,BdrvChild *child,Error **errp); +void bdrv_load_autoloading_dirty_bitmaps (BlockDriverState *bs,Error **errp); +#endif include/block/block_int.h +0
-0
include/block/block_int.h struct BlockDriver { · line 328
Quoted 9 lines
include/block/block_int.h +3
-0@@ -320,6 +320,9 @@ struct BlockDriver {void (*bdrv_del_child)(BlockDriverState *parent,BdrvChild *child,Error **errp); +void (*bdrv_load_autoloading_dirty_bitmaps)(BlockDriverState *bs, +Error **errp); +QLIST_ENTRY (BlockDriver) list; };
If you address Max's comments:
PATCH v9 9/21 qcow2: add .bdrv_load_autoloading_dirty_bitmaps
In reply to Vladimir Sementsov-OgievskiyAuto loading bitmaps are bitmaps in Qcow2, with the AUTO flag set. They are loaded when the image is opened and become BdrvDirtyBitmaps for the corresponding drive.
Extra data in bitmaps is not supported for now.
--- block/Makefile.objs | 2 +- block/qcow2-bitmap.c | 663 +++++++++++++++++++++++++++++++++++++++++++++++++++ block/qcow2.c | 2 + block/qcow2.h | 3 + 4 files changed, 669 insertions(+), 1 deletion(-) create mode 100644 block/qcow2-bitmap.c
block/Makefile.objs +1 -1
@@ -1,5 +1,5 @@ block-obj-y += raw_bsd.o qcow.o vdi.o vmdk.o cloop.o bochs.o vpc.o vvfat.o dmg.o -block-obj-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o qcow2-cache.o +block-obj-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o qcow2-cache.o qcow2-bitmap.o block-obj-y += qed.o qed-gencb.o qed-l2-cache.o qed-table.o qed-cluster.o block-obj-y += qed-check.o block-obj-y += vhdx.o vhdx-endian.o vhdx-log.o
block/qcow2-bitmap.c new file +663 -0
663 lines not on this page · raw message
block/qcow2.c +2 -0
@@ -3513,6 +3513,8 @@ BlockDriver bdrv_qcow2 = { .bdrv_detach_aio_context = qcow2_detach_aio_context, .bdrv_attach_aio_context = qcow2_attach_aio_context, + + .bdrv_load_autoloading_dirty_bitmaps = qcow2_load_autoloading_dirty_bitmaps, };static void bdrv_qcow2_init (void )
block/qcow2.h +3 -0
@@ -613,4 +613,7 @@ int qcow2_cache_get_empty(BlockDriverState *bs, Qcow2Cache *c, uint64_t offset, void **table);void qcow2_cache_put (BlockDriverState *bs,Qcow2Cache *c,void **table); +/* qcow2-bitmap.c functions */ +void qcow2_load_autoloading_dirty_bitmaps (BlockDriverState *bs,Error **errp); +#endif
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [PATCH 09/21] qcow2: add .bdrv_load_autoloading_dirty_bitmaps
Quoted 15 lines · Vladimir Sementsov-Ogievskiy
Auto loading bitmaps are bitmaps in Qcow2, with the AUTO flag set. They are loaded when the image is opened and become BdrvDirtyBitmaps for the corresponding drive.
Extra data in bitmaps is not supported for now.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block/Makefile.objs | 2 +- block/qcow2-bitmap.c | 663 +++++++++++++++++++++++++++++++++++++++++++++++++++ block/qcow2.c | 2 + block/qcow2.h | 3 + 4 files changed, 669 insertions(+), 1 deletion(-) create mode 100644 block/qcow2-bitmap.c
[...]
Quoted 6 lines
block/qcow2-bitmap.c new file +0
-0@@ -0,0 +1,663 @@
[...]
block/qcow2-bitmap.c line 111
Quoted 13 lines
block/qcow2-bitmap.c new file +13
-0+/* Check table entry specification constraints. If cluster_size is 0, offset +* alignment is not checked. */ +static int check_table_entry (uint64_t entry,int cluster_size) +{ +uint64_t offset; + +if (entry &BME_TABLE_ENTRY_RESERVED_MASK ) { +return -EINVAL ; + } + + offset = entry &BME_TABLE_ENTRY_OFFSET_MASK ; +if (offset !=0 ) { +/* if offset specified, bit 0 must is reserved */
-must
block/qcow2-bitmap.c line 116
Quoted 5 lines
block/qcow2-bitmap.c new file +5
-0+if (entry &1 ) { +return -EINVAL ; + } + +if ((cluster_size !=0 ) && (entry % cluster_size !=0 )) {
Why would cluster_size be 0? Also, shouldn't it be offset instead of entry?
Quoted 6 lines
block/qcow2-bitmap.c new file +6
-0+return -EINVAL ; + } + } + +return 0 ; +}
[...]
Quoted 7 lines
block/qcow2-bitmap.c new file +7
-0+/* bitmap table entries must satisfy specification constraints */ +static int load_bitmap_data (BlockDriverState *bs, +const uint64_t *bitmap_table, +uint32_t bitmap_table_size, +BdrvDirtyBitmap *bitmap) +{ +int ret =0 ;
block/qcow2-bitmap.c line 189
Quoted 10 lines
block/qcow2-bitmap.c new file +10
-0+BDRVQcow2State *s = bs->opaque; +uint64_t sector, dsc; +uint64_t bm_size =bdrv_dirty_bitmap_size (bitmap); +uint8_t *buf =NULL ; +uint64_t i, tab_size = +size_to_clusters (s, +bdrv_dirty_bitmap_serialization_size (bitmap,0 , bm_size)); + +if (tab_size != bitmap_table_size || + tab_size >BME_MAX_TABLE_SIZE ) {
This line should be aligned to the opening parenthesis.
[...]
block/qcow2-bitmap.c line 338
Quoted 7 lines
block/qcow2-bitmap.c new file +7
-0+static int check_dir_entry (BlockDriverState *bs,Qcow2BitmapDirEntry *entry) +{ +BDRVQcow2State *s = bs->opaque; +uint64_t phys_bitmap_bytes = + (uint64_t )entry->bitmap_table_size * s->cluster_size; +uint64_t max_virtual_bits = + (phys_bitmap_bytes *8 ) << entry->granularity_bits;
I think this shift can overflow, even if bitmap_table_size, cluster_size and granularity_bits are all within their respective limits.
Quoted 1 line
+
int64_tnb_sectors=bdrv_nb_sectors(bs);
Just using bdrv_getlength() would probably be simpler.
block/qcow2-bitmap.c line 345
Quoted 6 lines
block/qcow2-bitmap.c new file +6
-0+ +if (nb_sectors <0 ) { +return nb_sectors; + } + + int fail =
I'd prefer a boolean.
Quoted 15 lines
block/qcow2-bitmap.c new file +15
-0+ (entry->bitmap_table_size ==0 ) || + (entry->bitmap_table_offset ==0 ) || + (entry->bitmap_table_offset % s->cluster_size) || + (entry->bitmap_table_size >BME_MAX_TABLE_SIZE ) || + (phys_bitmap_bytes >BME_MAX_PHYS_SIZE ) || + (entry->bitmap_table_offset !=0 && + (nb_sectors <<BDRV_SECTOR_BITS ) > max_virtual_bits) || + (entry->granularity_bits >BME_MAX_GRANULARITY_BITS ) || + (entry->granularity_bits <BME_MIN_GRANULARITY_BITS ) || + (entry->flags &BME_RESERVED_FLAGS ) || + (entry->name_size >BME_MAX_NAME_SIZE ) || + (entry->type !=BT_DIRTY_TRACKING_BITMAP ); + +return fail ? -EINVAL :0 ; +}
[...]
Quoted 7 lines
block/qcow2-bitmap.c new file +7
-0+/* bitmap_list_load +* Get bitmap list from qcow2 image. Actually reads bitmap directory, +* checks it and convert to bitmap list. +*/ +static Qcow2BitmapList *bitmap_list_load (BlockDriverState *bs,uint64_t offset, +uint64_t size,Error **errp) +{
[...]
block/qcow2-bitmap.c line 446
Quoted 3 lines
block/qcow2-bitmap.c new file +3
-0+ bm_list =bitmap_list_new (); +for (e = (Qcow2BitmapDirEntry *)dir; + e < (Qcow2BitmapDirEntry *)dir_end; e =next_dir_entry (e)) {
This line should be aligned to the opening parenthesis.
[...]
Quoted 8 lines
block/qcow2-bitmap.c new file +8
-0+ +/* bitmap_list_store +* Store bitmap list to qcow2 image as a bitmap directory. +* Everything is checked. +*/ +static int bitmap_list_store (BlockDriverState *bs,Qcow2BitmapList *bm_list, +uint64_t *offset,uint64_t *size,bool in_place) +{
[...]
block/qcow2-bitmap.c line 596
Quoted 5 lines
block/qcow2-bitmap.c new file +5
-0+fail: +g_free (dir); + +if (dir_offset >0 ) { +qcow2_free_clusters (bs, dir_offset, dir_size,QCOW2_DISCARD_OTHER );
I think this should only be freed if in_place is false.
Max
Quoted 4 lines
block/qcow2-bitmap.c new file +4
-0+ } + +return ret; +}
Re: [Qemu-devel] [PATCH 09/21] qcow2: add .bdrv_load_autoloading_dirty_bitmaps
Quoted 41 lines · Max Reitz
Quoted 15 lines · Vladimir Sementsov-Ogievskiy
Auto loading bitmaps are bitmaps in Qcow2, with the AUTO flag set. They are loaded when the image is opened and become BdrvDirtyBitmaps for the corresponding drive.
Extra data in bitmaps is not supported for now.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block/Makefile.objs | 2 +- block/qcow2-bitmap.c | 663 +++++++++++++++++++++++++++++++++++++++++++++++++++ block/qcow2.c | 2 + block/qcow2.h | 3 + 4 files changed, 669 insertions(+), 1 deletion(-)create mode 100644
block/qcow2-bitmap.c[...]
Quoted 6 lines
block/qcow2-bitmap.c new file +0
-0@@ -0,0 +1,663 @@[...]
block/qcow2-bitmap.c line 111
Quoted 13 lines
block/qcow2-bitmap.c new file +13
-0+/* Check table entry specification constraints. If cluster_size is 0, offset +* alignment is not checked. */ +static int check_table_entry (uint64_t entry,int cluster_size) +{ +uint64_t offset; + +if (entry &BME_TABLE_ENTRY_RESERVED_MASK ) { +return -EINVAL ; + } + + offset = entry &BME_TABLE_ENTRY_OFFSET_MASK ; +if (offset !=0 ) { +/* if offset specified, bit 0 must is reserved */ -must
Quoted 6 lines
block/qcow2-bitmap.c line 116
Quoted 5 lines
block/qcow2-bitmap.c new file +5
-0+if (entry &1 ) { +return -EINVAL ; + } + +if ((cluster_size !=0 ) && (entry % cluster_size !=0 )) {Why would
cluster_sizebe 0? Also, shouldn't it be offset instead of entry?
the comment says: "If cluster_size is 0, offset alignment is not checked" yes, should be offset.
Quoted 30 lines
Quoted 7 lines
block/qcow2-bitmap.c new file +6
-0+return -EINVAL ; + } + } + +return 0 ; +}[...]
Quoted 7 lines
block/qcow2-bitmap.c new file +7
-0+/* bitmap table entries must satisfy specification constraints */ +static int load_bitmap_data (BlockDriverState *bs, +const uint64_t *bitmap_table, +uint32_t bitmap_table_size, +BdrvDirtyBitmap *bitmap) +{ +int ret =0 ;block/qcow2-bitmap.c line 189
Quoted 10 lines
block/qcow2-bitmap.c new file +10
-0+BDRVQcow2State *s = bs->opaque; +uint64_t sector, dsc; +uint64_t bm_size =bdrv_dirty_bitmap_size (bitmap); +uint8_t *buf =NULL ; +uint64_t i, tab_size = +size_to_clusters (s, +bdrv_dirty_bitmap_serialization_size (bitmap,0 , bm_size)); + +if (tab_size != bitmap_table_size || + tab_size >BME_MAX_TABLE_SIZE ) {This line should be aligned to the opening parenthesis.
[...]
Quoted 9 lines
block/qcow2-bitmap.c line 338
Quoted 7 lines
block/qcow2-bitmap.c new file +7
-0+static int check_dir_entry (BlockDriverState *bs,Qcow2BitmapDirEntry *entry) +{ +BDRVQcow2State *s = bs->opaque; +uint64_t phys_bitmap_bytes = + (uint64_t )entry->bitmap_table_size * s->cluster_size; +uint64_t max_virtual_bits = + (phys_bitmap_bytes *8 ) << entry->granularity_bits;I think this shift can overflow, even if
bitmap_table_size,cluster_sizeandgranularity_bitsare all within their respective limits.
Hmm. But it can't, if phys_bitmap_bytes <= MAX_PHYS_SIZE. I can just move this calculation down.
Quoted 11 lines
Quoted 2 lines
+
int64_tnb_sectors=bdrv_nb_sectors(bs);Just using
bdrv_getlength()would probably be simpler.block/qcow2-bitmap.c line 345
Quoted 6 lines
block/qcow2-bitmap.c new file +6
-0+ +if (nb_sectors <0 ) { +return nb_sectors; + } + + int fail =I'd prefer a boolean.
and mixed definition/code)
Quoted 7 lines
block/qcow2-bitmap.c line 351
Quoted 7 lines
block/qcow2-bitmap.c new file +6
-0+ (entry->bitmap_table_size ==0 ) || + (entry->bitmap_table_offset ==0 ) || + (entry->bitmap_table_offset % s->cluster_size) || + (entry->bitmap_table_size >BME_MAX_TABLE_SIZE ) || + (phys_bitmap_bytes > BME_MAX_PHYS_SIZE) || + (entry->bitmap_table_offset != 0 &&
hmm, can be dropped, as checked above
Quoted 37 lines
Quoted 9 lines
block/qcow2-bitmap.c new file +9
-0+ (nb_sectors << BDRV_SECTOR_BITS) > max_virtual_bits) || + (entry->granularity_bits >BME_MAX_GRANULARITY_BITS ) || + (entry->granularity_bits <BME_MIN_GRANULARITY_BITS ) || + (entry->flags &BME_RESERVED_FLAGS ) || + (entry->name_size >BME_MAX_NAME_SIZE ) || + (entry->type !=BT_DIRTY_TRACKING_BITMAP ); + +return fail ? -EINVAL :0 ; +}[...]
Quoted 7 lines
block/qcow2-bitmap.c new file +7
-0+/* bitmap_list_load +* Get bitmap list from qcow2 image. Actually reads bitmap directory, +* checks it and convert to bitmap list. +*/ +static Qcow2BitmapList *bitmap_list_load (BlockDriverState *bs,uint64_t offset, +uint64_t size,Error **errp) +{[...]
block/qcow2-bitmap.c line 446
Quoted 3 lines
block/qcow2-bitmap.c new file +3
-0+ bm_list =bitmap_list_new (); +for (e = (Qcow2BitmapDirEntry *)dir; + e < (Qcow2BitmapDirEntry *)dir_end; e =next_dir_entry (e)) {This line should be aligned to the opening parenthesis.
[...]
Quoted 8 lines
block/qcow2-bitmap.c new file +8
-0+ +/* bitmap_list_store +* Store bitmap list to qcow2 image as a bitmap directory. +* Everything is checked. +*/ +static int bitmap_list_store (BlockDriverState *bs,Qcow2BitmapList *bm_list, +uint64_t *offset,uint64_t *size,bool in_place) +{[...]
Quoted 6 lines
block/qcow2-bitmap.c line 596
Quoted 5 lines
block/qcow2-bitmap.c new file +5
-0+fail: +g_free (dir); + +if (dir_offset >0 ) { +qcow2_free_clusters (bs, dir_offset, dir_size,QCOW2_DISCARD_OTHER );I think this should only be freed if
in_placeis false.
Reasonable.. And this also leads me to the think that we should clear autoclear bit in the header before inplace updating of bitmap directory and set it after successful update.
Quoted 7 lines
Max
Quoted 4 lines
block/qcow2-bitmap.c new file +4
-0+ } + +return ret; +}
Signature · 2 lines
Best regards, Vladimir
Re: [Qemu-devel] [PATCH 09/21] qcow2: add .bdrv_load_autoloading_dirty_bitmaps
Quoted 49 lines · Vladimir Sementsov-Ogievskiy
Quoted 48 lines · Max Reitz
Quoted 16 lines · Vladimir Sementsov-Ogievskiy
Auto loading bitmaps are bitmaps in Qcow2, with the AUTO flag set. They are loaded when the image is opened and become BdrvDirtyBitmaps for the corresponding drive.
Extra data in bitmaps is not supported for now.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block/Makefile.objs | 2 +- block/qcow2-bitmap.c | 663 +++++++++++++++++++++++++++++++++++++++++++++++++++ block/qcow2.c | 2 + block/qcow2.h | 3 + 4 files changed, 669 insertions(+), 1 deletion(-)create mode 100644
block/qcow2-bitmap.c[...]
Quoted 6 lines
block/qcow2-bitmap.c new file +0
-0@@ -0,0 +1,663 @@[...]
Quoted 4 lines
+/* Check table entry specification constraints. If
cluster_sizeis 0, offset
+ * alignment is not checked. */block/qcow2-bitmap.c new file +1
-0+static int check_table_entry (uint64_t entry,int cluster_size)block/qcow2-bitmap.c line 111
Quoted 10 lines
block/qcow2-bitmap.c new file +10
-0+{ +uint64_t offset; + +if (entry &BME_TABLE_ENTRY_RESERVED_MASK ) { +return -EINVAL ; + } + + offset = entry &BME_TABLE_ENTRY_OFFSET_MASK ; +if (offset !=0 ) { +/* if offset specified, bit 0 must is reserved */ -must
Quoted 5 lines
block/qcow2-bitmap.c new file +5
-0+if (entry &1 ) { +return -EINVAL ; + } + +if ((cluster_size !=0 ) && (entry % cluster_size !=0 )) {
Quoted 4 lines
Quoted 2 lines
Why would
cluster_sizebe 0? Also, shouldn't it be offset instead of entry?the comment says: "If
cluster_sizeis 0, offset alignment is not checked"
Oops, right. Is there any place where this function is called with cluster_size being 0, though?
Quoted 44 lines
yes, should be offset.
Quoted 31 lines
Quoted 7 lines
block/qcow2-bitmap.c new file +6
-0+return -EINVAL ; + } + } + +return 0 ; +}[...]
Quoted 15 lines
block/qcow2-bitmap.c new file +14
-0+/* bitmap table entries must satisfy specification constraints */ +static int load_bitmap_data (BlockDriverState *bs, +const uint64_t *bitmap_table, +uint32_t bitmap_table_size, +BdrvDirtyBitmap *bitmap) +{ +int ret =0 ; +BDRVQcow2State *s = bs->opaque; +uint64_t sector, dsc; +uint64_t bm_size =bdrv_dirty_bitmap_size (bitmap); +uint8_t *buf =NULL ; +uint64_t i, tab_size = + size_to_clusters(s, + bdrv_dirty_bitmap_serialization_size(bitmap, 0,
bm_size));block/qcow2-bitmap.c line 189
Quoted 3 lines
block/qcow2-bitmap.c new file +3
-0+ +if (tab_size != bitmap_table_size || + tab_size >BME_MAX_TABLE_SIZE ) {This line should be aligned to the opening parenthesis.
[...]
Quoted 10 lines
block/qcow2-bitmap.c line 338
Quoted 8 lines
+static int
check_dir_entry(BlockDriverState *bs, Qcow2BitmapDirEntry *entry)block/qcow2-bitmap.c new file +6
-0+{ +BDRVQcow2State *s = bs->opaque; +uint64_t phys_bitmap_bytes = + (uint64_t )entry->bitmap_table_size * s->cluster_size; +uint64_t max_virtual_bits = + (phys_bitmap_bytes *8 ) << entry->granularity_bits;I think this shift can overflow, even if
bitmap_table_size,cluster_sizeandgranularity_bitsare all within their respective limits.
Quoted 2 lines
Hmm. But it can't, if
phys_bitmap_bytes<=MAX_PHYS_SIZE. I can just move this calculation down.
Yes, you're right, I missed the check on phys_bitmap_bytes. It's all good then.
Quoted 11 lines
Quoted 10 lines
Quoted 1 line
+
int64_tnb_sectors=bdrv_nb_sectors(bs);Just using
bdrv_getlength()would probably be simpler.block/qcow2-bitmap.c line 345
Quoted 6 lines
block/qcow2-bitmap.c new file +6
-0+ +if (nb_sectors <0 ) { +return nb_sectors; + } + + int fail =I'd prefer a boolean.
Quoted 1 line
and mixed definition/code)
...now that you mention it... :-)
Quoted 58 lines
Quoted 6 lines
block/qcow2-bitmap.c line 351
Quoted 6 lines
block/qcow2-bitmap.c new file +6
-0+ (entry->bitmap_table_size ==0 ) || + (entry->bitmap_table_offset ==0 ) || + (entry->bitmap_table_offset % s->cluster_size) || + (entry->bitmap_table_size >BME_MAX_TABLE_SIZE ) || + (phys_bitmap_bytes > BME_MAX_PHYS_SIZE) || + (entry->bitmap_table_offset != 0 &&hmm, can be dropped, as checked above
Quoted 41 lines
Quoted 9 lines
block/qcow2-bitmap.c new file +9
-0+ (nb_sectors << BDRV_SECTOR_BITS) > max_virtual_bits) || + (entry->granularity_bits >BME_MAX_GRANULARITY_BITS ) || + (entry->granularity_bits <BME_MIN_GRANULARITY_BITS ) || + (entry->flags &BME_RESERVED_FLAGS ) || + (entry->name_size >BME_MAX_NAME_SIZE ) || + (entry->type !=BT_DIRTY_TRACKING_BITMAP ); + +return fail ? -EINVAL :0 ; +}[...]
Quoted 8 lines
block/qcow2-bitmap.c new file +5
-0+/* bitmap_list_load +* Get bitmap list from qcow2 image. Actually reads bitmap directory, +* checks it and convert to bitmap list. +*/ +static Qcow2BitmapList *bitmap_list_load(BlockDriverState *bs,
uint64_toffset,block/qcow2-bitmap.c new file +2
-0+ uint64_t size, Error **errp) +{[...]
Quoted 4 lines
block/qcow2-bitmap.c new file +3
-0+ bm_list =bitmap_list_new (); + for (e = (Qcow2BitmapDirEntry *)dir; + e < (Qcow2BitmapDirEntry *)dir_end; e =
next_dir_entry(e)) {This line should be aligned to the opening parenthesis.
[...]
Quoted 10 lines
block/qcow2-bitmap.c new file +6
-0+ +/* bitmap_list_store +* Store bitmap list to qcow2 image as a bitmap directory. +* Everything is checked. +*/ +static int bitmap_list_store(BlockDriverState *bs, Qcow2BitmapList
*bm_list,
+uint64_t*offset,uint64_t*size, boolin_place)
+{[...]
Quoted 7 lines
Quoted 6 lines
block/qcow2-bitmap.c new file +5
-0+fail: +g_free (dir); + +if (dir_offset >0 ) { + qcow2_free_clusters(bs, dir_offset, dir_size,
QCOW2_DISCARD_OTHER);I think this should only be freed if
in_placeis false.
Quoted 3 lines
Reasonable.. And this also leads me to the think that we should clear autoclear bit in the header before inplace updating of bitmap directory and set it after successful update.
Not a bad idea, actually. I don't think it's absolutely necessary but it would indeed be nice.
Max
Re: [Qemu-devel] [PATCH 09/21] qcow2: add .bdrv_load_autoloading_dirty_bitmaps
Quoted 50 lines · Max Reitz
Quoted 49 lines · Vladimir Sementsov-Ogievskiy
Quoted 48 lines · Max Reitz
Quoted 16 lines · Vladimir Sementsov-Ogievskiy
Auto loading bitmaps are bitmaps in Qcow2, with the AUTO flag set. They are loaded when the image is opened and become BdrvDirtyBitmaps for the corresponding drive.
Extra data in bitmaps is not supported for now.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block/Makefile.objs | 2 +- block/qcow2-bitmap.c | 663 +++++++++++++++++++++++++++++++++++++++++++++++++++ block/qcow2.c | 2 + block/qcow2.h | 3 + 4 files changed, 669 insertions(+), 1 deletion(-)create mode 100644
block/qcow2-bitmap.c[...]
Quoted 6 lines
block/qcow2-bitmap.c new file +0
-0@@ -0,0 +1,663 @@[...]
Quoted 4 lines
+/* Check table entry specification constraints. If
cluster_sizeis 0, offset
+ * alignment is not checked. */block/qcow2-bitmap.c new file +1
-0+static int check_table_entry (uint64_t entry,int cluster_size)block/qcow2-bitmap.c line 111
Quoted 10 lines
block/qcow2-bitmap.c new file +10
-0+{ +uint64_t offset; + +if (entry &BME_TABLE_ENTRY_RESERVED_MASK ) { +return -EINVAL ; + } + + offset = entry &BME_TABLE_ENTRY_OFFSET_MASK ; +if (offset !=0 ) { +/* if offset specified, bit 0 must is reserved */ -must
Quoted 5 lines
block/qcow2-bitmap.c new file +5
-0+if (entry &1 ) { +return -EINVAL ; + } + +if ((cluster_size !=0 ) && (entry % cluster_size !=0 )) {
Quoted 5 lines
Quoted 3 lines
Quoted 2 lines
Why would
cluster_sizebe 0? Also, shouldn't it be offset instead of entry?the comment says: "If
cluster_sizeis 0, offset alignment is not checked"Oops, right. Is there any place where this function is called with
cluster_sizebeing 0, though?
Hmm, I can't find it. Will remove this extra feature.
[...]
Signature · 2 lines
Best regards, Vladimir
PATCH v9 10/21 block/dirty-bitmap: add autoload field to BdrvDirtyBitmap
In reply to Vladimir Sementsov-OgievskiyMirror AUTO flag from Qcow2 bitmap in BdrvDirtyBitmap. This will be needed in future, to save this flag back to Qcow2 for persistent bitmaps.
--- block/dirty-bitmap.c | 16 ++++++++++++++++ block/qcow2-bitmap.c | 2 ++ include/block/dirty-bitmap.h | 2 ++ 3 files changed, 20 insertions(+)
block/dirty-bitmap.c +16 -0
@@ -44,6 +44,8 @@ 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 autoload;/* For persistent bitmaps: bitmap must be +autoloaded on image opening */ QLIST_ENTRY (BdrvDirtyBitmap) list; };
@@ -70,6 +72,8 @@ void bdrv_dirty_bitmap_make_anon(BdrvDirtyBitmap *bitmap)assert (!bdrv_dirty_bitmap_frozen (bitmap));g_free (bitmap->name); bitmap->name =NULL ; + + bitmap->autoload = false; } BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs,
@@ -238,6 +242,8 @@ BdrvDirtyBitmap *bdrv_dirty_bitmap_abdicate(BlockDriverState *bs, bitmap->name =NULL ; successor->name = name; bitmap->successor =NULL ; + successor->autoload = bitmap->autoload; + bitmap->autoload = false;bdrv_release_dirty_bitmap (bs, bitmap);return successor;
@@ -540,3 +546,13 @@ int64_t bdrv_get_meta_dirty_count(BdrvDirtyBitmap *bitmap) {return hbitmap_count (bitmap->meta); } + +void bdrv_dirty_bitmap_set_autoload (BdrvDirtyBitmap *bitmap,bool autoload) +{ + bitmap->autoload = autoload; +} + +bool bdrv_dirty_bitmap_get_autoload (const BdrvDirtyBitmap *bitmap) +{ +return bitmap->autoload; +}
block/qcow2-bitmap.c +2 -0
@@ -634,6 +634,8 @@ void qcow2_load_autoloading_dirty_bitmaps(BlockDriverState *bs, Error **errp)if (bitmap ==NULL ) { goto fail; } + +bdrv_dirty_bitmap_set_autoload (bitmap, true); bm->flags |=BME_FLAG_IN_USE ; created_dirty_bitmaps =g_slist_append (created_dirty_bitmaps, bitmap);
include/block/dirty-bitmap.h +2 -0
@@ -75,4 +75,6 @@ void bdrv_dirty_bitmap_deserialize_ones(BdrvDirtyBitmap *bitmap, bool finish);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);#endif
Signature · 1 line
1.8.3.1
PATCH v9 11/21 block: introduce persistent dirty bitmaps
In reply to Vladimir Sementsov-OgievskiyNew field BdrvDirtyBitmap.persistent means, that bitmap should be saved on bdrv_close, using format driver. Format driver should maintain bitmap storing.
--- 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(+)
block.c +31 -0
@@ -2321,6 +2321,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);
@@ -2329,6 +2330,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));
@@ -4107,3 +4113,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); +}
block/dirty-bitmap.c +26 -0
@@ -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; +}
block/qcow2-bitmap.c +1 -0
@@ -635,6 +635,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 =
include/block/block.h +1 -0
@@ -553,5 +553,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
include/block/block_int.h +2 -0
@@ -322,6 +322,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; };
include/block/dirty-bitmap.h +6 -0
@@ -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
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [PATCH 11/21] block: introduce persistent dirty bitmaps
Quoted 27 lines · Vladimir Sementsov-Ogievskiy
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 <[email protected]>--- 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(+)block.c +1
-0@@ -2321,6 +2321,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);
block.c static void bdrv_close(BlockDriverState *bs) · line 2336
Quoted 7 lines
block.c +4
-0@@ -2329,6 +2330,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" );
:C
But could you maybe add at least the node name to the error message?
Max
Quoted 3 lines
block.c +1
-0+ }bdrv_release_named_dirty_bitmaps (bs);assert (QLIST_EMPTY (&bs->dirty_bitmaps));
PATCH v9 12/21 block/dirty-bitmap: add bdrv_dirty_bitmap_next()
In reply to Vladimir Sementsov-Ogievskiy--- block/dirty-bitmap.c | 7 +++++++ include/block/dirty-bitmap.h | 3 +++ 2 files changed, 10 insertions(+)
block/dirty-bitmap.c +7 -0
@@ -582,3 +582,10 @@ bool bdrv_has_persistent_bitmaps(BlockDriverState *bs)return false; } + +BdrvDirtyBitmap *bdrv_dirty_bitmap_next (BlockDriverState *bs, +BdrvDirtyBitmap *bitmap) +{ +return bitmap ==NULL ?QLIST_FIRST (&bs->dirty_bitmaps) : +QLIST_NEXT (bitmap, list); +}
include/block/dirty-bitmap.h +3 -0
@@ -81,6 +81,9 @@ void bdrv_dirty_bitmap_set_persistance(BdrvDirtyBitmap *bitmap, bool persistent);bool bdrv_dirty_bitmap_get_persistance (BdrvDirtyBitmap *bitmap); +BdrvDirtyBitmap *bdrv_dirty_bitmap_next (BlockDriverState *bs, +BdrvDirtyBitmap *bitmap); +bool bdrv_has_persistent_bitmaps (BlockDriverState *bs);#endif
Signature · 1 line
1.8.3.1
PATCH v9 13/21 qcow2: add .bdrv_store_persistent_dirty_bitmaps()
In reply to Vladimir Sementsov-OgievskiyRealize block bitmap storing interface, to allow qcow2 images store persistent bitmaps.
--- block/qcow2-bitmap.c | 451 +++++++++++++++++++++++++++++++++++++++++++++++++++ block/qcow2.c | 1 + block/qcow2.h | 1 + 3 files changed, 453 insertions(+)
block/qcow2-bitmap.c +451 -0
@@ -28,6 +28,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "exec/log.h" +#include "qemu/cutils.h" #include "block/block_int.h" #include "block/qcow2.h"
@@ -43,6 +44,10 @@#define BME_MIN_GRANULARITY_BITS 9#define BME_MAX_NAME_SIZE 1023 +#if BME_MAX_TABLE_SIZE *8ULL >INT_MAX +#error In the code bitmap table physical size assumed to fit into int +#endif +/* Bitmap directory entry flags */ #define BME_RESERVED_FLAGS 0xfffffffcU#define BME_FLAG_IN_USE 1
@@ -74,6 +79,8 @@ typedef struct Qcow2Bitmap {uint8_t granularity_bits;char *name; +BdrvDirtyBitmap *dirty_bitmap; +QSIMPLEQ_ENTRY (Qcow2Bitmap) entry; } Qcow2Bitmap; typedef QSIMPLEQ_HEAD(Qcow2BitmapList, Qcow2Bitmap) Qcow2BitmapList;
@@ -87,6 +94,27 @@ static inline bool can_write(BlockDriverState *bs)return !bdrv_is_read_only (bs) && !(bdrv_get_flags (bs) &BDRV_O_INACTIVE ); } +static int update_header_sync (BlockDriverState *bs) +{ +int ret; + + ret =qcow2_update_header (bs); +if (ret <0 ) { +return ret; + } + +/* We doesn't return bdrv_flush error code. Even if it fails, write was +* successful and it is more logical to consider that header is in the new +* state than in the old. +*/ + ret =bdrv_flush (bs); +if (ret <0 ) { +fprintf (stderr,"Failed to flush qcow2 header" ); + } + +return 0 ; +} +static inline void bitmap_table_to_cpu (uint64_t *bitmap_table,size_t size) {size_t i;
@@ -96,6 +124,15 @@ static inline void bitmap_table_to_cpu(uint64_t *bitmap_table, size_t size) } } +static inline void bitmap_table_to_be (uint64_t *bitmap_table,size_t size) +{ +size_t i; + +for (i =0 ; i < size; ++i) { +cpu_to_be64s (&bitmap_table[i]); + } +} +/* Check table entry specification constraints. If cluster_size is 0, offset * alignment is not checked. */ static int check_table_entry (uint64_t entry,int cluster_size)
@@ -121,6 +158,51 @@ static int check_table_entry(uint64_t entry, int cluster_size)return 0 ; } +static int check_constraints_on_bitmap (BlockDriverState *bs, +const char *name, +uint32_t granularity) +{ +BDRVQcow2State *s = bs->opaque; +int granularity_bits =ctz32 (granularity); + +int64_t nb_sectors =bdrv_nb_sectors (bs); + +if (nb_sectors <0 ) { +return nb_sectors; + } + +uint64_t phys_bitmap_bytes = (nb_sectors <<BDRV_SECTOR_BITS ) >> + granularity_bits; +uint64_t bitmap_table_size = phys_bitmap_bytes / s->cluster_size; +size_t name_size =strlen (name); + +int fail = + (bitmap_table_size >BME_MAX_TABLE_SIZE ) || + (phys_bitmap_bytes >BME_MAX_PHYS_SIZE ) || + (granularity_bits >BME_MAX_GRANULARITY_BITS ) || + (granularity_bits <BME_MIN_GRANULARITY_BITS ) || + (name_size >BME_MAX_NAME_SIZE ); + +return fail ? -EINVAL :0 ; +} + +static void clear_bitmap_table (BlockDriverState *bs,uint64_t *bitmap_table, +uint32_t bitmap_table_size) +{ +BDRVQcow2State *s = bs->opaque; +int i; + +for (i =0 ; i < bitmap_table_size; ++i) { +uint64_t addr = bitmap_table[i] &BME_TABLE_ENTRY_OFFSET_MASK ; +if (!addr) { +continue ; + } + +qcow2_free_clusters (bs, addr, s->cluster_size,QCOW2_DISCARD_OTHER ); + bitmap_table[i] =0 ; + } +} +static int bitmap_table_load (BlockDriverState *bs,Qcow2Bitmap *bm,uint64_t **bitmap_table) {
@@ -159,6 +241,28 @@ fail:return ret; } +static int free_bitmap_clusters (BlockDriverState *bs,Qcow2Bitmap *bm) +{ +int ret; +uint64_t *bitmap_table; + + ret =bitmap_table_load (bs, bm, &bitmap_table); +if (ret <0 ) { +assert (bitmap_table ==NULL ); +return ret; + } + +clear_bitmap_table (bs, bitmap_table, bm->table_size); +qcow2_free_clusters (bs, bm->table_offset, bm->table_size *sizeof (uint64_t ), +QCOW2_DISCARD_OTHER ); +g_free (bitmap_table); + + bm->table_offset =0 ; + bm->table_size =0 ; + +return 0 ; +} +/* This function returns the number of disk sectors covered by a single cluster * of bitmap data. */ static uint64_t disk_sectors_in_bitmap_cluster(const BDRVQcow2State *s,
@@ -603,6 +707,72 @@ fail:* Bitmap List end */ +static int update_ext_header_and_dir (BlockDriverState *bs, +Qcow2BitmapList *bm_list) +{ +BDRVQcow2State *s = bs->opaque; +int ret; +Qcow2Bitmap *bm; +uint64_t new_offset =0 ; +uint64_t new_size =0 ; +uint32_t new_nb_bitmaps =0 ; +uint64_t old_offset = s->bitmap_directory_offset; +uint64_t old_size = s->bitmap_directory_size; +uint32_t old_nb_bitmaps = s->nb_bitmaps; +uint64_t old_autocl = s->autoclear_features; + +if (bm_list !=NULL && !QSIMPLEQ_EMPTY (bm_list)) { + QSIMPLEQ_FOREACH(bm, bm_list, entry) { + new_nb_bitmaps++; + } + +if (new_nb_bitmaps >QCOW2_MAX_BITMAPS ) { +return -EINVAL ; + } + + ret =bitmap_list_store (bs, bm_list, &new_offset, &new_size, false); +if (ret <0 ) { +return ret; + } + + ret =bdrv_flush (bs); +if (ret <0 ) { + goto fail; + } + + s->autoclear_features |=QCOW2_AUTOCLEAR_BITMAPS ; + }else { + s->autoclear_features &= ~(uint64_t )QCOW2_AUTOCLEAR_BITMAPS ; + } + + s->bitmap_directory_offset = new_offset; + s->bitmap_directory_size = new_size; + s->nb_bitmaps = new_nb_bitmaps; + + ret =update_header_sync (bs); +if (ret <0 ) { + goto fail; + } + +if (old_size >0 ) { +qcow2_free_clusters (bs, old_offset, old_size,QCOW2_DISCARD_OTHER ); + } + +return 0 ; + +fail: +if (new_offset >0 ) { +qcow2_free_clusters (bs, new_offset, new_size,QCOW2_DISCARD_OTHER ); + } + + s->bitmap_directory_offset = old_offset; + s->bitmap_directory_size = old_size; + s->nb_bitmaps = old_nb_bitmaps; + s->autoclear_features = old_autocl; + +return ret; +} +/* for g_slist_foreach for GSList of BdrvDirtyBitmap* elements */ static void release_dirty_bitmap_helper (gpointer bitmap,gpointer bs)
@@ -664,3 +834,284 @@ fail:g_slist_free (created_dirty_bitmaps);bitmap_list_free (bm_list); } + +/* store_bitmap_data() +* Store bitmap to image, filling bitmap table accordingly. +*/ +static uint64_t *store_bitmap_data (BlockDriverState *bs, +BdrvDirtyBitmap *bitmap, +uint32_t *bitmap_table_size,Error **errp) +{ +int ret; +BDRVQcow2State *s = bs->opaque; +int64_t sector; +uint64_t dsc; +uint64_t bm_size =bdrv_dirty_bitmap_size (bitmap); +const char *bm_name =bdrv_dirty_bitmap_name (bitmap); +uint8_t *buf =NULL ; +BdrvDirtyBitmapIter *dbi; +uint64_t *tb; +uint64_t tb_size = +size_to_clusters (s, +bdrv_dirty_bitmap_serialization_size (bitmap,0 , bm_size)); + +if (tb_size >BME_MAX_TABLE_SIZE || + tb_size * s->cluster_size >BME_MAX_PHYS_SIZE ) { +error_setg (errp,"Bitmap '%s' is too big" , bm_name); +return NULL ; + } + + tb =g_try_new0 (uint64_t, tb_size); +if (tb ==NULL ) { +error_setg (errp,"No memory" ); +return NULL ; + } + + dbi =bdrv_dirty_iter_new (bitmap,0 ); + buf =g_malloc (s->cluster_size); + dsc =disk_sectors_in_bitmap_cluster (s, bitmap); + +while ((sector =bdrv_dirty_iter_next (dbi)) !=-1 ) { +uint64_t cluster = sector / dsc; +uint64_t end, write_size; +int64_t off; + + sector = cluster * dsc; + end =MIN (bm_size, sector + dsc); + write_size = +bdrv_dirty_bitmap_serialization_size (bitmap, sector, end - sector); + + off =qcow2_alloc_clusters (bs, s->cluster_size); +if (off <0 ) { +error_setg_errno (errp, -off, +"Failed to allocate clusters for bitmap '%s'" , + bm_name); + goto fail; + } + tb[cluster] = off; + +bdrv_dirty_bitmap_serialize_part (bitmap, buf, sector, end - sector); +if (write_size < s->cluster_size) { +memset (buf + write_size,0 , s->cluster_size - write_size); + } + + ret =qcow2_pre_write_overlap_check (bs,0 , off, s->cluster_size); +if (ret <0 ) { +error_setg_errno (errp, -ret,"Qcow2 overlap check failed" ); + goto fail; + } + + ret =bdrv_pwrite (bs->file, off, buf, s->cluster_size); +if (ret <0 ) { +error_setg_errno (errp, -ret,"Failed to write bitmap '%s' to file" , + bm_name); + goto fail; + } + +if (end >= bm_size) { +break ; + } + +bdrv_set_dirty_iter (dbi, end); + } + + *bitmap_table_size = tb_size; +g_free (buf); +bdrv_dirty_iter_free (dbi); + +return tb; + +fail: +clear_bitmap_table (bs, tb, tb_size); +g_free (buf); +bdrv_dirty_iter_free (dbi); +g_free (tb); + +return NULL ; +} + +/* store_bitmap() +* Store bm->dirty_bitmap to qcow2. +* Set bm->table_offset and bm->table_size accordingly. +*/ +static int store_bitmap (BlockDriverState *bs,Qcow2Bitmap *bm,Error **errp) +{ +int ret; +uint64_t *tb; +int64_t tb_offset; +uint32_t tb_size; +BdrvDirtyBitmap *bitmap = bm->dirty_bitmap; +const char *bm_name; + +assert (bitmap !=NULL ); + + bm_name =bdrv_dirty_bitmap_name (bitmap); + + tb =store_bitmap_data (bs, bitmap, &tb_size, errp); +if (tb ==NULL ) { +g_free (tb); +return -EINVAL ; + } + +assert (tb_size <=BME_MAX_TABLE_SIZE ); + tb_offset =qcow2_alloc_clusters (bs, tb_size *sizeof (tb[0 ])); +if (tb_offset <0 ) { +error_setg_errno (errp, -tb_offset, +"Failed to allocate clusters for bitmap '%s'" , + bm_name); + goto fail; + } + + ret =qcow2_pre_write_overlap_check (bs,0 , tb_offset, + tb_size *sizeof (tb[0 ])); +if (ret <0 ) { +error_setg_errno (errp, -ret,"Qcow2 overlap check failed" ); + goto fail; + } + +bitmap_table_to_be (tb, tb_size); + ret =bdrv_pwrite (bs->file, tb_offset, tb, tb_size *sizeof (tb[0 ])); +if (ret <0 ) { +error_setg_errno (errp, -ret,"Failed to write bitmap '%s' to file" , + bm_name); + goto fail; + } + +g_free (tb); + + bm->table_offset = tb_offset; + bm->table_size = tb_size; + +return 0 ; + +fail: +clear_bitmap_table (bs, tb, tb_size); + +if (tb_offset >0 ) { +qcow2_free_clusters (bs, tb_offset, tb_size,QCOW2_DISCARD_OTHER ); + } + +g_free (tb); + +return ret; +} + +static Qcow2Bitmap *find_bitmap_by_name (Qcow2BitmapList *bm_list, +const char *name) +{ +Qcow2Bitmap *bm; + + QSIMPLEQ_FOREACH(bm, bm_list, entry) { +if (strcmp (name, bm->name) ==0 ) { +return bm; + } + } + +return NULL ; +} + +void qcow2_store_persistent_dirty_bitmaps (BlockDriverState *bs,Error **errp) +{ +BdrvDirtyBitmap *bitmap; +BDRVQcow2State *s = bs->opaque; +uint32_t new_nb_bitmaps = s->nb_bitmaps; +uint64_t new_dir_size = s->bitmap_directory_size; +int ret; +Qcow2BitmapList *bm_list; +Qcow2Bitmap *bm; + +if (!bdrv_has_persistent_bitmaps (bs)) { +/* nothing to do */ +return ; + } + +if (s->nb_bitmaps ==0 ) { + bm_list =bitmap_list_new (); + }else { + bm_list =bitmap_list_load (bs, s->bitmap_directory_offset, + s->bitmap_directory_size, errp); +if (bm_list ==NULL ) { +/* errp is already set */ +return ; + } + } + +/* check constraints and names */ +for (bitmap =bdrv_dirty_bitmap_next (bs,NULL ); bitmap !=NULL ; + bitmap =bdrv_dirty_bitmap_next (bs, bitmap)) { +const char *name =bdrv_dirty_bitmap_name (bitmap); +uint32_t granularity =bdrv_dirty_bitmap_granularity (bitmap); +Qcow2Bitmap *bm; + +if (!bdrv_dirty_bitmap_get_persistance (bitmap)) { +continue ; + } + +if (++new_nb_bitmaps >QCOW2_MAX_BITMAPS ) { +error_setg (errp,"Too many persistent bitmaps" ); + goto fail; + } + + new_dir_size +=calc_dir_entry_size (strlen (name),0 ); +if (new_dir_size >QCOW2_MAX_BITMAP_DIRECTORY_SIZE ) { +error_setg (errp,"Too large bitmap directory" ); + goto fail; + } + +if (check_constraints_on_bitmap (bs, name, granularity) <0 ) { +error_setg (errp,"Bitmap '%s' doesn't satisfy the constraints" , + name); + goto fail; + } + + bm =find_bitmap_by_name (bm_list, name); +if (bm ==NULL ) { + bm =g_new0 (Qcow2Bitmap,1 ); + bm->name =g_strdup (name); +QSIMPLEQ_INSERT_TAIL (bm_list, bm, entry); + }else { +if (!(bm->flags &BME_FLAG_IN_USE ) &&can_write (bs)) { +error_setg (errp,"Bitmap '%s' is already exists in the image" , + name); + goto fail; + } +free_bitmap_clusters (bs, bm); +/* TODO it is better to reuse these clusters */ + } + bm->flags =bdrv_dirty_bitmap_get_autoload (bitmap) ?BME_FLAG_AUTO :0 ; + bm->granularity_bits =ctz32 (bdrv_dirty_bitmap_granularity (bitmap)); + bm->dirty_bitmap = bitmap; + } + +/* allocate clusters and store bitmaps */ + QSIMPLEQ_FOREACH(bm, bm_list, entry) { +if (bm->dirty_bitmap ==NULL ) { +continue ; + } + + ret =store_bitmap (bs, bm, errp); +if (ret <0 ) { + goto fail; + } + } + + ret =update_ext_header_and_dir (bs, bm_list); +if (ret <0 ) { +error_setg_errno (errp, -ret,"Failed to update bitmap extension" ); + goto fail; + } + +bitmap_list_free (bm_list); +return ; + +fail: + QSIMPLEQ_FOREACH(bm, bm_list, entry) { +if (bm->dirty_bitmap ==NULL || bm->table_offset ==0 ) { +continue ; + } + +free_bitmap_clusters (bs, bm); + } + +bitmap_list_free (bm_list); +}
block/qcow2.c +1 -0
@@ -3515,6 +3515,7 @@ BlockDriver bdrv_qcow2 = { .bdrv_attach_aio_context = qcow2_attach_aio_context, .bdrv_load_autoloading_dirty_bitmaps = qcow2_load_autoloading_dirty_bitmaps, + .bdrv_store_persistent_dirty_bitmaps = qcow2_store_persistent_dirty_bitmaps, };static void bdrv_qcow2_init (void )
block/qcow2.h +1 -0
@@ -615,5 +615,6 @@ void qcow2_cache_put(BlockDriverState *bs, Qcow2Cache *c, void **table);/* qcow2-bitmap.c functions */ void qcow2_load_autoloading_dirty_bitmaps (BlockDriverState *bs,Error **errp); +void qcow2_store_persistent_dirty_bitmaps (BlockDriverState *bs,Error **errp);#endif
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [PATCH 13/21] qcow2: add .bdrv_store_persistent_dirty_bitmaps()
Quoted 34 lines · Vladimir Sementsov-Ogievskiy
Realize block bitmap storing interface, to allow qcow2 images store persistent bitmaps.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block/qcow2-bitmap.c | 451 +++++++++++++++++++++++++++++++++++++++++++++++++++ block/qcow2.c | 1 + block/qcow2.h | 1 + 3 files changed, 453 insertions(+)block/qcow2-bitmap.c +5
-0@@ -28,6 +28,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "exec/log.h" +#include "qemu/cutils.h" #include "block/block_int.h" #include "block/qcow2.h" @@ -43,6 +44,10 @@#define BME_MIN_GRANULARITY_BITS 9#define BME_MAX_NAME_SIZE 1023 +#if BME_MAX_TABLE_SIZE *8ULL >INT_MAX +#error In the code bitmap table physical size assumed to fit into int +#endif +/* Bitmap directory entry flags */ #define BME_RESERVED_FLAGS 0xfffffffcU#define BME_FLAG_IN_USE 1
block/qcow2-bitmap.c typedef struct Qcow2Bitmap { · line 82
Quoted 4 lines
block/qcow2-bitmap.c +1
-0@@ -74,6 +79,8 @@ typedef struct Qcow2Bitmap {uint8_t granularity_bits;char *name; +BdrvDirtyBitmap *dirty_bitmap;
(I'm not quite happy with the asymmetry of this field (it isn't set by load_bitmap(), but it is required by store_bitmap()), but making it symmetric either by making load_bitmap() set it or by store_bitmap() not reading it (but getting the value through an explicit parameter) makes the code needlessly more complicated, so I guess I'll have to stay not-quite-happy.)
Quoted 8 lines
block/qcow2-bitmap.c +1
-0+QSIMPLEQ_ENTRY (Qcow2Bitmap) entry; } Qcow2Bitmap; typedef QSIMPLEQ_HEAD(Qcow2BitmapList, Qcow2Bitmap) Qcow2BitmapList;@@ -87,6 +94,27 @@ static inline bool can_write(BlockDriverState *bs)return !bdrv_is_read_only (bs) && !(bdrv_get_flags (bs) &BDRV_O_INACTIVE ); }
block/qcow2-bitmap.c static inline bool can_write(BlockDriverState *bs) · line 106
Quoted 10 lines
block/qcow2-bitmap.c +10
-0+static int update_header_sync (BlockDriverState *bs) +{ +int ret; + + ret =qcow2_update_header (bs); +if (ret <0 ) { +return ret; + } + +/* We doesn't return bdrv_flush error code. Even if it fails, write was
s/doesn't/don't/
(Also, there's a double space after return.)
Quoted 38 lines
block/qcow2-bitmap.c +24
-0+* successful and it is more logical to consider that header is in the new +* state than in the old. +*/ + ret =bdrv_flush (bs); +if (ret <0 ) { +fprintf (stderr,"Failed to flush qcow2 header" ); + } + +return 0 ; +} +static inline void bitmap_table_to_cpu (uint64_t *bitmap_table,size_t size) {size_t i;@@ -96,6 +124,15 @@ static inline void bitmap_table_to_cpu(uint64_t *bitmap_table, size_t size) } } +static inline void bitmap_table_to_be (uint64_t *bitmap_table,size_t size) +{ +size_t i; + +for (i =0 ; i < size; ++i) { +cpu_to_be64s (&bitmap_table[i]); + } +} +/* Check table entry specification constraints. If cluster_size is 0, offset * alignment is not checked. */ static int check_table_entry (uint64_t entry,int cluster_size)@@ -121,6 +158,51 @@ static int check_table_entry(uint64_t entry, int cluster_size)return 0 ; } +static int check_constraints_on_bitmap (BlockDriverState *bs, +const char *name, +uint32_t granularity) +{
block/qcow2-bitmap.c static int check_table_entry(uint64_t entry, int cluster_size) · line 174
Quoted 10 lines
block/qcow2-bitmap.c +10
-0+BDRVQcow2State *s = bs->opaque; +int granularity_bits =ctz32 (granularity); + +int64_t nb_sectors =bdrv_nb_sectors (bs); + +if (nb_sectors <0 ) { +return nb_sectors; + } + + uint64_t phys_bitmap_bytes = (nb_sectors << BDRV_SECTOR_BITS) >>
Using bdrv_getlength() would be simpler.
block/qcow2-bitmap.c static int check_table_entry(uint64_t entry, int cluster_size) · line 176
Quoted 2 lines
block/qcow2-bitmap.c +2
-0+ granularity_bits; +uint64_t bitmap_table_size = phys_bitmap_bytes / s->cluster_size;
Should be a DIV_ROUND_UP().
block/qcow2-bitmap.c static int check_table_entry(uint64_t entry, int cluster_size) · line 179
Quoted 3 lines
block/qcow2-bitmap.c +3
-0+size_t name_size =strlen (name); + + int fail =
I'd personally like a bool more.
Quoted 84 lines
block/qcow2-bitmap.c +70
-0+ (bitmap_table_size >BME_MAX_TABLE_SIZE ) || + (phys_bitmap_bytes >BME_MAX_PHYS_SIZE ) || + (granularity_bits >BME_MAX_GRANULARITY_BITS ) || + (granularity_bits <BME_MIN_GRANULARITY_BITS ) || + (name_size >BME_MAX_NAME_SIZE ); + +return fail ? -EINVAL :0 ; +} + +static void clear_bitmap_table (BlockDriverState *bs,uint64_t *bitmap_table, +uint32_t bitmap_table_size) +{ +BDRVQcow2State *s = bs->opaque; +int i; + +for (i =0 ; i < bitmap_table_size; ++i) { +uint64_t addr = bitmap_table[i] &BME_TABLE_ENTRY_OFFSET_MASK ; +if (!addr) { +continue ; + } + +qcow2_free_clusters (bs, addr, s->cluster_size,QCOW2_DISCARD_OTHER ); + bitmap_table[i] =0 ; + } +} +static int bitmap_table_load (BlockDriverState *bs,Qcow2Bitmap *bm,uint64_t **bitmap_table) {@@ -159,6 +241,28 @@ fail:return ret; } +static int free_bitmap_clusters (BlockDriverState *bs,Qcow2Bitmap *bm) +{ +int ret; +uint64_t *bitmap_table; + + ret =bitmap_table_load (bs, bm, &bitmap_table); +if (ret <0 ) { +assert (bitmap_table ==NULL ); +return ret; + } + +clear_bitmap_table (bs, bitmap_table, bm->table_size); +qcow2_free_clusters (bs, bm->table_offset, bm->table_size *sizeof (uint64_t ), +QCOW2_DISCARD_OTHER ); +g_free (bitmap_table); + + bm->table_offset =0 ; + bm->table_size =0 ; + +return 0 ; +} +/* This function returns the number of disk sectors covered by a single cluster * of bitmap data. */ static uint64_t disk_sectors_in_bitmap_cluster(const BDRVQcow2State *s,@@ -603,6 +707,72 @@ fail:* Bitmap List end */ +static int update_ext_header_and_dir (BlockDriverState *bs, +Qcow2BitmapList *bm_list) +{ +BDRVQcow2State *s = bs->opaque; +int ret; +Qcow2Bitmap *bm; +uint64_t new_offset =0 ; +uint64_t new_size =0 ; +uint32_t new_nb_bitmaps =0 ; +uint64_t old_offset = s->bitmap_directory_offset; +uint64_t old_size = s->bitmap_directory_size; +uint32_t old_nb_bitmaps = s->nb_bitmaps; +uint64_t old_autocl = s->autoclear_features; + +if (bm_list !=NULL && !QSIMPLEQ_EMPTY (bm_list)) { + QSIMPLEQ_FOREACH(bm, bm_list, entry) { + new_nb_bitmaps++; + } + +if (new_nb_bitmaps >QCOW2_MAX_BITMAPS ) { +return -EINVAL ; + }
block/qcow2-bitmap.c fail: · line 741
Quoted 10 lines
block/qcow2-bitmap.c +10
-0+ + ret =bitmap_list_store (bs, bm_list, &new_offset, &new_size, false); +if (ret <0 ) { +return ret; + } + + ret =bdrv_flush (bs); +if (ret <0 ) { + goto fail; + }
I think this only needs to flush bs->file, not bs itself. Alternatively, bitmap_list_store() could just use bdrv_pwrite_sync().
Quoted 54 lines
block/qcow2-bitmap.c +47
-0+ + s->autoclear_features |=QCOW2_AUTOCLEAR_BITMAPS ; + }else { + s->autoclear_features &= ~(uint64_t )QCOW2_AUTOCLEAR_BITMAPS ; + } + + s->bitmap_directory_offset = new_offset; + s->bitmap_directory_size = new_size; + s->nb_bitmaps = new_nb_bitmaps; + + ret =update_header_sync (bs); +if (ret <0 ) { + goto fail; + } + +if (old_size >0 ) { +qcow2_free_clusters (bs, old_offset, old_size,QCOW2_DISCARD_OTHER ); + } + +return 0 ; + +fail: +if (new_offset >0 ) { +qcow2_free_clusters (bs, new_offset, new_size,QCOW2_DISCARD_OTHER ); + } + + s->bitmap_directory_offset = old_offset; + s->bitmap_directory_size = old_size; + s->nb_bitmaps = old_nb_bitmaps; + s->autoclear_features = old_autocl; + +return ret; +} +/* for g_slist_foreach for GSList of BdrvDirtyBitmap* elements */ static void release_dirty_bitmap_helper (gpointer bitmap,gpointer bs)@@ -664,3 +834,284 @@ fail:g_slist_free (created_dirty_bitmaps);bitmap_list_free (bm_list); } + +/* store_bitmap_data() +* Store bitmap to image, filling bitmap table accordingly. +*/ +static uint64_t *store_bitmap_data (BlockDriverState *bs, +BdrvDirtyBitmap *bitmap, +uint32_t *bitmap_table_size,Error **errp) +{ +int ret; +BDRVQcow2State *s = bs->opaque; +int64_t sector; +uint64_t dsc; +uint64_t bm_size =bdrv_dirty_bitmap_size (bitmap);
block/qcow2-bitmap.c fail: · line 859
Quoted 10 lines
block/qcow2-bitmap.c +10
-0+const char *bm_name =bdrv_dirty_bitmap_name (bitmap); +uint8_t *buf =NULL ; +BdrvDirtyBitmapIter *dbi; +uint64_t *tb; +uint64_t tb_size = +size_to_clusters (s, +bdrv_dirty_bitmap_serialization_size (bitmap,0 , bm_size)); + +if (tb_size >BME_MAX_TABLE_SIZE || + tb_size * s->cluster_size >BME_MAX_PHYS_SIZE ) {
Alignment to the opening parenthesis, please.
Quoted 22 lines
block/qcow2-bitmap.c +22
-0+error_setg (errp,"Bitmap '%s' is too big" , bm_name); +return NULL ; + } + + tb =g_try_new0 (uint64_t, tb_size); +if (tb ==NULL ) { +error_setg (errp,"No memory" ); +return NULL ; + } + + dbi =bdrv_dirty_iter_new (bitmap,0 ); + buf =g_malloc (s->cluster_size); + dsc =disk_sectors_in_bitmap_cluster (s, bitmap); + +while ((sector =bdrv_dirty_iter_next (dbi)) !=-1 ) { +uint64_t cluster = sector / dsc; +uint64_t end, write_size; +int64_t off; + + sector = cluster * dsc; + end =MIN (bm_size, sector + dsc); + write_size =
block/qcow2-bitmap.c fail: · line 891
Quoted 10 lines
block/qcow2-bitmap.c +10
-0+bdrv_dirty_bitmap_serialization_size (bitmap, sector, end - sector); + + off =qcow2_alloc_clusters (bs, s->cluster_size); +if (off <0 ) { +error_setg_errno (errp, -off, +"Failed to allocate clusters for bitmap '%s'" , + bm_name); + goto fail; + } + tb[cluster] = off;
Somehow I would feel better with either an assert(cluster < tb_size); here or an assert(bdrv_nb_sectors(bs) / dsc == tb_size); (plus the error handling for bdrv_nb_sectors()) above the loop.
block/qcow2-bitmap.c fail: · line 896
Quoted 5 lines
block/qcow2-bitmap.c +5
-0+ +bdrv_dirty_bitmap_serialize_part (bitmap, buf, sector, end - sector); +if (write_size < s->cluster_size) { +memset (buf + write_size,0 , s->cluster_size - write_size); + }
Should we assert that write_size <= s->cluster_size?
Quoted 85 lines
block/qcow2-bitmap.c +85
-0+ + ret =qcow2_pre_write_overlap_check (bs,0 , off, s->cluster_size); +if (ret <0 ) { +error_setg_errno (errp, -ret,"Qcow2 overlap check failed" ); + goto fail; + } + + ret =bdrv_pwrite (bs->file, off, buf, s->cluster_size); +if (ret <0 ) { +error_setg_errno (errp, -ret,"Failed to write bitmap '%s' to file" , + bm_name); + goto fail; + } + +if (end >= bm_size) { +break ; + } + +bdrv_set_dirty_iter (dbi, end); + } + + *bitmap_table_size = tb_size; +g_free (buf); +bdrv_dirty_iter_free (dbi); + +return tb; + +fail: +clear_bitmap_table (bs, tb, tb_size); +g_free (buf); +bdrv_dirty_iter_free (dbi); +g_free (tb); + +return NULL ; +} + +/* store_bitmap() +* Store bm->dirty_bitmap to qcow2. +* Set bm->table_offset and bm->table_size accordingly. +*/ +static int store_bitmap (BlockDriverState *bs,Qcow2Bitmap *bm,Error **errp) +{ +int ret; +uint64_t *tb; +int64_t tb_offset; +uint32_t tb_size; +BdrvDirtyBitmap *bitmap = bm->dirty_bitmap; +const char *bm_name; + +assert (bitmap !=NULL ); + + bm_name =bdrv_dirty_bitmap_name (bitmap); + + tb =store_bitmap_data (bs, bitmap, &tb_size, errp); +if (tb ==NULL ) { +g_free (tb); +return -EINVAL ; + } + +assert (tb_size <=BME_MAX_TABLE_SIZE ); + tb_offset =qcow2_alloc_clusters (bs, tb_size *sizeof (tb[0 ])); +if (tb_offset <0 ) { +error_setg_errno (errp, -tb_offset, +"Failed to allocate clusters for bitmap '%s'" , + bm_name); + goto fail; + } + + ret =qcow2_pre_write_overlap_check (bs,0 , tb_offset, + tb_size *sizeof (tb[0 ])); +if (ret <0 ) { +error_setg_errno (errp, -ret,"Qcow2 overlap check failed" ); + goto fail; + } + +bitmap_table_to_be (tb, tb_size); + ret =bdrv_pwrite (bs->file, tb_offset, tb, tb_size *sizeof (tb[0 ])); +if (ret <0 ) { +error_setg_errno (errp, -ret,"Failed to write bitmap '%s' to file" , + bm_name); + goto fail; + } + +g_free (tb); +
block/qcow2-bitmap.c fail: · line 991
Quoted 10 lines
block/qcow2-bitmap.c +10
-0+ bm->table_offset = tb_offset; + bm->table_size = tb_size; + +return 0 ; + +fail: +clear_bitmap_table (bs, tb, tb_size); + +if (tb_offset >0 ) { +qcow2_free_clusters (bs, tb_offset, tb_size,QCOW2_DISCARD_OTHER );
tb_size should be tb_size * sizeof(uint64_t) (or sizeof(tb[0])).
Quoted 24 lines
block/qcow2-bitmap.c +24
-0+ } + +g_free (tb); + +return ret; +} + +static Qcow2Bitmap *find_bitmap_by_name (Qcow2BitmapList *bm_list, +const char *name) +{ +Qcow2Bitmap *bm; + + QSIMPLEQ_FOREACH(bm, bm_list, entry) { +if (strcmp (name, bm->name) ==0 ) { +return bm; + } + } + +return NULL ; +} + +void qcow2_store_persistent_dirty_bitmaps (BlockDriverState *bs,Error **errp) +{ +BdrvDirtyBitmap *bitmap;
block/qcow2-bitmap.c fail: · line 1025
Quoted 10 lines
block/qcow2-bitmap.c +10
-0+BDRVQcow2State *s = bs->opaque; +uint32_t new_nb_bitmaps = s->nb_bitmaps; +uint64_t new_dir_size = s->bitmap_directory_size; +int ret; +Qcow2BitmapList *bm_list; +Qcow2Bitmap *bm; + +if (!bdrv_has_persistent_bitmaps (bs)) { +/* nothing to do */ +return ;
Maybe there is something to do. See [1].
Quoted 6 lines
block/qcow2-bitmap.c +6
-0+ } + +if (s->nb_bitmaps ==0 ) { + bm_list =bitmap_list_new (); + }else { + bm_list = bitmap_list_load(bs, s->bitmap_directory_offset,
block/qcow2-bitmap.c fail: · line 1041
Quoted 10 lines
block/qcow2-bitmap.c +10
-0+ s->bitmap_directory_size, errp); +if (bm_list ==NULL ) { +/* errp is already set */ +return ; + } + } + +/* check constraints and names */ +for (bitmap =bdrv_dirty_bitmap_next (bs,NULL ); bitmap !=NULL ; + bitmap =bdrv_dirty_bitmap_next (bs, bitmap)) {
Alignment to the opening parenthesis, please.
Quoted 8 lines
block/qcow2-bitmap.c +8
-0+const char *name =bdrv_dirty_bitmap_name (bitmap); +uint32_t granularity =bdrv_dirty_bitmap_granularity (bitmap); +Qcow2Bitmap *bm; + +if (!bdrv_dirty_bitmap_get_persistance (bitmap)) { +continue ; + } +
block/qcow2-bitmap.c fail: · line 1059
Quoted 10 lines
block/qcow2-bitmap.c +10
-0+if (++new_nb_bitmaps >QCOW2_MAX_BITMAPS ) { +error_setg (errp,"Too many persistent bitmaps" ); + goto fail; + } + + new_dir_size +=calc_dir_entry_size (strlen (name),0 ); +if (new_dir_size >QCOW2_MAX_BITMAP_DIRECTORY_SIZE ) { +error_setg (errp,"Too large bitmap directory" ); + goto fail; + }
You only need to increment new_nb_bitmaps and increase new_dir_size if the bitmap does not already exist in the image (i.e. if find_bitmap_by_name() below returns NULL).
Quoted 4 lines
block/qcow2-bitmap.c +4
-0+ +if (check_constraints_on_bitmap (bs, name, granularity) <0 ) { +error_setg (errp,"Bitmap '%s' doesn't satisfy the constraints" , + name);
block/qcow2-bitmap.c fail: · line 1073
Quoted 10 lines
block/qcow2-bitmap.c +10
-0+ goto fail; + } + + bm =find_bitmap_by_name (bm_list, name); +if (bm ==NULL ) { + bm =g_new0 (Qcow2Bitmap,1 ); + bm->name =g_strdup (name); +QSIMPLEQ_INSERT_TAIL (bm_list, bm, entry); + }else { +if (!(bm->flags &BME_FLAG_IN_USE ) &&can_write (bs)) {
Shouldn't we error out right at the beginning of this function if can_write(bs) is false?
block/qcow2-bitmap.c fail: · line 1078
Quoted 5 lines
block/qcow2-bitmap.c +5
-0+error_setg (errp,"Bitmap '%s' is already exists in the image" , + name); + goto fail; + } +free_bitmap_clusters (bs, bm);
These clusters should not be freed until the new data has been written successfully.
block/qcow2-bitmap.c fail: · line 1084
Quoted 6 lines
block/qcow2-bitmap.c +6
-0+/* TODO it is better to reuse these clusters */ + } + bm->flags =bdrv_dirty_bitmap_get_autoload (bitmap) ?BME_FLAG_AUTO :0 ; + bm->granularity_bits =ctz32 (bdrv_dirty_bitmap_granularity (bitmap)); + bm->dirty_bitmap = bitmap; + }
[1] What about bitmaps that have BME_FLAG_IN_USE set but do not have a corresponding BDS bitmap?
If such a bitmap does not have BME_FLAG_AUTO set, we didn't set the flag, so we should keep it unchanged. That's what this function is currently doing.
However, if such a bitmap does have BME_FLAG_AUTO set, it was definitely us who set the IN_USE flag (because otherwise we would have aborted loading the bitmaps, and thus also aborted bdrv_open_common()). Therefore, the only explanation is that the bitmap was deleted in the meantime, and that means we should also delete it in the qcow2 file.
Max
Quoted 57 lines
block/qcow2-bitmap.c +33
-0+ +/* allocate clusters and store bitmaps */ + QSIMPLEQ_FOREACH(bm, bm_list, entry) { +if (bm->dirty_bitmap ==NULL ) { +continue ; + } + + ret =store_bitmap (bs, bm, errp); +if (ret <0 ) { + goto fail; + } + } + + ret =update_ext_header_and_dir (bs, bm_list); +if (ret <0 ) { +error_setg_errno (errp, -ret,"Failed to update bitmap extension" ); + goto fail; + } + +bitmap_list_free (bm_list); +return ; + +fail: + QSIMPLEQ_FOREACH(bm, bm_list, entry) { +if (bm->dirty_bitmap ==NULL || bm->table_offset ==0 ) { +continue ; + } + +free_bitmap_clusters (bs, bm); + } + +bitmap_list_free (bm_list); +}block/qcow2.c +1
-0@@ -3515,6 +3515,7 @@ BlockDriver bdrv_qcow2 = { .bdrv_attach_aio_context = qcow2_attach_aio_context, .bdrv_load_autoloading_dirty_bitmaps = qcow2_load_autoloading_dirty_bitmaps, + .bdrv_store_persistent_dirty_bitmaps = qcow2_store_persistent_dirty_bitmaps, };static void bdrv_qcow2_init (void )block/qcow2.h +1
-0@@ -615,5 +615,6 @@ void qcow2_cache_put(BlockDriverState *bs, Qcow2Cache *c, void **table);/* qcow2-bitmap.c functions */ void qcow2_load_autoloading_dirty_bitmaps (BlockDriverState *bs,Error **errp); +void qcow2_store_persistent_dirty_bitmaps (BlockDriverState *bs,Error **errp);#endif
Re: [Qemu-devel] [PATCH 13/21] qcow2: add .bdrv_store_persistent_dirty_bitmaps()
Quoted 14 lines · Max Reitz
Quoted 13 lines · Vladimir Sementsov-Ogievskiy
Realize block bitmap storing interface, to allow qcow2 images store persistent bitmaps.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block/qcow2-bitmap.c | 451 +++++++++++++++++++++++++++++++++++++++++++++++++++ block/qcow2.c | 1 + block/qcow2.h | 1 + 3 files changed, 453 insertions(+)block/qcow2-bitmap.c +0
-1--- a/block/qcow2-bitmap.c
[...]
Quoted 8 lines
block/qcow2-bitmap.c fail: · line 1041
Quoted 7 lines
block/qcow2-bitmap.c +7
-0+return ; + } + } + +/* check constraints and names */ +for (bitmap =bdrv_dirty_bitmap_next (bs,NULL ); bitmap !=NULL ; + bitmap =bdrv_dirty_bitmap_next (bs, bitmap)) {Alignment to the opening parenthesis, please.
Hmm.. without an alignment it is not so simple to distinguish for-loop header from its body.
[...]
Quoted 7 lines
[1] What about bitmaps that have
BME_FLAG_IN_USEset but do not have a corresponding BDS bitmap?If such a bitmap does not have
BME_FLAG_AUTOset, we didn't set the flag, so we should keep it unchanged. That's what this function is currently doing.
Quoted 5 lines
However, if such a bitmap does have
BME_FLAG_AUTOset, it was definitely us who set theIN_USEflag (because otherwise we would have aborted loading the bitmaps, and thus also abortedbdrv_open_common()). Therefore, the only explanation is that the bitmap was deleted in the meantime, and that means we should also delete it in the qcow2 file.
Right. Or, alternatively, these bitmaps may be deleted on corresponding BdrvDirtyBitmap deletion.
Signature · 2 lines
Best regards, Vladimir
Re: [Qemu-devel] [PATCH 13/21] qcow2: add .bdrv_store_persistent_dirty_bitmaps()
Quoted 26 lines · Vladimir Sementsov-Ogievskiy
Quoted 15 lines · Max Reitz
Quoted 14 lines · Vladimir Sementsov-Ogievskiy
Realize block bitmap storing interface, to allow qcow2 images store persistent bitmaps.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block/qcow2-bitmap.c | 451 +++++++++++++++++++++++++++++++++++++++++++++++++++ block/qcow2.c | 1 + block/qcow2.h | 1 + 3 files changed, 453 insertions(+)block/qcow2-bitmap.c +0
-1--- a/block/qcow2-bitmap.c[...]
Quoted 7 lines
Quoted 7 lines
block/qcow2-bitmap.c +7
-0+return ; + } + } + +/* check constraints and names */ +for (bitmap =bdrv_dirty_bitmap_next (bs,NULL ); bitmap !=NULL ; + bitmap =bdrv_dirty_bitmap_next (bs, bitmap)) {
Quoted 4 lines
Quoted 1 line
Alignment to the opening parenthesis, please.
Hmm.. without an alignment it is not so simple to distinguish for-loop header from its body.
I know, and it's even worse for "if". That is why I usually put the opening { on a new line if I have to spread an if/while/for header over multiple lines.
The usual convention for qemu code is to align at an opening parenthesis if there is one.
Admittedly, the reasoning I gave for changing checkpatch.pl to accept opening { on a new line in certain cases was that:
(1) We never codified exactly what to allow for multi-line if/while/for conditions.
(2) It was existing practice.
(1) applies in your case also; we don't have any explicitly written-out convention for alignment of wrapped lines. (2) is more difficult, but there are indeed a handful of cases where lines are wrapped and not aligned to the opening parenthesis but just indented by an additional four spaces...
So I guess since I'm insisting on putting the opening { on a new line for multi-line conditions, you are allowed to indent the consecutive lines by an additional level. ;-)
(It *is* against existing convention, but I'm not in a position to argue.)
Quoted 9 lines
[...]
Quoted 7 lines
[1] What about bitmaps that have
BME_FLAG_IN_USEset but do not have a corresponding BDS bitmap?If such a bitmap does not have
BME_FLAG_AUTOset, we didn't set the flag, so we should keep it unchanged. That's what this function is currently doing.
Quoted 8 lines
Quoted 5 lines
However, if such a bitmap does have
BME_FLAG_AUTOset, it was definitely us who set theIN_USEflag (because otherwise we would have aborted loading the bitmaps, and thus also abortedbdrv_open_common()). Therefore, the only explanation is that the bitmap was deleted in the meantime, and that means we should also delete it in the qcow2 file.Right. Or, alternatively, these bitmaps may be deleted on corresponding BdrvDirtyBitmap deletion.
Right, that would work, too.
Max
Re: [Qemu-devel] [PATCH 13/21] qcow2: add .bdrv_store_persistent_dirty_bitmaps()
Quoted 33 lines · Max Reitz
Quoted 25 lines · Vladimir Sementsov-Ogievskiy
Quoted 15 lines · Max Reitz
Quoted 14 lines · Vladimir Sementsov-Ogievskiy
Realize block bitmap storing interface, to allow qcow2 images store persistent bitmaps.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block/qcow2-bitmap.c | 451 +++++++++++++++++++++++++++++++++++++++++++++++++++ block/qcow2.c | 1 + block/qcow2.h | 1 + 3 files changed, 453 insertions(+)block/qcow2-bitmap.c +0
-1--- a/block/qcow2-bitmap.c[...]
Quoted 7 lines
Quoted 7 lines
block/qcow2-bitmap.c +7
-0+return ; + } + } + +/* check constraints and names */ +for (bitmap =bdrv_dirty_bitmap_next (bs,NULL ); bitmap !=NULL ; + bitmap =bdrv_dirty_bitmap_next (bs, bitmap)) {Quoted 3 lines
Quoted 1 line
Alignment to the opening parenthesis, please.
Hmm.. without an alignment it is not so simple to distinguish for-loop header from its body.
I know, and it's even worse for "if". That is why I usually put the opening { on a new line if I have to spread an if/while/for header over multiple lines.
Quoted 5 lines
The usual convention for qemu code is to align at an opening parenthesis if there is one.
Admittedly, the reasoning I gave for changing checkpatch.pl to accept opening { on a new line in certain cases was that:
Good news, didn't know)
Quoted 37 lines
(1) We never codified exactly what to allow for multi-line if/while/for conditions.
(2) It was existing practice.(1) applies in your case also; we don't have any explicitly written-out convention for alignment of wrapped lines. (2) is more difficult, but there are indeed a handful of cases where lines are wrapped and not aligned to the opening parenthesis but just indented by an additional four spaces...
So I guess since I'm insisting on putting the opening { on a new line for multi-line conditions, you are allowed to indent the consecutive lines by an additional level. ;-)
(It *is* against existing convention, but I'm not in a position to argue.)
Quoted 9 lines
[...]
Quoted 7 lines
[1] What about bitmaps that have
BME_FLAG_IN_USEset but do not have a corresponding BDS bitmap?If such a bitmap does not have
BME_FLAG_AUTOset, we didn't set the flag, so we should keep it unchanged. That's what this function is currently doing.Quoted 7 lines
Quoted 5 lines
However, if such a bitmap does have
BME_FLAG_AUTOset, it was definitely us who set theIN_USEflag (because otherwise we would have aborted loading the bitmaps, and thus also abortedbdrv_open_common()). Therefore, the only explanation is that the bitmap was deleted in the meantime, and that means we should also delete it in the qcow2 file.Right. Or, alternatively, these bitmaps may be deleted on corresponding BdrvDirtyBitmap deletion.
Right, that would work, too.
Max
Signature · 2 lines
Best regards, Vladimir
Re: [Qemu-devel] [PATCH 13/21] qcow2: add .bdrv_store_persistent_dirty_bitmaps()
In reply to Max ReitzQuoted 8 lines · Max Reitz
Quoted 7 lines · Vladimir Sementsov-Ogievskiy
Realize block bitmap storing interface, to allow qcow2 images store persistent bitmaps.
Signed-off-by Vladimir Sementsov-Ogievskiy<[email protected]>--- block/qcow2-bitmap.c | 451 +++++++++++++++++++++++++++++++++++++++++++++++++++ block/qcow2.c | 1 +
[...]
Quoted 52 lines
Quoted 13 lines
block/qcow2-bitmap.c +13
-0+ +/* store_bitmap_data() +* Store bitmap to image, filling bitmap table accordingly. +*/ +static uint64_t *store_bitmap_data (BlockDriverState *bs, +BdrvDirtyBitmap *bitmap, +uint32_t *bitmap_table_size,Error **errp) +{ +int ret; +BDRVQcow2State *s = bs->opaque; +int64_t sector; +uint64_t dsc; +uint64_t bm_size =bdrv_dirty_bitmap_size (bitmap);block/qcow2-bitmap.c fail: · line 859
Quoted 10 lines
block/qcow2-bitmap.c +10
-0+const char *bm_name =bdrv_dirty_bitmap_name (bitmap); +uint8_t *buf =NULL ; +BdrvDirtyBitmapIter *dbi; +uint64_t *tb; +uint64_t tb_size = +size_to_clusters (s, +bdrv_dirty_bitmap_serialization_size (bitmap,0 , bm_size)); + +if (tb_size >BME_MAX_TABLE_SIZE || + tb_size * s->cluster_size >BME_MAX_PHYS_SIZE ) {Alignment to the opening parenthesis, please.
Quoted 27 lines
block/qcow2-bitmap.c +27
-0+error_setg (errp,"Bitmap '%s' is too big" , bm_name); +return NULL ; + } + + tb =g_try_new0 (uint64_t, tb_size); +if (tb ==NULL ) { +error_setg (errp,"No memory" ); +return NULL ; + } + + dbi =bdrv_dirty_iter_new (bitmap,0 ); + buf =g_malloc (s->cluster_size); + dsc =disk_sectors_in_bitmap_cluster (s, bitmap); + +while ((sector =bdrv_dirty_iter_next (dbi)) !=-1 ) { +uint64_t cluster = sector / dsc; +uint64_t end, write_size; +int64_t off; + + sector = cluster * dsc; + end =MIN (bm_size, sector + dsc); + write_size = +bdrv_dirty_bitmap_serialization_size (bitmap, sector, end - sector); + + off =qcow2_alloc_clusters (bs, s->cluster_size); +if (off <0 ) { + error_setg_errno(errp, -off,
Quoted 8 lines
block/qcow2-bitmap.c fail: · line 891
Quoted 5 lines
block/qcow2-bitmap.c +5
-0+"Failed to allocate clusters for bitmap '%s'" , + bm_name); + goto fail; + } + tb[cluster] = off;Somehow I would feel better with either an
assert(cluster < tb_size); here or anassert(bdrv_nb_sectors(bs) / dsc == tb_size); (plus the error handling forbdrv_nb_sectors()) above the loop.
assert((bm_size - 1) / dsc == tb_size - 1) seems ok. and no additional error handling. Right?
Quoted 6 lines
block/qcow2-bitmap.c fail: · line 896
Quoted 5 lines
block/qcow2-bitmap.c +5
-0+ +bdrv_dirty_bitmap_serialize_part (bitmap, buf, sector, end - sector); +if (write_size < s->cluster_size) { +memset (buf + write_size,0 , s->cluster_size - write_size); + }Should we assert that
write_size<=s->cluster_size?
Ok
[...].
Quoted 14 lines
Quoted 14 lines
block/qcow2-bitmap.c +13
-0+const char *name =bdrv_dirty_bitmap_name (bitmap); +uint32_t granularity =bdrv_dirty_bitmap_granularity (bitmap); +Qcow2Bitmap *bm; + +if (!bdrv_dirty_bitmap_get_persistance (bitmap)) { +continue ; + } + +if (++new_nb_bitmaps >QCOW2_MAX_BITMAPS ) { +error_setg (errp,"Too many persistent bitmaps" ); + goto fail; + } +
Quoted 8 lines
block/qcow2-bitmap.c fail: · line 1059
Quoted 5 lines
block/qcow2-bitmap.c +5
-0+ new_dir_size +=calc_dir_entry_size (strlen (name),0 ); +if (new_dir_size >QCOW2_MAX_BITMAP_DIRECTORY_SIZE ) { +error_setg (errp,"Too large bitmap directory" ); + goto fail; + }You only need to increment
new_nb_bitmapsand increasenew_dir_sizeif the bitmap does not already exist in the image (i.e. iffind_bitmap_by_name()below returns NULL).
Why? No, I need to check the whole sum and the whole size.
Quoted 17 lines
Quoted 5 lines
block/qcow2-bitmap.c +4
-0+ +if (check_constraints_on_bitmap (bs, name, granularity) <0 ) { +error_setg (errp,"Bitmap '%s' doesn't satisfy the constraints" , + name);block/qcow2-bitmap.c fail: · line 1073
Quoted 10 lines
block/qcow2-bitmap.c +10
-0+ goto fail; + } + + bm =find_bitmap_by_name (bm_list, name); +if (bm ==NULL ) { + bm =g_new0 (Qcow2Bitmap,1 ); + bm->name =g_strdup (name); +QSIMPLEQ_INSERT_TAIL (bm_list, bm, entry); + }else { +if (!(bm->flags &BME_FLAG_IN_USE ) &&can_write (bs)) {Shouldn't we error out right at the beginning of this function if
can_write(bs)is false?
Hmm, right.
[...]
Signature · 2 lines
Best regards, Vladimir
Re: [Qemu-devel] [PATCH 13/21] qcow2: add .bdrv_store_persistent_dirty_bitmaps()
Quoted 73 lines · Vladimir Sementsov-Ogievskiy
Quoted 8 lines · Max Reitz
Quoted 7 lines · Vladimir Sementsov-Ogievskiy
Realize block bitmap storing interface, to allow qcow2 images store persistent bitmaps.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block/qcow2-bitmap.c | 451 +++++++++++++++++++++++++++++++++++++++++++++++++++ block/qcow2.c | 1 +[...]
Quoted 52 lines
Quoted 13 lines
block/qcow2-bitmap.c +13
-0+ +/* store_bitmap_data() +* Store bitmap to image, filling bitmap table accordingly. +*/ +static uint64_t *store_bitmap_data (BlockDriverState *bs, +BdrvDirtyBitmap *bitmap, +uint32_t *bitmap_table_size,Error **errp) +{ +int ret; +BDRVQcow2State *s = bs->opaque; +int64_t sector; +uint64_t dsc; +uint64_t bm_size =bdrv_dirty_bitmap_size (bitmap);block/qcow2-bitmap.c fail: · line 859
Quoted 10 lines
block/qcow2-bitmap.c +10
-0+const char *bm_name =bdrv_dirty_bitmap_name (bitmap); +uint8_t *buf =NULL ; +BdrvDirtyBitmapIter *dbi; +uint64_t *tb; +uint64_t tb_size = +size_to_clusters (s, +bdrv_dirty_bitmap_serialization_size (bitmap,0 , bm_size)); + +if (tb_size >BME_MAX_TABLE_SIZE || + tb_size * s->cluster_size >BME_MAX_PHYS_SIZE ) {Alignment to the opening parenthesis, please.
Quoted 27 lines
block/qcow2-bitmap.c +27
-0+error_setg (errp,"Bitmap '%s' is too big" , bm_name); +return NULL ; + } + + tb =g_try_new0 (uint64_t, tb_size); +if (tb ==NULL ) { +error_setg (errp,"No memory" ); +return NULL ; + } + + dbi =bdrv_dirty_iter_new (bitmap,0 ); + buf =g_malloc (s->cluster_size); + dsc =disk_sectors_in_bitmap_cluster (s, bitmap); + +while ((sector =bdrv_dirty_iter_next (dbi)) !=-1 ) { +uint64_t cluster = sector / dsc; +uint64_t end, write_size; +int64_t off; + + sector = cluster * dsc; + end =MIN (bm_size, sector + dsc); + write_size = +bdrv_dirty_bitmap_serialization_size (bitmap, sector, end - sector); + + off =qcow2_alloc_clusters (bs, s->cluster_size); +if (off <0 ) { + error_setg_errno(errp, -off,Quoted 8 lines
block/qcow2-bitmap.c fail: · line 891
Quoted 5 lines
block/qcow2-bitmap.c +5
-0+"Failed to allocate clusters for bitmap '%s'" , + bm_name); + goto fail; + } + tb[cluster] = off;Somehow I would feel better with either an
assert(cluster < tb_size); here or anassert(bdrv_nb_sectors(bs) / dsc == tb_size); (plus the error handling forbdrv_nb_sectors()) above the loop.
Quoted 2 lines
assert((bm_size - 1) / dsc == tb_size - 1)seems ok. and no additional error handling. Right?
Right, bm_size is already equal to bdrv_nb_sectors(bs), and it's not necessarily a multiple of dsc. So that should be good. Alternatively, I think the following would be slightly easier to read:
assert(DIV_ROUND_UP(bm_size, dsc) == tb_size);
Quoted 35 lines
Quoted 7 lines
block/qcow2-bitmap.c fail: · line 896
Quoted 6 lines
block/qcow2-bitmap.c +5
-0+ +bdrv_dirty_bitmap_serialize_part (bitmap, buf, sector, end - sector); +if (write_size < s->cluster_size) { +memset (buf + write_size,0 , s->cluster_size - write_size); + }Should we assert that
write_size<=s->cluster_size?Ok
[...].
Quoted 14 lines
Quoted 14 lines
block/qcow2-bitmap.c +13
-0+const char *name =bdrv_dirty_bitmap_name (bitmap); +uint32_t granularity =bdrv_dirty_bitmap_granularity (bitmap); +Qcow2Bitmap *bm; + +if (!bdrv_dirty_bitmap_get_persistance (bitmap)) { +continue ; + } + +if (++new_nb_bitmaps >QCOW2_MAX_BITMAPS ) { +error_setg (errp,"Too many persistent bitmaps" ); + goto fail; + } +Quoted 8 lines
block/qcow2-bitmap.c fail: · line 1059
Quoted 5 lines
block/qcow2-bitmap.c +5
-0+ new_dir_size +=calc_dir_entry_size (strlen (name),0 ); +if (new_dir_size >QCOW2_MAX_BITMAP_DIRECTORY_SIZE ) { +error_setg (errp,"Too large bitmap directory" ); + goto fail; + }You only need to increment
new_nb_bitmapsand increasenew_dir_sizeif the bitmap does not already exist in the image (i.e. iffind_bitmap_by_name()below returns NULL).
Quoted 1 line
Why? No, I need to check the whole sum and the whole size.
If the bitmap already exists, you don't create a new directory entry but reuse the existing one. Therefore, the number of bitmaps in the image and the directory size will not grow then.
Max
Quoted 25 lines
Quoted 8 lines
Quoted 8 lines
block/qcow2-bitmap.c +8
-0+ +if (check_constraints_on_bitmap (bs, name, granularity) <0 ) { +error_setg (errp,"Bitmap '%s' doesn't satisfy the constraints" , + name); + goto fail; + } + + bm =find_bitmap_by_name (bm_list, name);Quoted 8 lines
block/qcow2-bitmap.c fail: · line 1073
Quoted 6 lines
block/qcow2-bitmap.c +6
-0+if (bm ==NULL ) { + bm =g_new0 (Qcow2Bitmap,1 ); + bm->name =g_strdup (name); +QSIMPLEQ_INSERT_TAIL (bm_list, bm, entry); + }else { +if (!(bm->flags &BME_FLAG_IN_USE ) &&can_write (bs)) {Shouldn't we error out right at the beginning of this function if
can_write(bs)is false?Hmm, right.
[...]
Signature · 2 lines
Best regards, Vladimir
Re: [Qemu-devel] [PATCH 13/21] qcow2: add .bdrv_store_persistent_dirty_bitmaps()
Quoted 111 lines · Max Reitz
Quoted 71 lines · Vladimir Sementsov-Ogievskiy
Quoted 8 lines · Max Reitz
Quoted 7 lines · Vladimir Sementsov-Ogievskiy
Realize block bitmap storing interface, to allow qcow2 images store persistent bitmaps.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block/qcow2-bitmap.c | 451 +++++++++++++++++++++++++++++++++++++++++++++++++++ block/qcow2.c | 1 +[...]
Quoted 52 lines
Quoted 13 lines
block/qcow2-bitmap.c +13
-0+ +/* store_bitmap_data() +* Store bitmap to image, filling bitmap table accordingly. +*/ +static uint64_t *store_bitmap_data (BlockDriverState *bs, +BdrvDirtyBitmap *bitmap, +uint32_t *bitmap_table_size,Error **errp) +{ +int ret; +BDRVQcow2State *s = bs->opaque; +int64_t sector; +uint64_t dsc; +uint64_t bm_size =bdrv_dirty_bitmap_size (bitmap);block/qcow2-bitmap.c fail: · line 859
Quoted 10 lines
block/qcow2-bitmap.c +10
-0+const char *bm_name =bdrv_dirty_bitmap_name (bitmap); +uint8_t *buf =NULL ; +BdrvDirtyBitmapIter *dbi; +uint64_t *tb; +uint64_t tb_size = +size_to_clusters (s, +bdrv_dirty_bitmap_serialization_size (bitmap,0 , bm_size)); + +if (tb_size >BME_MAX_TABLE_SIZE || + tb_size * s->cluster_size >BME_MAX_PHYS_SIZE ) {Alignment to the opening parenthesis, please.
Quoted 27 lines
block/qcow2-bitmap.c +27
-0+error_setg (errp,"Bitmap '%s' is too big" , bm_name); +return NULL ; + } + + tb =g_try_new0 (uint64_t, tb_size); +if (tb ==NULL ) { +error_setg (errp,"No memory" ); +return NULL ; + } + + dbi =bdrv_dirty_iter_new (bitmap,0 ); + buf =g_malloc (s->cluster_size); + dsc =disk_sectors_in_bitmap_cluster (s, bitmap); + +while ((sector =bdrv_dirty_iter_next (dbi)) !=-1 ) { +uint64_t cluster = sector / dsc; +uint64_t end, write_size; +int64_t off; + + sector = cluster * dsc; + end =MIN (bm_size, sector + dsc); + write_size = +bdrv_dirty_bitmap_serialization_size (bitmap, sector, end - sector); + + off =qcow2_alloc_clusters (bs, s->cluster_size); +if (off <0 ) { + error_setg_errno(errp, -off,Quoted 8 lines
block/qcow2-bitmap.c fail: · line 891
Quoted 5 lines
block/qcow2-bitmap.c +5
-0+"Failed to allocate clusters for bitmap '%s'" , + bm_name); + goto fail; + } + tb[cluster] = off;Somehow I would feel better with either an
assert(cluster < tb_size); here or anassert(bdrv_nb_sectors(bs) / dsc == tb_size); (plus the error handling forbdrv_nb_sectors()) above the loop.Quoted 2 lines
assert((bm_size - 1) / dsc == tb_size - 1)seems ok. and no additional error handling. Right?Right,
bm_sizeis already equal tobdrv_nb_sectors(bs), and it's not necessarily a multiple of dsc. So that should be good. Alternatively, I think the following would be slightly easier to read:
assert(DIV_ROUND_UP(bm_size, dsc) == tb_size);Quoted 31 lines
Quoted 6 lines
block/qcow2-bitmap.c fail: · line 896
Quoted 5 lines
block/qcow2-bitmap.c +5
-0+ +bdrv_dirty_bitmap_serialize_part (bitmap, buf, sector, end - sector); +if (write_size < s->cluster_size) { +memset (buf + write_size,0 , s->cluster_size - write_size); + }Should we assert that
write_size<=s->cluster_size?Ok
[...].
Quoted 21 lines
Quoted 8 lines
block/qcow2-bitmap.c +8
-0+const char *name =bdrv_dirty_bitmap_name (bitmap); +uint32_t granularity =bdrv_dirty_bitmap_granularity (bitmap); +Qcow2Bitmap *bm; + +if (!bdrv_dirty_bitmap_get_persistance (bitmap)) { +continue ; + } +block/qcow2-bitmap.c fail: · line 1059
Quoted 10 lines
block/qcow2-bitmap.c +10
-0+if (++new_nb_bitmaps >QCOW2_MAX_BITMAPS ) { +error_setg (errp,"Too many persistent bitmaps" ); + goto fail; + } + + new_dir_size +=calc_dir_entry_size (strlen (name),0 ); +if (new_dir_size >QCOW2_MAX_BITMAP_DIRECTORY_SIZE ) { +error_setg (errp,"Too large bitmap directory" ); + goto fail; + }You only need to increment
new_nb_bitmapsand increasenew_dir_sizeif the bitmap does not already exist in the image (i.e. iffind_bitmap_by_name()below returns NULL).
Quoted 4 lines
Quoted 1 line
Why? No, I need to check the whole sum and the whole size.
If the bitmap already exists, you don't create a new directory entry but reuse the existing one. Therefore, the number of bitmaps in the image and the directory size will not grow then.
new_nb_bitmaps is not number of "newly created bitmaps", but just new value of field nb_bitmaps, so, all bitmaps - old and new are calculated into new_nb_bitmaps. Anyway, this misunderstanding shows that variable name is bad..
Quoted 28 lines
Max
Quoted 24 lines
Quoted 8 lines
Quoted 8 lines
block/qcow2-bitmap.c +8
-0+ +if (check_constraints_on_bitmap (bs, name, granularity) <0 ) { +error_setg (errp,"Bitmap '%s' doesn't satisfy the constraints" , + name); + goto fail; + } + + bm =find_bitmap_by_name (bm_list, name);Quoted 8 lines
block/qcow2-bitmap.c fail: · line 1073
Quoted 6 lines
block/qcow2-bitmap.c +6
-0+if (bm ==NULL ) { + bm =g_new0 (Qcow2Bitmap,1 ); + bm->name =g_strdup (name); +QSIMPLEQ_INSERT_TAIL (bm_list, bm, entry); + }else { +if (!(bm->flags &BME_FLAG_IN_USE ) &&can_write (bs)) {Shouldn't we error out right at the beginning of this function if
can_write(bs)is false?Hmm, right.
[...]
Signature · 2 lines
Best regards, Vladimir
Signature · 2 lines
Best regards, Vladimir
Re: [Qemu-devel] [PATCH 13/21] qcow2: add .bdrv_store_persistent_dirty_bitmaps()
Quoted 121 lines · Vladimir Sementsov-Ogievskiy
Quoted 120 lines · Max Reitz
Quoted 77 lines · Vladimir Sementsov-Ogievskiy
Quoted 9 lines · Max Reitz
Quoted 8 lines · Vladimir Sementsov-Ogievskiy
Realize block bitmap storing interface, to allow qcow2 images store persistent bitmaps.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block/qcow2-bitmap.c | 451 +++++++++++++++++++++++++++++++++++++++++++++++++++ block/qcow2.c | 1 +[...]
Quoted 57 lines
Quoted 22 lines
block/qcow2-bitmap.c +7
-0+ +/* store_bitmap_data() +* Store bitmap to image, filling bitmap table accordingly. +*/ +static uint64_t *store_bitmap_data(BlockDriverState *bs, + BdrvDirtyBitmap *bitmap, + uint32_t *bitmap_table_size,Error **errp)
block/qcow2-bitmap.c +13
-0+{ +int ret; +BDRVQcow2State *s = bs->opaque; +int64_t sector; +uint64_t dsc; +uint64_t bm_size =bdrv_dirty_bitmap_size (bitmap); +const char *bm_name =bdrv_dirty_bitmap_name (bitmap); +uint8_t *buf =NULL ; +BdrvDirtyBitmapIter *dbi; +uint64_t *tb; +uint64_t tb_size = + size_to_clusters(s, + bdrv_dirty_bitmap_serialization_size(bitmap, 0,
bm_size));block/qcow2-bitmap.c fail: · line 859
Quoted 3 lines
block/qcow2-bitmap.c +3
-0+ +if (tb_size >BME_MAX_TABLE_SIZE || + tb_size * s->cluster_size >BME_MAX_PHYS_SIZE ) {Alignment to the opening parenthesis, please.
Quoted 30 lines
block/qcow2-bitmap.c +23
-0+error_setg (errp,"Bitmap '%s' is too big" , bm_name); +return NULL ; + } + + tb =g_try_new0 (uint64_t, tb_size); +if (tb ==NULL ) { +error_setg (errp,"No memory" ); +return NULL ; + } + + dbi =bdrv_dirty_iter_new (bitmap,0 ); + buf =g_malloc (s->cluster_size); + dsc =disk_sectors_in_bitmap_cluster (s, bitmap); + +while ((sector =bdrv_dirty_iter_next (dbi)) !=-1 ) { +uint64_t cluster = sector / dsc; +uint64_t end, write_size; +int64_t off; + + sector = cluster * dsc; + end =MIN (bm_size, sector + dsc); + write_size = + bdrv_dirty_bitmap_serialization_size(bitmap, sector,end - sector);
block/qcow2-bitmap.c +5
-0+ + off =qcow2_alloc_clusters (bs, s->cluster_size); +if (off <0 ) { + error_setg_errno(errp, -off, + "Failed to allocate clusters forbitmap '%s'",
Quoted 8 lines
block/qcow2-bitmap.c fail: · line 891
Quoted 4 lines
block/qcow2-bitmap.c +4
-0+ bm_name); + goto fail; + } + tb[cluster] = off;Somehow I would feel better with either an
assert(cluster < tb_size); here or anassert(bdrv_nb_sectors(bs) / dsc == tb_size); (plus the error
handling forbdrv_nb_sectors()) above the loop.Quoted 2 lines
assert((bm_size - 1) / dsc == tb_size - 1)seems ok. and no additional error handling. Right?Right,
bm_sizeis already equal tobdrv_nb_sectors(bs), and it's not necessarily a multiple of dsc. So that should be good. Alternatively, I think the following would be slightly easier to read:
assert(DIV_ROUND_UP(bm_size, dsc) == tb_size);Quoted 34 lines
Quoted 8 lines
Quoted 7 lines
(quoted diff) +4
-1+ + bdrv_dirty_bitmap_serialize_part(bitmap, buf, sector, end - sector); + if (write_size < s->cluster_size) { + memset(buf + write_size, 0, s->cluster_size -
write_size);
+ }Should we assert that
write_size<=s->cluster_size?Ok
[...].
Quoted 13 lines
Quoted 13 lines
block/qcow2-bitmap.c +13
-0+const char *name =bdrv_dirty_bitmap_name (bitmap); +uint32_t granularity =bdrv_dirty_bitmap_granularity (bitmap); +Qcow2Bitmap *bm; + +if (!bdrv_dirty_bitmap_get_persistance (bitmap)) { +continue ; + } + +if (++new_nb_bitmaps >QCOW2_MAX_BITMAPS ) { +error_setg (errp,"Too many persistent bitmaps" ); + goto fail; + } +Quoted 8 lines
block/qcow2-bitmap.c fail: · line 1059
Quoted 5 lines
block/qcow2-bitmap.c +5
-0+ new_dir_size +=calc_dir_entry_size (strlen (name),0 ); +if (new_dir_size >QCOW2_MAX_BITMAP_DIRECTORY_SIZE ) { +error_setg (errp,"Too large bitmap directory" ); + goto fail; + }You only need to increment
new_nb_bitmapsand increasenew_dir_sizeif the bitmap does not already exist in the image (i.e. iffind_bitmap_by_name()below returns NULL).Why? No, I need to check the whole sum and the whole size.
Quoted 8 lines
Quoted 3 lines
If the bitmap already exists, you don't create a new directory entry but reuse the existing one. Therefore, the number of bitmaps in the image and the directory size will not grow then.
new_nb_bitmapsis not number of "newly created bitmaps", but just new value of fieldnb_bitmaps, so, all bitmaps - old and new are calculated intonew_nb_bitmaps. Anyway, this misunderstanding shows that variable name is bad..
Yes. But when you store a bitmap of the same name as an existing one, you are replacing it. The number of bitmaps does not grow in that case.
Max
Re: [Qemu-devel] [PATCH 13/21] qcow2: add .bdrv_store_persistent_dirty_bitmaps()
Quoted 125 lines · Max Reitz
Quoted 124 lines · Vladimir Sementsov-Ogievskiy
Quoted 123 lines · Max Reitz
Quoted 77 lines · Vladimir Sementsov-Ogievskiy
Quoted 9 lines · Max Reitz
Quoted 8 lines · Vladimir Sementsov-Ogievskiy
Realize block bitmap storing interface, to allow qcow2 images store persistent bitmaps.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block/qcow2-bitmap.c | 451 +++++++++++++++++++++++++++++++++++++++++++++++++++ block/qcow2.c | 1 +[...]
Quoted 57 lines
Quoted 22 lines
block/qcow2-bitmap.c +7
-0+ +/* store_bitmap_data() +* Store bitmap to image, filling bitmap table accordingly. +*/ +static uint64_t *store_bitmap_data(BlockDriverState *bs, + BdrvDirtyBitmap *bitmap, + uint32_t *bitmap_table_size,Error **errp)
block/qcow2-bitmap.c +13
-0+{ +int ret; +BDRVQcow2State *s = bs->opaque; +int64_t sector; +uint64_t dsc; +uint64_t bm_size =bdrv_dirty_bitmap_size (bitmap); +const char *bm_name =bdrv_dirty_bitmap_name (bitmap); +uint8_t *buf =NULL ; +BdrvDirtyBitmapIter *dbi; +uint64_t *tb; +uint64_t tb_size = + size_to_clusters(s, + bdrv_dirty_bitmap_serialization_size(bitmap, 0,
bm_size));block/qcow2-bitmap.c fail: · line 859
Quoted 3 lines
block/qcow2-bitmap.c +3
-0+ +if (tb_size >BME_MAX_TABLE_SIZE || + tb_size * s->cluster_size >BME_MAX_PHYS_SIZE ) {Alignment to the opening parenthesis, please.
Quoted 30 lines
block/qcow2-bitmap.c +23
-0+error_setg (errp,"Bitmap '%s' is too big" , bm_name); +return NULL ; + } + + tb =g_try_new0 (uint64_t, tb_size); +if (tb ==NULL ) { +error_setg (errp,"No memory" ); +return NULL ; + } + + dbi =bdrv_dirty_iter_new (bitmap,0 ); + buf =g_malloc (s->cluster_size); + dsc =disk_sectors_in_bitmap_cluster (s, bitmap); + +while ((sector =bdrv_dirty_iter_next (dbi)) !=-1 ) { +uint64_t cluster = sector / dsc; +uint64_t end, write_size; +int64_t off; + + sector = cluster * dsc; + end =MIN (bm_size, sector + dsc); + write_size = + bdrv_dirty_bitmap_serialization_size(bitmap, sector,end - sector);
block/qcow2-bitmap.c +5
-0+ + off =qcow2_alloc_clusters (bs, s->cluster_size); +if (off <0 ) { + error_setg_errno(errp, -off, + "Failed to allocate clusters forbitmap '%s'",
Quoted 8 lines
block/qcow2-bitmap.c fail: · line 891
Quoted 4 lines
block/qcow2-bitmap.c +4
-0+ bm_name); + goto fail; + } + tb[cluster] = off;Somehow I would feel better with either an
assert(cluster < tb_size); here or anassert(bdrv_nb_sectors(bs) / dsc == tb_size); (plus the error
handling forbdrv_nb_sectors()) above the loop.Quoted 2 lines
assert((bm_size - 1) / dsc == tb_size - 1)seems ok. and no additional error handling. Right?Right,
bm_sizeis already equal tobdrv_nb_sectors(bs), and it's not necessarily a multiple of dsc. So that should be good. Alternatively, I think the following would be slightly easier to read:
assert(DIV_ROUND_UP(bm_size, dsc) == tb_size);Quoted 33 lines
Quoted 8 lines
Quoted 7 lines
(quoted diff) +4
-1+ + bdrv_dirty_bitmap_serialize_part(bitmap, buf, sector, end - sector); + if (write_size < s->cluster_size) { + memset(buf + write_size, 0, s->cluster_size -
write_size);
+ }Should we assert that
write_size<=s->cluster_size?Ok
[...].
Quoted 13 lines
Quoted 13 lines
block/qcow2-bitmap.c +13
-0+const char *name =bdrv_dirty_bitmap_name (bitmap); +uint32_t granularity =bdrv_dirty_bitmap_granularity (bitmap); +Qcow2Bitmap *bm; + +if (!bdrv_dirty_bitmap_get_persistance (bitmap)) { +continue ; + } + +if (++new_nb_bitmaps >QCOW2_MAX_BITMAPS ) { +error_setg (errp,"Too many persistent bitmaps" ); + goto fail; + } +Quoted 8 lines
block/qcow2-bitmap.c fail: · line 1059
Quoted 5 lines
block/qcow2-bitmap.c +5
-0+ new_dir_size +=calc_dir_entry_size (strlen (name),0 ); +if (new_dir_size >QCOW2_MAX_BITMAP_DIRECTORY_SIZE ) { +error_setg (errp,"Too large bitmap directory" ); + goto fail; + }You only need to increment
new_nb_bitmapsand increasenew_dir_sizeif the bitmap does not already exist in the image (i.e. iffind_bitmap_by_name()below returns NULL).Quoted 1 line
Why? No, I need to check the whole sum and the whole size.
If the bitmap already exists, you don't create a new directory entry but reuse the existing one. Therefore, the number of bitmaps in the image and the directory size will not grow then.
Quoted 6 lines
Quoted 4 lines
new_nb_bitmapsis not number of "newly created bitmaps", but just new value of fieldnb_bitmaps, so, all bitmaps - old and new are calculated intonew_nb_bitmaps. Anyway, this misunderstanding shows that variable name is bad..Yes. But when you store a bitmap of the same name as an existing one, you are replacing it. The number of bitmaps does not grow in that case.
Oh, I'm stupid)) I see now, you are right.
Quoted 3 lines
Max
Signature · 2 lines
Best regards, Vladimir
PATCH v9 14/21 block: add bdrv_can_store_dirty_bitmap
In reply to Vladimir Sementsov-OgievskiyThis will be needed to check some restrictions before making bitmap persistent in qmp-block-dirty-bitmap-add (this functionality will be added by future patch)
--- block.c | 22 ++++++++++++++++++++++ include/block/block.h | 2 ++ include/block/block_int.h | 2 ++ 3 files changed, 26 insertions(+)
block.c +22 -0
@@ -4138,3 +4138,25 @@ void bdrv_store_persistent_dirty_bitmaps(BlockDriverState *bs, Error **errp) drv->bdrv_store_persistent_dirty_bitmaps (bs, errp); } + +bool bdrv_can_store_dirty_bitmap (BlockDriverState *bs,const char *name, +uint32_t granularity,Error **errp) +{ +BlockDriver *drv = bs->drv; + +if (!drv) { +error_setg_errno (errp,ENOMEDIUM , +"Can't store persistent bitmaps to %s" , +bdrv_get_device_or_node_name (bs)); +return false; + } + +if (!drv->bdrv_can_store_dirty_bitmap) { +error_setg_errno (errp,ENOTSUP , +"Can't store persistent bitmaps to %s" , +bdrv_get_device_or_node_name (bs)); +return false; + } + +return drv->bdrv_can_store_dirty_bitmap (bs, name, granularity, errp); +}
include/block/block.h +2 -0
@@ -554,5 +554,7 @@ 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); +bool bdrv_can_store_dirty_bitmap (BlockDriverState *bs,const char *name, +uint32_t granularity,Error **errp);#endif
include/block/block_int.h +2 -0
@@ -324,6 +324,8 @@ struct BlockDriver { Error **errp);void (*bdrv_store_persistent_dirty_bitmaps)(BlockDriverState *bs,Error **errp); +bool (*bdrv_can_store_dirty_bitmap)(BlockDriverState *bs,const char *name, +uint32_t granularity,Error **errp);QLIST_ENTRY (BlockDriver) list; };
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [PATCH 14/21] block: add bdrv_can_store_dirty_bitmap
Quoted 10 lines · Vladimir Sementsov-Ogievskiy
This will be needed to check some restrictions before making bitmap persistent in qmp-block-dirty-bitmap-add (this functionality will be added by future patch)
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block.c | 22 ++++++++++++++++++++++ include/block/block.h | 2 ++ include/block/block_int.h | 2 ++ 3 files changed, 26 insertions(+)
PATCH v9 15/21 qcow2: add .bdrv_can_store_dirty_bitmap
In reply to Vladimir Sementsov-OgievskiyRealize .bdrv_can_store_dirty_bitmap interface.
--- block/qcow2-bitmap.c | 40 ++++++++++++++++++++++++++++++++++++++++ block/qcow2.c | 1 + block/qcow2.h | 4 ++++ 3 files changed, 45 insertions(+)
block/qcow2-bitmap.c +40 -0
@@ -1115,3 +1115,43 @@ fail:bitmap_list_free (bm_list); } + +bool qcow2_can_store_dirty_bitmap (BlockDriverState *bs, +const char *name, +uint32_t granularity, +Error **errp) +{ +BDRVQcow2State *s = bs->opaque; +const char *reason =NULL ; +bool found; +Qcow2BitmapList *bm_list; + +if (check_constraints_on_bitmap (bs, name, granularity) !=0 ) { + reason ="it doesn't satisfy the constraints" ; + goto common_errp; + } + +if (s->nb_bitmaps ==0 ) { +return true; + } + + bm_list =bitmap_list_load (bs, s->bitmap_directory_offset, + s->bitmap_directory_size, errp); +if (bm_list ==NULL ) { +return false; + } + + found = !!find_bitmap_by_name (bm_list, name); +bitmap_list_free (bm_list); +if (found) { + reason ="bitmap with the same name is already stored" ; + goto common_errp; + } + +return true; + +common_errp: +error_setg (errp,"Can't make bitmap '%s' persistent in '%s', as %s." , + name,bdrv_get_device_or_node_name (bs), reason); +return false; +}
block/qcow2.c +1 -0
@@ -3516,6 +3516,7 @@ BlockDriver bdrv_qcow2 = { .bdrv_load_autoloading_dirty_bitmaps = qcow2_load_autoloading_dirty_bitmaps, .bdrv_store_persistent_dirty_bitmaps = qcow2_store_persistent_dirty_bitmaps, + .bdrv_can_store_dirty_bitmap = qcow2_can_store_dirty_bitmap, };static void bdrv_qcow2_init (void )
block/qcow2.h +4 -0
@@ -616,5 +616,9 @@ void qcow2_cache_put(BlockDriverState *bs, Qcow2Cache *c, void **table);/* qcow2-bitmap.c functions */ void qcow2_load_autoloading_dirty_bitmaps (BlockDriverState *bs,Error **errp);void qcow2_store_persistent_dirty_bitmaps (BlockDriverState *bs,Error **errp); +bool qcow2_can_store_dirty_bitmap (BlockDriverState *bs, +const char *name, +uint32_t granularity, +Error **errp);#endif
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [PATCH 15/21] qcow2: add .bdrv_can_store_dirty_bitmap
Quoted 29 lines · Vladimir Sementsov-Ogievskiy
Realize .bdrv_can_store_dirty_bitmap interface.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block/qcow2-bitmap.c | 40 ++++++++++++++++++++++++++++++++++++++++ block/qcow2.c | 1 + block/qcow2.h | 4 ++++ 3 files changed, 45 insertions(+)block/qcow2-bitmap.c +12
-0@@ -1115,3 +1115,43 @@ fail:bitmap_list_free (bm_list); } + +bool qcow2_can_store_dirty_bitmap (BlockDriverState *bs, +const char *name, +uint32_t granularity, +Error **errp) +{ +BDRVQcow2State *s = bs->opaque; +const char *reason =NULL ; +bool found; +Qcow2BitmapList *bm_list; + +if (check_constraints_on_bitmap (bs, name, granularity) !=0 ) {
block/qcow2-bitmap.c fail: · line 1139
Quoted 10 lines
block/qcow2-bitmap.c +10
-0+ reason ="it doesn't satisfy the constraints" ; + goto common_errp; + } + +if (s->nb_bitmaps ==0 ) { +return true; + } + + bm_list =bitmap_list_load (bs, s->bitmap_directory_offset, + s->bitmap_directory_size, errp);
Maybe it would make sense to keep the bitmap list in memory...
block/qcow2-bitmap.c fail: · line 1144
Quoted 5 lines
block/qcow2-bitmap.c +5
-0+if (bm_list ==NULL ) { +return false; + } + + found = !!find_bitmap_by_name (bm_list, name);
You can omit the !!, storing it in a bool will do that for you.
block/qcow2-bitmap.c fail: · line 1155
Quoted 11 lines
block/qcow2-bitmap.c +11
-0+bitmap_list_free (bm_list); +if (found) { + reason ="bitmap with the same name is already stored" ; + goto common_errp; + } + +return true; + +common_errp: +error_setg (errp,"Can't make bitmap '%s' persistent in '%s', as %s." , + name,bdrv_get_device_or_node_name (bs), reason);
Hm, so this function isn't for checking whether a bitmap can be stored, but whether it can be made persistent. That's a difference; you can store a bitmap of the same name in the file if you want to overwrite it (i.e. it's an auto-load bitmap), but you cannot create a new bitmap with the same name.
Maybe rename it from bdrv_can_store_dirty_bitmap to bdrv_can_store_new_dirty_bitmap?
Max
Quoted 29 lines
block/qcow2-bitmap.c +2
-0+return false; +}block/qcow2.c +1
-0@@ -3516,6 +3516,7 @@ BlockDriver bdrv_qcow2 = { .bdrv_load_autoloading_dirty_bitmaps = qcow2_load_autoloading_dirty_bitmaps, .bdrv_store_persistent_dirty_bitmaps = qcow2_store_persistent_dirty_bitmaps, + .bdrv_can_store_dirty_bitmap = qcow2_can_store_dirty_bitmap, };static void bdrv_qcow2_init (void )block/qcow2.h +4
-0@@ -616,5 +616,9 @@ void qcow2_cache_put(BlockDriverState *bs, Qcow2Cache *c, void **table);/* qcow2-bitmap.c functions */ void qcow2_load_autoloading_dirty_bitmaps (BlockDriverState *bs,Error **errp);void qcow2_store_persistent_dirty_bitmaps (BlockDriverState *bs,Error **errp); +bool qcow2_can_store_dirty_bitmap (BlockDriverState *bs, +const char *name, +uint32_t granularity, +Error **errp);#endif
Re: [Qemu-devel] [PATCH 15/21] qcow2: add .bdrv_can_store_dirty_bitmap
Quoted 66 lines · Max Reitz
Quoted 29 lines · Vladimir Sementsov-Ogievskiy
Realize .bdrv_can_store_dirty_bitmap interface.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block/qcow2-bitmap.c | 40 ++++++++++++++++++++++++++++++++++++++++ block/qcow2.c | 1 + block/qcow2.h | 4 ++++ 3 files changed, 45 insertions(+)block/qcow2-bitmap.c +12
-0@@ -1115,3 +1115,43 @@ fail:bitmap_list_free (bm_list); } + +bool qcow2_can_store_dirty_bitmap (BlockDriverState *bs, +const char *name, +uint32_t granularity, +Error **errp) +{ +BDRVQcow2State *s = bs->opaque; +const char *reason =NULL ; +bool found; +Qcow2BitmapList *bm_list; + +if (check_constraints_on_bitmap (bs, name, granularity) !=0 ) {block/qcow2-bitmap.c fail: · line 1139
Quoted 10 lines
block/qcow2-bitmap.c +10
-0+ reason ="it doesn't satisfy the constraints" ; + goto common_errp; + } + +if (s->nb_bitmaps ==0 ) { +return true; + } + + bm_list =bitmap_list_load (bs, s->bitmap_directory_offset, + s->bitmap_directory_size, errp);Maybe it would make sense to keep the bitmap list in memory...
block/qcow2-bitmap.c fail: · line 1144
Quoted 5 lines
block/qcow2-bitmap.c +5
-0+if (bm_list ==NULL ) { +return false; + } + + found = !!find_bitmap_by_name (bm_list, name);You can omit the !!, storing it in a bool will do that for you.
block/qcow2-bitmap.c fail: · line 1155
Quoted 11 lines
block/qcow2-bitmap.c +11
-0+bitmap_list_free (bm_list); +if (found) { + reason ="bitmap with the same name is already stored" ; + goto common_errp; + } + +return true; + +common_errp: +error_setg (errp,"Can't make bitmap '%s' persistent in '%s', as %s." , + name,bdrv_get_device_or_node_name (bs), reason);Hm, so this function isn't for checking whether a bitmap can be stored, but whether it can be made persistent. That's a difference; you can store a bitmap of the same name in the file if you want to overwrite it (i.e. it's an auto-load bitmap), but you cannot create a new bitmap with the same name.
Quoted 2 lines
Maybe rename it from
bdrv_can_store_dirty_bitmaptobdrv_can_store_new_dirty_bitmap?
Yes, I'll rename it.
Quoted 33 lines
Max
Quoted 29 lines
block/qcow2-bitmap.c +2
-0+return false; +}block/qcow2.c +1
-0@@ -3516,6 +3516,7 @@ BlockDriver bdrv_qcow2 = { .bdrv_load_autoloading_dirty_bitmaps = qcow2_load_autoloading_dirty_bitmaps, .bdrv_store_persistent_dirty_bitmaps = qcow2_store_persistent_dirty_bitmaps, + .bdrv_can_store_dirty_bitmap = qcow2_can_store_dirty_bitmap, };static void bdrv_qcow2_init (void )block/qcow2.h +4
-0@@ -616,5 +616,9 @@ void qcow2_cache_put(BlockDriverState *bs, Qcow2Cache *c, void **table);/* qcow2-bitmap.c functions */ void qcow2_load_autoloading_dirty_bitmaps (BlockDriverState *bs,Error **errp);void qcow2_store_persistent_dirty_bitmaps (BlockDriverState *bs,Error **errp); +bool qcow2_can_store_dirty_bitmap (BlockDriverState *bs, +const char *name, +uint32_t granularity, +Error **errp);#endif
Signature · 2 lines
Best regards, Vladimir
PATCH v9 16/21 qmp: add persistent flag to block-dirty-bitmap-add
In reply to Vladimir Sementsov-OgievskiyAdd optional 'persistent' flag to qmp command block-dirty-bitmap-add. Default is false.
--- blockdev.c | 17 ++++++++++++++++- docs/qmp-commands.txt | 3 +++ qapi/block-core.json | 7 ++++++- 3 files changed, 25 insertions(+), 2 deletions(-)
blockdev.c +16 -1
@@ -1967,6 +1967,7 @@ static void block_dirty_bitmap_add_prepare(BlkActionState *common,/* AIO context taken and released within qmp_block_dirty_bitmap_add */ qmp_block_dirty_bitmap_add (action->node, action->name, action->has_granularity, action->granularity, + action->has_persistent, action->persistent, &local_err);if (!local_err) {
@@ -2696,10 +2697,12 @@ out:void qmp_block_dirty_bitmap_add (const char *node,const char *name,bool has_granularity,uint32_t granularity, +bool has_persistent,bool persistent,Error **errp) {AioContext *aio_context;BlockDriverState *bs; +BdrvDirtyBitmap *bitmap;if (!name || name[0 ] =='\0' ) {error_setg (errp,"Bitmap name cannot be empty" );
@@ -2725,7 +2728,19 @@ void qmp_block_dirty_bitmap_add(const char *node, const char *name, granularity =bdrv_get_default_bitmap_granularity (bs); } -bdrv_create_dirty_bitmap (bs, granularity, name, errp); +if (!has_persistent) { + persistent = false; + } + +if (persistent && + !bdrv_can_store_dirty_bitmap (bs, name, granularity, errp)) { + goto out; + } + + bitmap =bdrv_create_dirty_bitmap (bs, granularity, name, errp); +if (bitmap !=NULL ) { +bdrv_dirty_bitmap_set_persistance (bitmap, persistent); + } out:aio_context_release (aio_context);
docs/qmp-commands.txt +3 -0
@@ -1015,6 +1015,9 @@ Arguments: - "node": device/node on which to create dirty bitmap (json-string) - "name": name of the new dirty bitmap (json-string) - "granularity": granularity to track writes with (int, optional) +- "persistent": bitmap will be saved to the corresponding block device image + file on its close. For now only Qcow2 disks support persistent + bitmaps. (json-bool, optional, default false) (Since 2.8) Example:
qapi/block-core.json +6 -1
@@ -1231,10 +1231,15 @@ # @granularity: #optional the bitmap granularity, default is 64k for # block-dirty-bitmap-add # +# @persistent: #optional the bitmap is persistent, i.e. it will be saved to the +# corresponding block device image file on its close. Default is +# false. (Since 2.8) +# # Since 2.4 ## { 'struct': 'BlockDirtyBitmapAdd', - 'data': { 'node': 'str', 'name': 'str', '*granularity': 'uint32' } } + 'data': { 'node': 'str', 'name': 'str', '*granularity': 'uint32', + '*persistent': 'bool' } } ## # @block-dirty-bitmap-add
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [PATCH 16/21] qmp: add persistent flag to block-dirty-bitmap-add
Quoted 9 lines · Vladimir Sementsov-Ogievskiy
Add optional 'persistent' flag to qmp command block-dirty-bitmap-add. Default is false.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>Signed-off-by Denis V. Lunev <[email protected]>---
+++
b/qapi/block-core.json
qapi/block-core.json line 1236
Quoted 6 lines
qapi/block-core.json +3
-0@@ -1231,10 +1231,15 @@ # @granularity: #optional the bitmap granularity, default is 64k for # block-dirty-bitmap-add # +# @persistent: #optional the bitmap is persistent, i.e. it will be saved to the +# corresponding block device image file on its close. Default is +# false. (Since 2.8)
s/2.8/2.9/
Quoted 11 lines
qapi/block-core.json +3
-1+# # Since 2.4 ## { 'struct': 'BlockDirtyBitmapAdd', - 'data': { 'node': 'str', 'name': 'str', '*granularity': 'uint32' } } + 'data': { 'node': 'str', 'name': 'str', '*granularity': 'uint32', + '*persistent': 'bool' } } ## # @block-dirty-bitmap-add
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Re: [Qemu-devel] [PATCH 16/21] qmp: add persistent flag to block-dirty-bitmap-add
In reply to Vladimir Sementsov-OgievskiyQuoted 37 lines · Vladimir Sementsov-Ogievskiy
Add optional 'persistent' flag to qmp command block-dirty-bitmap-add. Default is false.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>Signed-off-by Denis V. Lunev <[email protected]>--- blockdev.c | 17 ++++++++++++++++- docs/qmp-commands.txt | 3 +++ qapi/block-core.json | 7 ++++++- 3 files changed, 25 insertions(+), 2 deletions(-)blockdev.c +3
-0@@ -1967,6 +1967,7 @@ static void block_dirty_bitmap_add_prepare(BlkActionState *common,/* AIO context taken and released within qmp_block_dirty_bitmap_add */ qmp_block_dirty_bitmap_add (action->node, action->name, action->has_granularity, action->granularity, + action->has_persistent, action->persistent, &local_err);if (!local_err) {@@ -2696,10 +2697,12 @@ out:void qmp_block_dirty_bitmap_add (const char *node,const char *name,bool has_granularity,uint32_t granularity, +bool has_persistent,bool persistent,Error **errp) {AioContext *aio_context;BlockDriverState *bs; +BdrvDirtyBitmap *bitmap;if (!name || name[0 ] =='\0' ) {error_setg (errp,"Bitmap name cannot be empty" );
blockdev.c void qmp_block_dirty_bitmap_add(const char *node, const char *name, · line 2736
Quoted 10 lines
blockdev.c +6
-1@@ -2725,7 +2728,19 @@ void qmp_block_dirty_bitmap_add(const char *node, const char *name, granularity =bdrv_get_default_bitmap_granularity (bs); } -bdrv_create_dirty_bitmap (bs, granularity, name, errp); +if (!has_persistent) { + persistent = false; + } + +if (persistent && + !bdrv_can_store_dirty_bitmap (bs, name, granularity, errp)) {
Alignment to the opening parenthesis, please.
(Also, this may need a change depending on whether you want to rename it to bdrv_can_store_new_dirty_bitmap().)
With that and the s/2\.8/2.9/ below fixed:
Quoted 46 lines
blockdev.c +7
-0+ goto out; + } + + bitmap =bdrv_create_dirty_bitmap (bs, granularity, name, errp); +if (bitmap !=NULL ) { +bdrv_dirty_bitmap_set_persistance (bitmap, persistent); + } out:aio_context_release (aio_context);docs/qmp-commands.txt +3
-0@@ -1015,6 +1015,9 @@ Arguments: - "node": device/node on which to create dirty bitmap (json-string) - "name": name of the new dirty bitmap (json-string) - "granularity": granularity to track writes with (int, optional) +- "persistent": bitmap will be saved to the corresponding block device image + file on its close. For now only Qcow2 disks support persistent + bitmaps. (json-bool, optional, default false) (Since 2.8) Example:qapi/block-core.json +6
-1@@ -1231,10 +1231,15 @@ # @granularity: #optional the bitmap granularity, default is 64k for # block-dirty-bitmap-add # +# @persistent: #optional the bitmap is persistent, i.e. it will be saved to the +# corresponding block device image file on its close. Default is +# false. (Since 2.8) +# # Since 2.4 ## { 'struct': 'BlockDirtyBitmapAdd', - 'data': { 'node': 'str', 'name': 'str', '*granularity': 'uint32' } } + 'data': { 'node': 'str', 'name': 'str', '*granularity': 'uint32', + '*persistent': 'bool' } } ## # @block-dirty-bitmap-add
PATCH v9 17/21 qmp: add autoload parameter to block-dirty-bitmap-add
In reply to Vladimir Sementsov-OgievskiyOptional. Default is false.
--- blockdev.c | 18 ++++++++++++++++-- docs/qmp-commands.txt | 4 ++++ qapi/block-core.json | 6 +++++- 3 files changed, 25 insertions(+), 3 deletions(-)
blockdev.c +16 -2
@@ -1968,6 +1968,7 @@ static void block_dirty_bitmap_add_prepare(BlkActionState *common,qmp_block_dirty_bitmap_add (action->node, action->name, action->has_granularity, action->granularity, action->has_persistent, action->persistent, + action->has_autoload, action->autoload, &local_err);if (!local_err) {
@@ -2698,6 +2699,7 @@ out:void qmp_block_dirty_bitmap_add (const char *node,const char *name,bool has_granularity,uint32_t granularity,bool has_persistent,bool persistent, +bool has_autoload,bool autoload,Error **errp) {AioContext *aio_context;
@@ -2731,6 +2733,15 @@ void qmp_block_dirty_bitmap_add(const char *node, const char *name,if (!has_persistent) { persistent = false; } +if (!has_autoload) { + autoload = false; + } + +if (has_autoload && !persistent) { +error_setg (errp,"Autoload flag must be used only for persistent " +"bitmaps" ); + goto out; + }if (persistent && !bdrv_can_store_dirty_bitmap (bs, name, granularity, errp)) {
@@ -2738,10 +2749,13 @@ void qmp_block_dirty_bitmap_add(const char *node, const char *name, } bitmap =bdrv_create_dirty_bitmap (bs, granularity, name, errp); -if (bitmap !=NULL ) { -bdrv_dirty_bitmap_set_persistance (bitmap, persistent); +if (bitmap ==NULL ) { + goto out; } +bdrv_dirty_bitmap_set_persistance (bitmap, persistent); +bdrv_dirty_bitmap_set_autoload (bitmap, autoload); + out:aio_context_release (aio_context); }
docs/qmp-commands.txt +4 -0
@@ -1018,6 +1018,10 @@ Arguments: - "persistent": bitmap will be saved to the corresponding block device image file on its close. For now only Qcow2 disks support persistent bitmaps. (json-bool, optional, default false) (Since 2.8) +- "autoload": the bitmap will be automatically loaded when the image it is + stored in is opened. This flag may only be specified for + persistent bitmaps (json-bool, optional, default false) + (Since 2.8) Example:
qapi/block-core.json +5 -1
@@ -1235,11 +1235,15 @@ # corresponding block device image file on its close. Default is # false. (Since 2.8) # +# @autoload: #optional the bitmap will be automatically loaded when the image +# it is stored in is opened. This flag may only be specified for +# persistent bitmaps. Default is false. (Since 2.8) +# # Since 2.4 ## { 'struct': 'BlockDirtyBitmapAdd', 'data': { 'node': 'str', 'name': 'str', '*granularity': 'uint32', - '*persistent': 'bool' } } + '*persistent': 'bool', '*autoload': 'bool' } } ## # @block-dirty-bitmap-add
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [PATCH 17/21] qmp: add autoload parameter to block-dirty-bitmap-add
Quoted 67 lines · Vladimir Sementsov-Ogievskiy
Optional. Default is false.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>Signed-off-by Denis V. Lunev <[email protected]>--- blockdev.c | 18 ++++++++++++++++-- docs/qmp-commands.txt | 4 ++++ qapi/block-core.json | 6 +++++- 3 files changed, 25 insertions(+), 3 deletions(-)blockdev.c +16
-2@@ -1968,6 +1968,7 @@ static void block_dirty_bitmap_add_prepare(BlkActionState *common,qmp_block_dirty_bitmap_add (action->node, action->name, action->has_granularity, action->granularity, action->has_persistent, action->persistent, + action->has_autoload, action->autoload, &local_err);if (!local_err) {@@ -2698,6 +2699,7 @@ out:void qmp_block_dirty_bitmap_add (const char *node,const char *name,bool has_granularity,uint32_t granularity,bool has_persistent,bool persistent, +bool has_autoload,bool autoload,Error **errp) {AioContext *aio_context;@@ -2731,6 +2733,15 @@ void qmp_block_dirty_bitmap_add(const char *node, const char *name,if (!has_persistent) { persistent = false; } +if (!has_autoload) { + autoload = false; + } + +if (has_autoload && !persistent) { +error_setg (errp,"Autoload flag must be used only for persistent " +"bitmaps" ); + goto out; + }if (persistent && !bdrv_can_store_dirty_bitmap (bs, name, granularity, errp)) {@@ -2738,10 +2749,13 @@ void qmp_block_dirty_bitmap_add(const char *node, const char *name, } bitmap =bdrv_create_dirty_bitmap (bs, granularity, name, errp); -if (bitmap !=NULL ) { -bdrv_dirty_bitmap_set_persistance (bitmap, persistent); +if (bitmap ==NULL ) { + goto out; } +bdrv_dirty_bitmap_set_persistance (bitmap, persistent); +bdrv_dirty_bitmap_set_autoload (bitmap, autoload); + out:aio_context_release (aio_context); }docs/qmp-commands.txt +0
-0
docs/qmp-commands.txt Arguments: · line 1024
Quoted 7 lines
docs/qmp-commands.txt +4
-0@@ -1018,6 +1018,10 @@ Arguments: - "persistent": bitmap will be saved to the corresponding block device image file on its close. For now only Qcow2 disks support persistent bitmaps. (json-bool, optional, default false) (Since 2.8) +- "autoload": the bitmap will be automatically loaded when the image it is + stored in is opened. This flag may only be specified for + persistent bitmaps (json-bool, optional, default false) + (Since 2.8)
*2.9
Quoted 8 lines
docs/qmp-commands.txt +0
-0Example:qapi/block-core.json +0
-0
qapi/block-core.json line 1240
Quoted 6 lines
qapi/block-core.json +3
-0@@ -1235,11 +1235,15 @@ # corresponding block device image file on its close. Default is # false. (Since 2.8) # +# @autoload: #optional the bitmap will be automatically loaded when the image +# it is stored in is opened. This flag may only be specified for +# persistent bitmaps. Default is false. (Since 2.8)
*2.9
With both fixed:
Quoted 11 lines
qapi/block-core.json +2
-1+# # Since 2.4 ## { 'struct': 'BlockDirtyBitmapAdd', 'data': { 'node': 'str', 'name': 'str', '*granularity': 'uint32', - '*persistent': 'bool' } } + '*persistent': 'bool', '*autoload': 'bool' } } ## # @block-dirty-bitmap-add
PATCH v9 18/21 qmp: add x-debug-block-dirty-bitmap-sha256
In reply to Vladimir Sementsov-Ogievskiy--- block/dirty-bitmap.c | 5 +++++ blockdev.c | 33 +++++++++++++++++++++++++++++++++ include/block/dirty-bitmap.h | 2 ++ include/qemu/hbitmap.h | 8 ++++++++ qapi/block-core.json | 26 ++++++++++++++++++++++++++ tests/Makefile.include | 2 +- util/hbitmap.c | 11 +++++++++++ 7 files changed, 86 insertions(+), 1 deletion(-)
block/dirty-bitmap.c +5 -0
@@ -589,3 +589,8 @@ BdrvDirtyBitmap *bdrv_dirty_bitmap_next(BlockDriverState *bs,return bitmap ==NULL ?QLIST_FIRST (&bs->dirty_bitmaps) :QLIST_NEXT (bitmap, list); } + +char *bdrv_dirty_bitmap_sha256 (const BdrvDirtyBitmap *bitmap,Error **errp) +{ +return hbitmap_sha256 (bitmap->bitmap, errp); +}
blockdev.c +33 -0
@@ -2819,6 +2819,39 @@ void qmp_block_dirty_bitmap_clear(const char *node, const char *name,aio_context_release (aio_context); } +/** +* Completely clear a bitmap, for the purposes of synchronizing a bitmap +* immediately after a full backup operation. +*/ +BlockDirtyBitmapSha256 *qmp_x_debug_block_dirty_bitmap_sha256 (const char *node, +const char *name, +Error **errp) +{ +AioContext *aio_context; +BdrvDirtyBitmap *bitmap; +BlockDriverState *bs; +BlockDirtyBitmapSha256 *ret =NULL ; +char *sha256; + + bitmap =block_dirty_bitmap_lookup (node, name, &bs, &aio_context, errp); +if (!bitmap || !bs) { +return NULL ; + } + + sha256 =bdrv_dirty_bitmap_sha256 (bitmap, errp); +if (sha256 ==NULL ) { + goto out; + } + + ret =g_new (BlockDirtyBitmapSha256,1 ); + ret->sha256 = sha256; + +out: +aio_context_release (aio_context); + +return ret; +} +void hmp_drive_del (Monitor *mon,const QDict *qdict) {const char *id =qdict_get_str (qdict,"id" );
include/block/dirty-bitmap.h +2 -0
@@ -86,4 +86,6 @@ BdrvDirtyBitmap *bdrv_dirty_bitmap_next(BlockDriverState *bs,bool bdrv_has_persistent_bitmaps (BlockDriverState *bs); +char *bdrv_dirty_bitmap_sha256 (const BdrvDirtyBitmap *bitmap,Error **errp); +#endif
include/qemu/hbitmap.h +8 -0
@@ -240,6 +240,14 @@ void hbitmap_deserialize_ones(HBitmap *hb, uint64_t start, uint64_t count,void hbitmap_deserialize_finish (HBitmap *hb);/** +* hbitmap_sha256: +* @bitmap: HBitmap to operate on. +* +* Returns SHA256 hash of the last level. +*/ +char *hbitmap_sha256 (const HBitmap *bitmap,Error **errp); + +/** * hbitmap_free: * @hb: HBitmap to operate on. *
qapi/block-core.json +26 -0
@@ -1289,6 +1289,32 @@ 'data': 'BlockDirtyBitmap' } ## +# @BlockDirtyBitmapSha256: +# +# SHA256 hash of dirty bitmap data +# +# @sha256: bitmap SHA256 hash +# +# Since: 2.8 +## + { 'struct': 'BlockDirtyBitmapSha256', + 'data': {'sha256': 'str'} } + +## +# @x-debug-block-dirty-bitmap-sha256 +# +# Get bitmap SHA256 +# +# Returns: BlockDirtyBitmapSha256 on success +# If @node is not a valid block device, DeviceNotFound +# If @name is not found, GenericError with an explanation +# +# Since 2.8 +## + { 'command': 'x-debug-block-dirty-bitmap-sha256', + 'data': 'BlockDirtyBitmap', 'returns': 'BlockDirtyBitmapSha256' } + +## # @blockdev-mirror # # Start mirroring a block device's writes to a new destination.
tests/Makefile.include +1 -1
@@ -496,7 +496,7 @@ tests/test-blockjob$(EXESUF): tests/test-blockjob.o $(test-block-obj-y) $(test-u tests/test-blockjob-txn$(EXESUF): tests/test-blockjob-txn.o $(test-block-obj-y) $(test-util-obj-y) tests/test-thread-pool$(EXESUF): tests/test-thread-pool.o $(test-block-obj-y) tests/test-iov$(EXESUF): tests/test-iov.o $(test-util-obj-y) -tests/test-hbitmap$(EXESUF): tests/test-hbitmap.o $(test-util-obj-y) +tests/test-hbitmap$(EXESUF): tests/test-hbitmap.o $(test-util-obj-y) $(test-crypto-obj-y) tests/test-x86-cpuid$(EXESUF): tests/test-x86-cpuid.o tests/test-xbzrle$(EXESUF): tests/test-xbzrle.o migration/xbzrle.o page_cache.o $(test-util-obj-y) tests/test-cutils$(EXESUF): tests/test-cutils.o util/cutils.o
util/hbitmap.c +11 -0
@@ -13,6 +13,7 @@#include "qemu/hbitmap.h" #include "qemu/host-utils.h" #include "trace.h" +#include "crypto/hash.h" /* HBitmaps provides an array of bits. The bits are stored as usual in an * array of unsigned longs, but HBitmap is also optimized to provide fast
@@ -707,3 +708,13 @@ void hbitmap_free_meta(HBitmap *hb)hbitmap_free (hb->meta); hb->meta =NULL ; } + +char *hbitmap_sha256 (const HBitmap *bitmap,Error **errp) +{ +size_t size = bitmap->sizes[HBITMAP_LEVELS -1 ] *sizeof (unsigned long ); +char *data = (char *)bitmap->levels[HBITMAP_LEVELS -1 ]; +char *hash =NULL ; +qcrypto_hash_digest (QCRYPTO_HASH_ALG_SHA256 , data, size, &hash, errp); + +return hash; +}
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [PATCH 18/21] qmp: add x-debug-block-dirty-bitmap-sha256
Quoted 29 lines · Vladimir Sementsov-Ogievskiy
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block/dirty-bitmap.c | 5 +++++ blockdev.c | 33 +++++++++++++++++++++++++++++++++ include/block/dirty-bitmap.h | 2 ++ include/qemu/hbitmap.h | 8 ++++++++ qapi/block-core.json | 26 ++++++++++++++++++++++++++ tests/Makefile.include | 2 +- util/hbitmap.c | 11 +++++++++++ 7 files changed, 86 insertions(+), 1 deletion(-)block/dirty-bitmap.c +5
-0@@ -589,3 +589,8 @@ BdrvDirtyBitmap *bdrv_dirty_bitmap_next(BlockDriverState *bs,return bitmap ==NULL ?QLIST_FIRST (&bs->dirty_bitmaps) :QLIST_NEXT (bitmap, list); } + +char *bdrv_dirty_bitmap_sha256 (const BdrvDirtyBitmap *bitmap,Error **errp) +{ +return hbitmap_sha256 (bitmap->bitmap, errp); +}blockdev.c +0
-0
blockdev.c void qmp_block_dirty_bitmap_clear(const char *node, const char *name, · line 2824
Quoted 6 lines
blockdev.c +3
-0@@ -2819,6 +2819,39 @@ void qmp_block_dirty_bitmap_clear(const char *node, const char *name,aio_context_release (aio_context); } +/** +* Completely clear a bitmap, for the purposes of synchronizing a bitmap +* immediately after a full backup operation.
This comment doesn't seem quite right.
Quoted 68 lines
blockdev.c +30
-0+*/ +BlockDirtyBitmapSha256 *qmp_x_debug_block_dirty_bitmap_sha256 (const char *node, +const char *name, +Error **errp) +{ +AioContext *aio_context; +BdrvDirtyBitmap *bitmap; +BlockDriverState *bs; +BlockDirtyBitmapSha256 *ret =NULL ; +char *sha256; + + bitmap =block_dirty_bitmap_lookup (node, name, &bs, &aio_context, errp); +if (!bitmap || !bs) { +return NULL ; + } + + sha256 =bdrv_dirty_bitmap_sha256 (bitmap, errp); +if (sha256 ==NULL ) { + goto out; + } + + ret =g_new (BlockDirtyBitmapSha256,1 ); + ret->sha256 = sha256; + +out: +aio_context_release (aio_context); + +return ret; +} +void hmp_drive_del (Monitor *mon,const QDict *qdict) {const char *id =qdict_get_str (qdict,"id" );include/block/dirty-bitmap.h +2
-0@@ -86,4 +86,6 @@ BdrvDirtyBitmap *bdrv_dirty_bitmap_next(BlockDriverState *bs,bool bdrv_has_persistent_bitmaps (BlockDriverState *bs); +char *bdrv_dirty_bitmap_sha256 (const BdrvDirtyBitmap *bitmap,Error **errp); +#endif include/qemu/hbitmap.h +8
-0@@ -240,6 +240,14 @@ void hbitmap_deserialize_ones(HBitmap *hb, uint64_t start, uint64_t count,void hbitmap_deserialize_finish (HBitmap *hb);/** +* hbitmap_sha256: +* @bitmap: HBitmap to operate on. +* +* Returns SHA256 hash of the last level. +*/ +char *hbitmap_sha256 (const HBitmap *bitmap,Error **errp); + +/** * hbitmap_free: * @hb: HBitmap to operate on. * qapi/block-core.json +0
-0
qapi/block-core.json line 1298
Quoted 10 lines
qapi/block-core.json +7
-0@@ -1289,6 +1289,32 @@ 'data': 'BlockDirtyBitmap' } ## +# @BlockDirtyBitmapSha256: +# +# SHA256 hash of dirty bitmap data +# +# @sha256: bitmap SHA256 hash +# +# Since: 2.8
*2.9
qapi/block-core.json line 1304
Quoted 6 lines
qapi/block-core.json +6
-0+## + { 'struct': 'BlockDirtyBitmapSha256', + 'data': {'sha256': 'str'} } + +## +# @x-debug-block-dirty-bitmap-sha256
Should end in a colon ("@x-debug-block-dirty-bitmap-sha256:").
qapi/block-core.json line 1310
Quoted 6 lines
qapi/block-core.json +6
-0+# +# Get bitmap SHA256 +# +# Returns: BlockDirtyBitmapSha256 on success +# If @node is not a valid block device, DeviceNotFound +# If @name is not found, GenericError with an explanation
Theoretically, hashing can also fail, but, well...
qapi/block-core.json line 1312
Quoted 2 lines
qapi/block-core.json +2
-0+# +# Since 2.8
*2.9 and also "Since: 2.9" (with colon).
Looks good apart from these minor things.
Max
Quoted 48 lines
qapi/block-core.json +5
-0+## + { 'command': 'x-debug-block-dirty-bitmap-sha256', + 'data': 'BlockDirtyBitmap', 'returns': 'BlockDirtyBitmapSha256' } + +## # @blockdev-mirror # # Start mirroring a block device's writes to a new destination.tests/Makefile.include +1
-1@@ -496,7 +496,7 @@ tests/test-blockjob$(EXESUF): tests/test-blockjob.o $(test-block-obj-y) $(test-u tests/test-blockjob-txn$(EXESUF): tests/test-blockjob-txn.o $(test-block-obj-y) $(test-util-obj-y) tests/test-thread-pool$(EXESUF): tests/test-thread-pool.o $(test-block-obj-y) tests/test-iov$(EXESUF): tests/test-iov.o $(test-util-obj-y) -tests/test-hbitmap$(EXESUF): tests/test-hbitmap.o $(test-util-obj-y) +tests/test-hbitmap$(EXESUF): tests/test-hbitmap.o $(test-util-obj-y) $(test-crypto-obj-y) tests/test-x86-cpuid$(EXESUF): tests/test-x86-cpuid.o tests/test-xbzrle$(EXESUF): tests/test-xbzrle.o migration/xbzrle.o page_cache.o $(test-util-obj-y) tests/test-cutils$(EXESUF): tests/test-cutils.o util/cutils.outil/hbitmap.c +11
-0@@ -13,6 +13,7 @@#include "qemu/hbitmap.h" #include "qemu/host-utils.h" #include "trace.h" +#include "crypto/hash.h" /* HBitmaps provides an array of bits. The bits are stored as usual in an * array of unsigned longs, but HBitmap is also optimized to provide fast @@ -707,3 +708,13 @@ void hbitmap_free_meta(HBitmap *hb)hbitmap_free (hb->meta); hb->meta =NULL ; } + +char *hbitmap_sha256 (const HBitmap *bitmap,Error **errp) +{ +size_t size = bitmap->sizes[HBITMAP_LEVELS -1 ] *sizeof (unsigned long ); +char *data = (char *)bitmap->levels[HBITMAP_LEVELS -1 ]; +char *hash =NULL ; +qcrypto_hash_digest (QCRYPTO_HASH_ALG_SHA256 , data, size, &hash, errp); + +return hash; +}
PATCH v9 19/21 iotests: test qcow2 persistent dirty bitmap
In reply to Vladimir Sementsov-Ogievskiy--- tests/qemu-iotests/165 | 89 ++++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/165.out | 5 +++ tests/qemu-iotests/group | 1 + 3 files changed, 95 insertions(+) create mode 100755 tests/qemu-iotests/165 create mode 100644 tests/qemu-iotests/165.out
tests/qemu-iotests/165 new file +89 -0
@@ -0,0 +1,89 @@ +#!/usr/bin/env python +# +# Tests for persistent dirty bitmaps. +# +# Copyright: Vladimir Sementsov-Ogievskiy 2015-2016 +# +# 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 os +import iotests +from iotests import qemu_img + +disk = os.path.join(iotests.test_dir, 'disk') +disk_size = 0x40000000 # 1G + +# regions for qemu_io: (start, count) in bytes +regions1 = ((0, 0x100000), + (0x200000, 0x100000)) + +regions2 = ((0x10000000, 0x20000), + (0x3fff0000, 0x10000)) + +class TestPersistentDirtyBitmap(iotests.QMPTestCase): + + def setUp(self): + qemu_img('create', '-f', iotests.imgfmt, disk, str(disk_size)) + + def tearDown(self): + os.remove(disk) + + def mkVm(self): + return iotests.VM().add_drive(disk) + + def getSha256(self): + result = self.vm.qmp('x-debug-block-dirty-bitmap-sha256', + node='drive0', name='bitmap0') + return result['return']['sha256'] + + def checkBitmap(self, sha256): + result = self.vm.qmp('x-debug-block-dirty-bitmap-sha256', + node='drive0', name='bitmap0') + self.assert_qmp(result, 'return/sha256', sha256); + + def writeRegions(self, regions): + for r in regions: + self.vm.hmp_qemu_io('drive0', + 'write %d %d' % r) + + def qmpAddBitmap(self): + self.vm.qmp('block-dirty-bitmap-add', node='drive0', + name='bitmap0', persistent=True, autoload=True) + + def test_persistent(self): + self.vm = self.mkVm() + self.vm.launch() + self.qmpAddBitmap() + + self.writeRegions(regions1) + sha256 = self.getSha256() + + self.vm.shutdown() + self.vm = self.mkVm() + self.vm.launch() + + self.checkBitmap(sha256) + self.writeRegions(regions2) + sha256 = self.getSha256() + + self.vm.shutdown() + self.vm.launch() + + self.checkBitmap(sha256) + + self.vm.shutdown() + +if __name__ == '__main__': + iotests.main(supported_fmts=['qcow2'])
tests/qemu-iotests/165.out new file +5 -0
@@ -0,0 +1,5 @@ +. +---------------------------------------------------------------------- +Ran 1 tests + +OK
tests/qemu-iotests/group +1 -0
@@ -162,6 +162,7 @@ 159 rw auto quick 160 rw auto quick 162 auto quick +165 rw auto quick 170 rw auto quick 171 rw auto quick 172 auto
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [PATCH 19/21] iotests: test qcow2 persistent dirty bitmap
Quoted 63 lines · Vladimir Sementsov-Ogievskiy
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- tests/qemu-iotests/165 | 89 ++++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/165.out | 5 +++ tests/qemu-iotests/group | 1 + 3 files changed, 95 insertions(+) create mode 100755 tests/qemu-iotests/165 create mode 100644 tests/qemu-iotests/165.outtests/qemu-iotests/165 new file +48
-0@@ -0,0 +1,89 @@ +#!/usr/bin/env python +# +# Tests for persistent dirty bitmaps. +# +# Copyright: Vladimir Sementsov-Ogievskiy 2015-2016 +# +# 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 os +import iotests +from iotests import qemu_img + +disk = os.path.join(iotests.test_dir, 'disk') +disk_size = 0x40000000 # 1G + +# regions for qemu_io: (start, count) in bytes +regions1 = ((0, 0x100000), + (0x200000, 0x100000)) + +regions2 = ((0x10000000, 0x20000), + (0x3fff0000, 0x10000)) + +class TestPersistentDirtyBitmap(iotests.QMPTestCase): + + def setUp(self): + qemu_img('create', '-f', iotests.imgfmt, disk, str(disk_size)) + + def tearDown(self): + os.remove(disk) + + def mkVm(self): + return iotests.VM().add_drive(disk) + + def getSha256(self): + result = self.vm.qmp('x-debug-block-dirty-bitmap-sha256', + node='drive0', name='bitmap0')
tests/qemu-iotests/165 line 58
Quoted 10 lines
tests/qemu-iotests/165 new file +10
-0+ return result['return']['sha256'] + + def checkBitmap(self, sha256): + result = self.vm.qmp('x-debug-block-dirty-bitmap-sha256', + node='drive0', name='bitmap0') + self.assert_qmp(result, 'return/sha256', sha256); + + def writeRegions(self, regions): + for r in regions: + self.vm.hmp_qemu_io('drive0',
Indentation should be two more spaces. With that fixed:
Quoted 1 line
tests/qemu-iotests/165 new file +1
-0+ 'write %d %d' % r)
PATCH v9 20/21 qcow2-refcount: rename inc_refcounts() and make it public
In reply to Vladimir Sementsov-OgievskiyThis is needed for the following patch, which will introduce refcounts checking for qcow2 bitmaps.
--- block/qcow2-refcount.c | 53 ++++++++++++++++++++++++++------------------------ block/qcow2.h | 4 ++++ 2 files changed, 32 insertions(+), 25 deletions(-)
block/qcow2-refcount.c +28 -25
@@ -1309,11 +1309,10 @@ static int realloc_refcount_array(BDRVQcow2State *s, void **array,* * Modifies the number of errors in res. */ -static int inc_refcounts (BlockDriverState *bs, -BdrvCheckResult *res, -void **refcount_table, -int64_t *refcount_table_size, -int64_t offset,int64_t size) +int qcow2_inc_refcounts_imrt (BlockDriverState *bs,BdrvCheckResult *res, +void **refcount_table, +int64_t *refcount_table_size, +int64_t offset,int64_t size) {BDRVQcow2State *s = bs->opaque;uint64_t start, last, cluster_offset, k, refcount;
@@ -1406,8 +1405,9 @@ static int check_refcounts_l2(BlockDriverState *bs, BdrvCheckResult *res, nb_csectors = ((l2_entry >> s->csize_shift) & s->csize_mask) +1 ; l2_entry &= s->cluster_offset_mask; - ret =inc_refcounts (bs, res, refcount_table, refcount_table_size, - l2_entry & ~511 , nb_csectors *512 ); + ret =qcow2_inc_refcounts_imrt (bs, res, + refcount_table, refcount_table_size, + l2_entry & ~511 , nb_csectors *512 );if (ret <0 ) { goto fail; }
@@ -1445,8 +1445,9 @@ static int check_refcounts_l2(BlockDriverState *bs, BdrvCheckResult *res, }/* Mark cluster as used */ - ret =inc_refcounts (bs, res, refcount_table, refcount_table_size, - offset, s->cluster_size); + ret =qcow2_inc_refcounts_imrt (bs, res, + refcount_table, refcount_table_size, + offset, s->cluster_size);if (ret <0 ) { goto fail; }
@@ -1498,8 +1499,8 @@ static int check_refcounts_l1(BlockDriverState *bs, l1_size2 = l1_size *sizeof (uint64_t );/* Mark L1 table as used */ - ret =inc_refcounts (bs, res, refcount_table, refcount_table_size, - l1_table_offset, l1_size2); + ret =qcow2_inc_refcounts_imrt (bs, res, refcount_table, refcount_table_size, + l1_table_offset, l1_size2);if (ret <0 ) { goto fail; }
@@ -1528,8 +1529,9 @@ static int check_refcounts_l1(BlockDriverState *bs,if (l2_offset) {/* Mark L2 table as used */ l2_offset &=L1E_OFFSET_MASK ; - ret =inc_refcounts (bs, res, refcount_table, refcount_table_size, - l2_offset, s->cluster_size); + ret =qcow2_inc_refcounts_imrt (bs, res, + refcount_table, refcount_table_size, + l2_offset, s->cluster_size);if (ret <0 ) { goto fail; }
@@ -1744,14 +1746,15 @@ static int check_refblocks(BlockDriverState *bs, BdrvCheckResult *res, } res->corruptions_fixed++; - ret =inc_refcounts (bs, res, refcount_table, nb_clusters, - offset, s->cluster_size); + ret =qcow2_inc_refcounts_imrt (bs, res, + refcount_table, nb_clusters, + offset, s->cluster_size);if (ret <0 ) {return ret; }/* No need to check whether the refcount is now greater than 1: * This area was just allocated and zeroed, so it can only be -* exactly 1 after inc_refcounts() */ +* exactly 1 after qcow2_inc_refcounts_imrt() */ continue ; resize_fail:
@@ -1766,8 +1769,8 @@ resize_fail: }if (offset !=0 ) { - ret =inc_refcounts (bs, res, refcount_table, nb_clusters, - offset, s->cluster_size); + ret =qcow2_inc_refcounts_imrt (bs, res, refcount_table, nb_clusters, + offset, s->cluster_size);if (ret <0 ) {return ret; }
@@ -1807,8 +1810,8 @@ static int calculate_refcounts(BlockDriverState *bs, BdrvCheckResult *res, }/* header */ - ret =inc_refcounts (bs, res, refcount_table, nb_clusters, -0 , s->cluster_size); + ret =qcow2_inc_refcounts_imrt (bs, res, refcount_table, nb_clusters, +0 , s->cluster_size);if (ret <0 ) {return ret; }
@@ -1829,16 +1832,16 @@ static int calculate_refcounts(BlockDriverState *bs, BdrvCheckResult *res,return ret; } } - ret =inc_refcounts (bs, res, refcount_table, nb_clusters, - s->snapshots_offset, s->snapshots_size); + ret =qcow2_inc_refcounts_imrt (bs, res, refcount_table, nb_clusters, + s->snapshots_offset, s->snapshots_size);if (ret <0 ) {return ret; }/* refcount data */ - ret =inc_refcounts (bs, res, refcount_table, nb_clusters, - s->refcount_table_offset, - s->refcount_table_size *sizeof (uint64_t )); + ret =qcow2_inc_refcounts_imrt (bs, res, refcount_table, nb_clusters, + s->refcount_table_offset, + s->refcount_table_size *sizeof (uint64_t ));if (ret <0 ) {return ret; }
block/qcow2.h +4 -0
@@ -543,6 +543,10 @@ int qcow2_check_metadata_overlap(BlockDriverState *bs, int ign, int64_t offset, int64_t size);int qcow2_pre_write_overlap_check (BlockDriverState *bs,int ign,int64_t offset,int64_t size); +int qcow2_inc_refcounts_imrt (BlockDriverState *bs,BdrvCheckResult *res, +void **refcount_table, +int64_t *refcount_table_size, +int64_t offset,int64_t size); int qcow2_change_refcount_order(BlockDriverState *bs, int refcount_order, BlockDriverAmendStatusCB *status_cb,
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [PATCH 20/21] qcow2-refcount: rename inc_refcounts() and make it public
Quoted 8 lines · Vladimir Sementsov-Ogievskiy
This is needed for the following patch, which will introduce refcounts checking for qcow2 bitmaps.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block/qcow2-refcount.c | 53 ++++++++++++++++++++++++++------------------------ block/qcow2.h | 4 ++++ 2 files changed, 32 insertions(+), 25 deletions(-)
PATCH v9 21/21 qcow2-bitmap: refcounts
In reply to Vladimir Sementsov-OgievskiyCalculate refcounts for qcow2 bitmaps. It is needed for qcow2's qemu-img check implementation.
--- block/qcow2-bitmap.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++ block/qcow2-refcount.c | 6 +++++ block/qcow2.h | 3 +++ 3 files changed, 82 insertions(+)
block/qcow2-bitmap.c +73 -0
@@ -1155,3 +1155,76 @@ common_errp: name, bdrv_get_device_or_node_name(bs), reason);return false; } + +int qcow2_check_bitmaps_refcounts (BlockDriverState *bs,BdrvCheckResult *res, +void **refcount_table, +int64_t *refcount_table_size) +{ +int ret; +BDRVQcow2State *s = bs->opaque; +Qcow2BitmapList *bm_list; +Qcow2Bitmap *bm; + + ret =qcow2_inc_refcounts_imrt (bs, res, refcount_table, refcount_table_size, + s->bitmap_directory_offset, + s->bitmap_directory_size); +if (ret <0 ) { +return ret; + } + + bm_list =bitmap_list_load (bs, s->bitmap_directory_offset, + s->bitmap_directory_size,NULL ); +if (bm_list ==NULL ) { + res->corruptions++; +return -EINVAL ; + } + + QSIMPLEQ_FOREACH(bm, bm_list, entry) { +uint64_t *bitmap_table =NULL ; +int i; + + ret =qcow2_inc_refcounts_imrt (bs, res, + refcount_table, refcount_table_size, + bm->table_offset, + bm->table_size *sizeof (uint64_t )); +if (ret <0 ) { + goto out; + } + + ret =bitmap_table_load (bs, bm, &bitmap_table); +if (ret <0 ) { + res->corruptions++; + goto out; + } + +for (i =0 ; i < bm->table_size; ++i) { +uint64_t entry = bitmap_table[i]; +uint64_t offset = entry &BME_TABLE_ENTRY_OFFSET_MASK ; + +if (check_table_entry (entry, s->cluster_size) <0 ) { + res->corruptions++; + ret = -EINVAL ; +continue ; + } + +if (offset ==0 ) { +continue ; + } + + ret =qcow2_inc_refcounts_imrt (bs, res, + refcount_table, refcount_table_size, + offset, s->cluster_size); +if (ret <0 ) { +g_free (bitmap_table); + goto out; + } + } + +g_free (bitmap_table); + } + +out: +bitmap_list_free (bm_list); + +return ret; +}
block/qcow2-refcount.c +6 -0
@@ -1846,6 +1846,12 @@ static int calculate_refcounts(BlockDriverState *bs, BdrvCheckResult *res,return ret; } +/* bitmaps */ + ret =qcow2_check_bitmaps_refcounts (bs, res, refcount_table, nb_clusters); +if (ret <0 ) { +return ret; + } +return check_refblocks (bs, res, fix, rebuild, refcount_table, nb_clusters); }
block/qcow2.h +3 -0
@@ -624,5 +624,8 @@ bool qcow2_can_store_dirty_bitmap(BlockDriverState *bs,const char *name, uint32_t granularity, Error **errp); +int qcow2_check_bitmaps_refcounts (BlockDriverState *bs,BdrvCheckResult *res, +void **refcount_table, +int64_t *refcount_table_size);#endif
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [PATCH 21/21] qcow2-bitmap: refcounts
Quoted 23 lines · Vladimir Sementsov-Ogievskiy
Calculate refcounts for qcow2 bitmaps. It is needed for qcow2's qemu-img check implementation.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block/qcow2-bitmap.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++ block/qcow2-refcount.c | 6 +++++ block/qcow2.h | 3 +++ 3 files changed, 82 insertions(+)block/qcow2-bitmap.c +5
-0@@ -1155,3 +1155,76 @@ common_errp: name, bdrv_get_device_or_node_name(bs), reason);return false; } + +int qcow2_check_bitmaps_refcounts (BlockDriverState *bs,BdrvCheckResult *res, +void **refcount_table, +int64_t *refcount_table_size) +{
[...]
block/qcow2-bitmap.c common_errp: · line 1207
Quoted 8 lines
block/qcow2-bitmap.c +8
-0+for (i =0 ; i < bm->table_size; ++i) { +uint64_t entry = bitmap_table[i]; +uint64_t offset = entry &BME_TABLE_ENTRY_OFFSET_MASK ; + +if (check_table_entry (entry, s->cluster_size) <0 ) { + res->corruptions++; + ret = -EINVAL ; +continue ;
First an optional suggestion: You could just assign check_table_entry()'s return value directly to ret, then you wouldn't have to set it manually.
Second, why are you setting ret at all? If any of the next iterations is successful, it will get overwritten and be set to 0 again.
Max
Quoted 23 lines
block/qcow2-bitmap.c +23
-0+ } + +if (offset ==0 ) { +continue ; + } + + ret =qcow2_inc_refcounts_imrt (bs, res, + refcount_table, refcount_table_size, + offset, s->cluster_size); +if (ret <0 ) { +g_free (bitmap_table); + goto out; + } + } + +g_free (bitmap_table); + } + +out: +bitmap_list_free (bm_list); + +return ret; +}