qcow2: Expose bitmaps' size during measure
PATCH v2 1/1 qcow2: Expose bitmaps' size during measure
It's useful to know how much space can be occupied by qcow2 persistent bitmaps, even though such metadata is unrelated to the guest-visible data. Report this value as an additional field. Update iotest 190 to cover it.
The addition of a new field demonstrates why we should always zero-initialize qapi C structs; while the qcow2 driver still fully populates all fields, the raw and crypto drivers had to be tweaked.
See also: https://bugzilla.redhat.com/1779904
---
In v2:
- fix uninit memory [patchew]
- add BZ number [Nir]
- add iotest coverage
qapi/block-core.json | 15 ++++++++---- block/crypto.c | 2 +- block/qcow2.c | 29 +++++++++++++++++++++- block/raw-format.c | 2 +- qemu-img.c | 3 +++ tests/qemu-iotests/190 | 50 ++++++++++++++++++++++++++++++++++++-- tests/qemu-iotests/190.out | 20 ++++++++++++++- 7 files changed, 110 insertions(+), 11 deletions(-)
qapi/block-core.json +10 -5
@@ -633,18 +633,23 @@ # efficiently so file size may be smaller than virtual disk size. # # The values are upper bounds that are guaranteed to fit the new image file. -# Subsequent modification, such as internal snapshot or bitmap creation, may -# require additional space and is not covered here. +# Subsequent modification, such as internal snapshot or further bitmap +# creation, may require additional space and is not covered here. # -# @required: Size required for a new image file, in bytes. +# @required: Size required for a new image file, in bytes, when copying just +# guest-visible contents. # # @fully-allocated: Image file size, in bytes, once data has been written -# to all sectors. +# to all sectors, when copying just guest-visible contents. +# +# @bitmaps: Additional size required for bitmap metadata not directly used +# for guest contents, when that metadata can be copied in addition +# to guest contents. (since 5.1) # # Since: 2.10 ## { 'struct': 'BlockMeasureInfo', - 'data': {'required': 'int', 'fully-allocated': 'int'} } + 'data': {'required': 'int', 'fully-allocated': 'int', '*bitmaps': 'int'} } ## # @query-block:
block/crypto.c +1 -1
@@ -535,7 +535,7 @@ static BlockMeasureInfo *block_crypto_measure(QemuOpts *opts,* Unallocated blocks are still encrypted so allocation status makes no * difference to the file size. */ - info =g_new (BlockMeasureInfo,1 ); + info =g_new0 (BlockMeasureInfo,1 ); info->fully_allocated = luks_payload_size + size; info->required = luks_payload_size + size;return info;
block/qcow2.c +28 -1
@@ -4657,6 +4657,7 @@ static BlockMeasureInfo *qcow2_measure(QemuOpts *opts, BlockDriverState *in_bs,PreallocMode prealloc;bool has_backing_file;bool has_luks; +uint64_t bitmaps_size =0 ;/* size occupied by bitmaps in in_bs */ /* Parse image creation options */ cluster_size =qcow2_opt_get_cluster_size_del (opts, &local_err);
@@ -4732,6 +4733,8 @@ static BlockMeasureInfo *qcow2_measure(QemuOpts *opts, BlockDriverState *in_bs,/* Account for input image */ if (in_bs) { +BdrvDirtyBitmap *bm; +size_t bitmap_overhead =0 ;int64_t ssize =bdrv_getlength (in_bs);if (ssize <0 ) { error_setg_errno(&local_err, -ssize,
@@ -4739,6 +4742,28 @@ static BlockMeasureInfo *qcow2_measure(QemuOpts *opts, BlockDriverState *in_bs, goto err; } + FOR_EACH_DIRTY_BITMAP(in_bs, bm) { +if (bdrv_dirty_bitmap_get_persistence (bm)) { +const char *name =bdrv_dirty_bitmap_name (bm); +uint32_t granularity =bdrv_dirty_bitmap_granularity (bm); +uint64_t bmbits =DIV_ROUND_UP (bdrv_dirty_bitmap_size (bm), + granularity); +uint64_t bmclusters =DIV_ROUND_UP (DIV_ROUND_UP (bmbits, +CHAR_BIT ), + cluster_size); + +/* Assume the entire bitmap is allocated */ + bitmaps_size += bmclusters * cluster_size; +/* Also reserve space for the bitmap table entries */ + bitmaps_size +=ROUND_UP (bmclusters *sizeof (uint64_t ), + cluster_size); +/* Guess at contribution to bitmap directory size */ + bitmap_overhead +=ROUND_UP (strlen (name) +24 , +sizeof (uint64_t )); + } + } + bitmaps_size +=ROUND_UP (bitmap_overhead, cluster_size); + virtual_size =ROUND_UP (ssize, cluster_size);if (has_backing_file) {
@@ -4785,7 +4810,7 @@ static BlockMeasureInfo *qcow2_measure(QemuOpts *opts, BlockDriverState *in_bs, required = virtual_size; } - info =g_new (BlockMeasureInfo,1 ); + info =g_new0 (BlockMeasureInfo,1 ); info->fully_allocated =qcow2_calc_prealloc_size (virtual_size, cluster_size,ctz32 (refcount_bits)) + luks_payload_size;
@@ -4795,6 +4820,8 @@ static BlockMeasureInfo *qcow2_measure(QemuOpts *opts, BlockDriverState *in_bs,* still counted. */ info->required = info->fully_allocated - virtual_size + required; + info->has_bitmaps = !!bitmaps_size; + info->bitmaps = bitmaps_size;return info; err:
block/raw-format.c +1 -1
@@ -346,7 +346,7 @@ static BlockMeasureInfo *raw_measure(QemuOpts *opts, BlockDriverState *in_bs, BDRV_SECTOR_SIZE); } - info =g_new (BlockMeasureInfo,1 ); + info =g_new0 (BlockMeasureInfo,1 ); info->required = required;/* Unallocated sectors count towards the file size in raw images */
qemu-img.c +3 -0
@@ -5084,6 +5084,9 @@ static int img_measure(int argc, char **argv)if (output_format ==OFORMAT_HUMAN ) {printf ("required size: %" PRIu64"\n" , info->required);printf ("fully allocated size: %" PRIu64"\n" , info->fully_allocated); +if (info->has_bitmaps) { +printf ("bitmaps size: %" PRIu64"\n" , info->bitmaps); + } }else {dump_json_block_measure_info (info); }
tests/qemu-iotests/190 +48 -2
68 lines not on this page · raw message
tests/qemu-iotests/190.out +19 -1
@@ -1,5 +1,5 @@ QA output created by 190 -== Huge file == +== Huge file without bitmaps == Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2199023255552 required size: 2199023255552
@@ -8,4 +8,22 @@ required size: 335806464 fully allocated size: 2199359062016 required size: 18874368 fully allocated size: 2199042129920 + +== Huge file with bitmaps == + +Testing: -blockdev driver=qcow2,node-name=n,file.driver=file,file.filename=TEST_DIR/t.qcow2 +QMP_VERSION +{"return": {}} +{"return": {}} +{"return": {}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} + +required size: 2199023255552 +fully allocated size: 2199023255552 +required size: 335806464 +fully allocated size: 2199359062016 +bitmaps size: 537198592 +required size: 18874368 +fully allocated size: 2199042129920 +bitmaps size: 545259520 *** done
Signature · 1 line
2.26.1
Quoted 11 lines · Eric Blake
It's useful to know how much space can be occupied by qcow2 persistent bitmaps, even though such metadata is unrelated to the guest-visible data. Report this value as an additional field. Update iotest 190 to cover it.
The addition of a new field demonstrates why we should always zero-initialize qapi C structs; while the qcow2 driver still fully populates all fields, the raw and crypto drivers had to be tweaked.
See also: https://bugzilla.redhat.com/1779904
Quoted 8 lines
Reported-by Nir Soffer <[email protected]>Signed-off-by Eric Blake <[email protected]>---
In v2:
- fix uninit memory [patchew]
- add BZ number [Nir]
- add iotest coverage
Now subsumed into a larger series:
https://lists.gnu.org/archive/html/qemu-devel/2020-04/msg03464.html
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org