qemu-img convert -n: Keep qcow2 v2 target sparse
v2 cover qemu-img convert -n: Keep qcow2 v2 target sparse
v2:
- Fixed iotest for IMGOPTS that contains v3-only features [Max]
- Some code cleanups in the iotest [Nir]
Kevin Wolf (2):
qcow2: Implement v2 zero writes with discard if possible
iotests: Test sparseness for qemu-img convert -n
block/qcow2-cluster.c | 9 ++++++++- tests/qemu-iotests/122 | 30 ++++++++++++++++++++++++++++++ tests/qemu-iotests/122.out | 17 +++++++++++++++++ 3 files changed, 55 insertions(+), 1 deletion(-)
Signature · 1 line
2.25.4
PATCH v2 1/2 qcow2: Implement v2 zero writes with discard if possible
qcow2 version 2 images don't support the zero flag for clusters, so for write_zeroes requests, we return -ENOTSUP and get explicit zero buffer writes. If the image doesn't have a backing file, we can do better: Just discard the respective clusters.
This is relevant for 'qemu-img convert -O qcow2 -n', where qemu-img has to assume that the existing target image may contain any data, so it has to write zeroes. Without this patch, this results in a fully allocated target image, even if the source image was empty.
--- block/qcow2-cluster.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
block/qcow2-cluster.c +8 -1
@@ -1797,8 +1797,15 @@ int qcow2_cluster_zeroize(BlockDriverState *bs, uint64_t offset,assert (QEMU_IS_ALIGNED (end_offset, s->cluster_size) || end_offset >= bs->total_sectors <<BDRV_SECTOR_BITS ); -/* The zero flag is only supported by version 3 and newer */ +/* +* The zero flag is only supported by version 3 and newer. However, if we +* have no backing file, we can resort to discard in version 2. +*/ if (s->qcow_version <3 ) { +if (!bs->backing) { +return qcow2_cluster_discard (bs, offset, bytes, +QCOW2_DISCARD_REQUEST , false); + }return -ENOTSUP ; }
Signature · 1 line
2.25.4
Re: [PATCH for-5.1 v2 1/2] qcow2: Implement v2 zero writes with discard if possible
Am 21.07.2020 um 15:55 hat Kevin Wolf geschrieben:
Quoted 5 lines
qcow2 version 2 images don't support the zero flag for clusters, so for
write_zeroesrequests, we return-ENOTSUPand get explicit zero buffer writes. If the image doesn't have a backing file, we can do better: Just discard the respective clusters.
Quoted 7 lines
This is relevant for 'qemu-img convert -O qcow2 -n', where qemu-img has to assume that the existing target image may contain any data, so it has to write zeroes. Without this patch, this results in a fully allocated target image, even if the source image was empty.
Reported-by Nir Soffer <[email protected]>Signed-off-by Kevin Wolf <[email protected]>
Oops, forgot to apply this from v1:
The patch is unchanged, so I'll include this when applying.
Kevin
PATCH v2 2/2 iotests: Test sparseness for qemu-img convert -n
In reply to Kevin Wolf--- tests/qemu-iotests/122 | 30 ++++++++++++++++++++++++++++++ tests/qemu-iotests/122.out | 17 +++++++++++++++++ 2 files changed, 47 insertions(+)
tests/qemu-iotests/122 +30 -0
@@ -281,6 +281,36 @@ $QEMU_IMG convert -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG".orig $QEMU_IMG compare "$TEST_IMG" "$TEST_IMG".orig +echo +echo '=== -n to an empty image ===' +echo + +TEST_IMG="$TEST_IMG".orig _make_test_img 64M + +# Convert with -n, which should not result in a fully allocated image, not even +# with compat=0.10 (because the target doesn't have a backing file) +for compat in "1.1" "0.10"; do + IMGOPTS="compat=$compat" _make_test_img 64M + $QEMU_IMG convert -O $IMGFMT -n "$TEST_IMG".orig "$TEST_IMG" + $QEMU_IMG map --output=json "$TEST_IMG" +done + +echo +echo '=== -n to an empty image with a backing file ===' +echo + +TEST_IMG="$TEST_IMG".orig _make_test_img 64M +TEST_IMG="$TEST_IMG".base _make_test_img 64M + +# Convert with -n, which should still not result in a fully allocated image for +# compat=1.1 (because it can use zero clusters), but it should be fully +# allocated with compat=0.10 +for compat in "1.1" "0.10"; do + IMGOPTS="compat=$compat" _make_test_img -b "$TEST_IMG".base -F $IMGFMT 64M + $QEMU_IMG convert -O $IMGFMT -n "$TEST_IMG".orig "$TEST_IMG" + $QEMU_IMG map --output=json "$TEST_IMG" +done + echo echo '=== -n -B to an image without a backing file ===' echo
tests/qemu-iotests/122.out +17 -0
@@ -229,6 +229,23 @@ wrote 65536/65536 bytes at offset 0 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) Images are identical. +=== -n to an empty image === + +Formatting 'TEST_DIR/t.IMGFMT.orig', fmt=IMGFMT size=67108864 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 +[{ "start": 0, "length": 67108864, "depth": 0, "zero": true, "data": false}] +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 +[{ "start": 0, "length": 67108864, "depth": 0, "zero": true, "data": false}] + +=== -n to an empty image with a backing file === + +Formatting 'TEST_DIR/t.IMGFMT.orig', fmt=IMGFMT size=67108864 +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=IMGFMT +[{ "start": 0, "length": 67108864, "depth": 0, "zero": true, "data": false}] +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=IMGFMT +[{ "start": 0, "length": 67108864, "depth": 0, "zero": false, "data": true, "offset": 327680}] + === -n -B to an image without a backing file === Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864
Signature · 1 line
2.25.4
Re: [PATCH for-5.1 v2 2/2] iotests: Test sparseness for qemu-img convert -n
Quoted 5 lines · Kevin Wolf
Signed-off-by Kevin Wolf <[email protected]>--- tests/qemu-iotests/122 | 30 ++++++++++++++++++++++++++++++ tests/qemu-iotests/122.out | 17 +++++++++++++++++ 2 files changed, 47 insertions(+)