| Message ID | 20240513063203.113911-12-andrey.drobyshev@virtuozzo.com |
|---|---|
| State | New |
| Headers | show |
| Series | qcow2: make subclusters discardable | expand |
On 5/13/24 08:32, Andrey Drobyshev wrote: > Add a bunch of test cases covering new subclusters behaviour: unmap of > last allocated subclusters; unmap of subclusters within unallocated > cluster; discard of unallocated subclusters within a cluster; regular discard > of subclusters within a cluster; discard of last allocated subclusters. > > Also make all discard/unmap operations enable trace point 'file_do_fallocate' > so that actual fallocate() calls are visible. > > Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com> > --- > tests/qemu-iotests/271 | 70 +++++++++++++++++++++++++++++--------- > tests/qemu-iotests/271.out | 69 ++++++++++++++++++++++++++++++++++--- > 2 files changed, 119 insertions(+), 20 deletions(-) > > diff --git a/tests/qemu-iotests/271 b/tests/qemu-iotests/271 > index 04c57813c2..8b80682cff 100755 > --- a/tests/qemu-iotests/271 > +++ b/tests/qemu-iotests/271 > @@ -81,6 +81,12 @@ _verify_l2_bitmap() > fi > } > > +# Filter out trace params which we don't control (file fd) > +_filter_trace_fallocate() > +{ > + sed -E 's/fd=[0-9]+/fd=N/g' > +} > + > # This should be called as _run_test c=XXX sc=XXX off=XXX len=XXX cmd=XXX > # c: cluster number (0 if unset) > # sc: subcluster number inside cluster @c (0 if unset) > @@ -94,12 +100,13 @@ _verify_l2_bitmap() > # discard -> discard > _run_test() > { > - unset c sc off len cmd > + unset c sc off len cmd opt > for var in "$@"; do eval "$var"; done > case "${cmd:-write}" in > zero) > cmd="write -q -z";; > unmap) > + opt="--trace enable=file_do_fallocate" > cmd="write -q -z -u";; > compress) > pat=$((${pat:-0} + 1)) > @@ -108,6 +115,7 @@ _run_test() > pat=$((${pat:-0} + 1)) > cmd="write -q -P ${pat}";; > discard) > + opt="--trace enable=file_do_fallocate" > cmd="discard -q";; > *) > echo "Unknown option $cmd" > @@ -121,7 +129,7 @@ _run_test() > cmd="$cmd ${offset} ${len}" > raw_cmd=$(echo $cmd | sed s/-c//) # Raw images don't support -c > echo $cmd | sed 's/-P [0-9][0-9]\?/-P PATTERN/' > - $QEMU_IO -c "$cmd" "$TEST_IMG" | _filter_qemu_io > + $QEMU_IO $opt -c "$cmd" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_trace_fallocate > $QEMU_IO -c "$raw_cmd" -f raw "$TEST_IMG.raw" | _filter_qemu_io > _verify_img > _verify_l2_bitmap "$c" > @@ -202,9 +210,10 @@ for use_backing_file in yes no; do > alloc="$(seq 16 31)"; zero="$(seq 0 15)" > _run_test sc=0 len=32k cmd=unmap > > - ### Zero and unmap cluster #0 > + ### Zero and unmap second half of cluster #0 (this will unmap it and > + ### discard l2 entry) > alloc=""; zero="$(seq 0 31)" > - _run_test sc=0 len=64k cmd=unmap > + _run_test sc=16 len=32k cmd=unmap > > ### Write subcluster #1 (middle of subcluster) > alloc="1"; zero="0 $(seq 2 31)" > @@ -439,6 +448,12 @@ for use_backing_file in yes no; do > _verify_l2_bitmap 16 > _verify_l2_bitmap 17 > > + # Unmap subclusters #0-#3 of an unallocated cluster #8. Since > + # 'write -z -u' doesn't lead to full discard, subclusters should become > + # explicitly zeroized > + alloc=""; zero="$(seq 0 3)" > + _run_test c=8 sc=0 len=8k cmd=unmap > + > # Cluster-aligned request from clusters #9 to #11 > alloc=""; zero="$(seq 0 31)" > _run_test c=9 sc=0 len=192k cmd=unmap > @@ -523,26 +538,45 @@ for use_backing_file in yes no; do > echo > echo "### Discarding clusters with non-zero bitmaps (backing file: $use_backing_file) ###" > echo > + > + _reset_img 1M > + > + # Write first half of cluster #0 and discard another half > + alloc="$(seq 0 15)"; zero="" > + _run_test sc=0 len=32k > + # When discarding unallocated subclusters, they only have to be > + # explicitly zeroized when the image has a backing file > if [ "$use_backing_file" = "yes" ]; then > - _make_test_img -o extended_l2=on -F raw -b "$TEST_IMG.base" 1M > + alloc="$(seq 0 15)"; zero="$(seq 16 31)" > else > - _make_test_img -o extended_l2=on 1M > + alloc="$(seq 0 15)"; zero="" > fi > - # Write clusters #0-#2 and then discard them > - $QEMU_IO -c 'write -q 0 128k' "$TEST_IMG" > - $QEMU_IO -c 'discard -q 0 128k' "$TEST_IMG" > + _run_test sc=16 len=32k cmd=discard > + > + # Write cluster #0 and discard its subclusters #0-#3 > + alloc="$(seq 0 31)"; zero="" > + _run_test sc=0 len=64k > + alloc="$(seq 4 31)"; zero="$(seq 0 3)" > + _run_test sc=0 len=8k cmd=discard > + > + # Discard remaining subclusters #4-#32. This should unmap the cluster > + # and discard its l2 entry > + alloc=""; zero="$(seq 0 31)" > + _run_test sc=4 len=56k cmd=discard > + > + # Write clusters #0-#1 and then discard them > + alloc="$(seq 0 31)"; zero="" > + _run_test sc=0 len=128k > # 'qemu-io discard' doesn't do a full discard, it zeroizes the > - # cluster, so both clusters have all zero bits set now > + # cluster, so both clusters have all zero bits set after discard > alloc=""; zero="$(seq 0 31)" > - _verify_l2_bitmap 0 > + _run_test sc=0 len=128k cmd=discard > _verify_l2_bitmap 1 > + > # Now mark the 2nd half of the subclusters from cluster #0 as unallocated > poke_file "$TEST_IMG" $(($l2_offset+8)) "\x00\x00" > + > # Discard cluster #0 again to see how the zero bits have changed > - $QEMU_IO -c 'discard -q 0 64k' "$TEST_IMG" > - # And do a full discard of cluster #1 by shrinking and growing the image > - $QEMU_IMG resize --shrink "$TEST_IMG" 64k > - $QEMU_IMG resize "$TEST_IMG" 1M > # A normal discard sets all 'zero' bits only if the image has a > # backing file, otherwise it won't touch them. > if [ "$use_backing_file" = "yes" ]; then > @@ -550,7 +584,11 @@ for use_backing_file in yes no; do > else > alloc=""; zero="$(seq 0 15)" > fi > - _verify_l2_bitmap 0 > + _run_test sc=0 len=64k cmd=discard > + > + # And do a full discard of cluster #1 by shrinking and growing the image > + $QEMU_IMG resize --shrink "$TEST_IMG" 64k > + $QEMU_IMG resize "$TEST_IMG" 1M > # A full discard should clear the L2 entry completely. However > # when growing an image with a backing file the new clusters are > # zeroized to hide the stale data from the backing file > diff --git a/tests/qemu-iotests/271.out b/tests/qemu-iotests/271.out > index 0b24d50159..c03e4c9bc2 100644 > --- a/tests/qemu-iotests/271.out > +++ b/tests/qemu-iotests/271.out > @@ -29,14 +29,17 @@ L2 entry #0: 0x8000000000050000 ffffffff00000000 > write -q -P PATTERN 0 64k > L2 entry #0: 0x8000000000050000 00000000ffffffff > write -q -z -u 0 32k > +file_do_fallocate fd=N mode=0x03 offset=327680 len=32768 > L2 entry #0: 0x8000000000050000 0000ffffffff0000 > -write -q -z -u 0 64k > +write -q -z -u 32k 32k > +file_do_fallocate fd=N mode=0x03 offset=327680 len=65536 > L2 entry #0: 0x0000000000000000 ffffffff00000000 > write -q -P PATTERN 3k 512 > L2 entry #0: 0x8000000000050000 fffffffd00000002 > write -q -P PATTERN 0 64k > L2 entry #0: 0x8000000000050000 00000000ffffffff > discard -q 0 64k > +file_do_fallocate fd=N mode=0x03 offset=327680 len=65536 > L2 entry #0: 0x0000000000000000 ffffffff00000000 > write -q -c -P PATTERN 0 64k > L2 entry #0: 0x4000000000050000 0000000000000000 > @@ -71,14 +74,17 @@ L2 entry #0: 0x8000000000050000 ffffffff00000000 > write -q -P PATTERN 0 64k > L2 entry #0: 0x8000000000050000 00000000ffffffff > write -q -z -u 0 32k > +file_do_fallocate fd=N mode=0x03 offset=327680 len=32768 > L2 entry #0: 0x8000000000050000 0000ffffffff0000 > -write -q -z -u 0 64k > +write -q -z -u 32k 32k > +file_do_fallocate fd=N mode=0x03 offset=327680 len=65536 > L2 entry #0: 0x0000000000000000 ffffffff00000000 > write -q -P PATTERN 3k 512 > L2 entry #0: 0x8000000000050000 fffffffd00000002 > write -q -P PATTERN 0 64k > L2 entry #0: 0x8000000000050000 00000000ffffffff > discard -q 0 64k > +file_do_fallocate fd=N mode=0x03 offset=327680 len=65536 > L2 entry #0: 0x0000000000000000 ffffffff00000000 > write -q -c -P PATTERN 0 64k > L2 entry #0: 0x4000000000050000 0000000000000000 > @@ -301,15 +307,20 @@ L2 entry #14: 0x80000000000a0000 00000000ffffffff > L2 entry #15: 0x80000000000b0000 00000000ffffffff > L2 entry #16: 0x80000000000c0000 00000000ffffffff > L2 entry #17: 0x80000000000d0000 00000000ffffffff > +write -q -z -u 512k 8k > +L2 entry #8: 0x0000000000000000 0000000f00000000 > write -q -z -u 576k 192k > +file_do_fallocate fd=N mode=0x03 offset=327680 len=196608 > L2 entry #9: 0x0000000000000000 ffffffff00000000 > L2 entry #10: 0x0000000000000000 ffffffff00000000 > L2 entry #11: 0x0000000000000000 ffffffff00000000 > write -q -z -u 800k 128k > +file_do_fallocate fd=N mode=0x03 offset=557056 len=131072 > L2 entry #12: 0x8000000000080000 ffff00000000ffff > L2 entry #13: 0x0000000000000000 ffffffff00000000 > L2 entry #14: 0x80000000000a0000 0000ffffffff0000 > write -q -z -u 991k 128k > +file_do_fallocate fd=N mode=0x03 offset=753664 len=129024 > L2 entry #15: 0x80000000000b0000 ffff00000000ffff > L2 entry #16: 0x0000000000000000 ffffffff00000000 > L2 entry #17: 0x80000000000d0000 00007fffffff8000 > @@ -339,6 +350,7 @@ L2 entry #27: 0x4000000000120000 0000000000000000 > write -q -c -P PATTERN 1792k 64k > L2 entry #28: 0x4000000000130000 0000000000000000 > write -q -z -u 1152k 192k > +file_do_fallocate fd=N mode=0x03 offset=327680 len=196608 > L2 entry #18: 0x0000000000000000 ffffffff00000000 > L2 entry #19: 0x0000000000000000 ffffffff00000000 > L2 entry #20: 0x0000000000000000 ffffffff00000000 > @@ -351,6 +363,8 @@ L2 entry #24: 0x8000000000090000 00000000ffffffff > L2 entry #25: 0x80000000000e0000 00000000ffffffff > L2 entry #26: 0x80000000000f0000 00000000ffffffff > write -q -z -u 1759k 128k > +file_do_fallocate fd=N mode=0x03 offset=819200 len=32768 > +file_do_fallocate fd=N mode=0x03 offset=1245184 len=65536 > L2 entry #27: 0x80000000000c0000 ffff00000000ffff > L2 entry #28: 0x0000000000000000 ffffffff00000000 > L2 entry #29: 0x8000000000100000 00007fff00008000 > @@ -369,15 +383,20 @@ L2 entry #14: 0x80000000000a0000 00000000ffffffff > L2 entry #15: 0x80000000000b0000 00000000ffffffff > L2 entry #16: 0x80000000000c0000 00000000ffffffff > L2 entry #17: 0x80000000000d0000 00000000ffffffff > +write -q -z -u 512k 8k > +L2 entry #8: 0x0000000000000000 0000000f00000000 > write -q -z -u 576k 192k > +file_do_fallocate fd=N mode=0x03 offset=327680 len=196608 > L2 entry #9: 0x0000000000000000 ffffffff00000000 > L2 entry #10: 0x0000000000000000 ffffffff00000000 > L2 entry #11: 0x0000000000000000 ffffffff00000000 > write -q -z -u 800k 128k > +file_do_fallocate fd=N mode=0x03 offset=557056 len=131072 > L2 entry #12: 0x8000000000080000 ffff00000000ffff > L2 entry #13: 0x0000000000000000 ffffffff00000000 > L2 entry #14: 0x80000000000a0000 0000ffffffff0000 > write -q -z -u 991k 128k > +file_do_fallocate fd=N mode=0x03 offset=753664 len=129024 > L2 entry #15: 0x80000000000b0000 ffff00000000ffff > L2 entry #16: 0x0000000000000000 ffffffff00000000 > L2 entry #17: 0x80000000000d0000 00007fffffff8000 > @@ -407,6 +426,7 @@ L2 entry #27: 0x4000000000120000 0000000000000000 > write -q -c -P PATTERN 1792k 64k > L2 entry #28: 0x4000000000130000 0000000000000000 > write -q -z -u 1152k 192k > +file_do_fallocate fd=N mode=0x03 offset=327680 len=196608 > L2 entry #18: 0x0000000000000000 ffffffff00000000 > L2 entry #19: 0x0000000000000000 ffffffff00000000 > L2 entry #20: 0x0000000000000000 ffffffff00000000 > @@ -419,28 +439,69 @@ L2 entry #24: 0x8000000000090000 00000000ffffffff > L2 entry #25: 0x80000000000e0000 00000000ffffffff > L2 entry #26: 0x80000000000f0000 00000000ffffffff > write -q -z -u 1759k 128k > +file_do_fallocate fd=N mode=0x03 offset=819200 len=32768 > +file_do_fallocate fd=N mode=0x03 offset=1245184 len=65536 > L2 entry #27: 0x80000000000c0000 ffff00000000ffff > L2 entry #28: 0x0000000000000000 ffffffff00000000 > L2 entry #29: 0x0000000000000000 0000ffff00000000 > > ### Discarding clusters with non-zero bitmaps (backing file: yes) ### > > +Formatting 'TEST_DIR/t.IMGFMT.raw', fmt=raw size=1048576 > +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=raw size=1048576 > Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=raw > +write -q -P PATTERN 0 32k > +L2 entry #0: 0x8000000000050000 000000000000ffff > +discard -q 32k 32k > +file_do_fallocate fd=N mode=0x03 offset=360448 len=32768 > +L2 entry #0: 0x8000000000050000 ffff00000000ffff > +write -q -P PATTERN 0 64k > +L2 entry #0: 0x8000000000050000 00000000ffffffff > +discard -q 0 8k > +file_do_fallocate fd=N mode=0x03 offset=327680 len=8192 > +L2 entry #0: 0x8000000000050000 0000000ffffffff0 > +discard -q 8k 56k > +file_do_fallocate fd=N mode=0x03 offset=327680 len=65536 > +L2 entry #0: 0x0000000000000000 ffffffff00000000 > +write -q -P PATTERN 0 128k > +L2 entry #0: 0x8000000000050000 00000000ffffffff > +discard -q 0 128k > +file_do_fallocate fd=N mode=0x03 offset=327680 len=131072 > L2 entry #0: 0x0000000000000000 ffffffff00000000 > L2 entry #1: 0x0000000000000000 ffffffff00000000 > +discard -q 0 64k > +L2 entry #0: 0x0000000000000000 ffffffff00000000 > Image resized. > Image resized. > -L2 entry #0: 0x0000000000000000 ffffffff00000000 > L2 entry #1: 0x0000000000000000 ffffffff00000000 > > ### Discarding clusters with non-zero bitmaps (backing file: no) ### > > +Formatting 'TEST_DIR/t.IMGFMT.raw', fmt=raw size=1048576 > Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 > +write -q -P PATTERN 0 32k > +L2 entry #0: 0x8000000000050000 000000000000ffff > +discard -q 32k 32k > +file_do_fallocate fd=N mode=0x03 offset=360448 len=32768 > +L2 entry #0: 0x8000000000050000 000000000000ffff > +write -q -P PATTERN 0 64k > +L2 entry #0: 0x8000000000050000 00000000ffffffff > +discard -q 0 8k > +file_do_fallocate fd=N mode=0x03 offset=327680 len=8192 > +L2 entry #0: 0x8000000000050000 0000000ffffffff0 > +discard -q 8k 56k > +file_do_fallocate fd=N mode=0x03 offset=327680 len=65536 > +L2 entry #0: 0x0000000000000000 ffffffff00000000 > +write -q -P PATTERN 0 128k > +L2 entry #0: 0x8000000000050000 00000000ffffffff > +discard -q 0 128k > +file_do_fallocate fd=N mode=0x03 offset=327680 len=131072 > L2 entry #0: 0x0000000000000000 ffffffff00000000 > L2 entry #1: 0x0000000000000000 ffffffff00000000 > +discard -q 0 64k > +L2 entry #0: 0x0000000000000000 0000ffff00000000 > Image resized. > Image resized. > -L2 entry #0: 0x0000000000000000 0000ffff00000000 > L2 entry #1: 0x0000000000000000 0000000000000000 > > ### Corrupted L2 entries - read test (allocated) ### Reviewed-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
diff --git a/tests/qemu-iotests/271 b/tests/qemu-iotests/271 index 04c57813c2..8b80682cff 100755 --- a/tests/qemu-iotests/271 +++ b/tests/qemu-iotests/271 @@ -81,6 +81,12 @@ _verify_l2_bitmap() fi } +# Filter out trace params which we don't control (file fd) +_filter_trace_fallocate() +{ + sed -E 's/fd=[0-9]+/fd=N/g' +} + # This should be called as _run_test c=XXX sc=XXX off=XXX len=XXX cmd=XXX # c: cluster number (0 if unset) # sc: subcluster number inside cluster @c (0 if unset) @@ -94,12 +100,13 @@ _verify_l2_bitmap() # discard -> discard _run_test() { - unset c sc off len cmd + unset c sc off len cmd opt for var in "$@"; do eval "$var"; done case "${cmd:-write}" in zero) cmd="write -q -z";; unmap) + opt="--trace enable=file_do_fallocate" cmd="write -q -z -u";; compress) pat=$((${pat:-0} + 1)) @@ -108,6 +115,7 @@ _run_test() pat=$((${pat:-0} + 1)) cmd="write -q -P ${pat}";; discard) + opt="--trace enable=file_do_fallocate" cmd="discard -q";; *) echo "Unknown option $cmd" @@ -121,7 +129,7 @@ _run_test() cmd="$cmd ${offset} ${len}" raw_cmd=$(echo $cmd | sed s/-c//) # Raw images don't support -c echo $cmd | sed 's/-P [0-9][0-9]\?/-P PATTERN/' - $QEMU_IO -c "$cmd" "$TEST_IMG" | _filter_qemu_io + $QEMU_IO $opt -c "$cmd" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_trace_fallocate $QEMU_IO -c "$raw_cmd" -f raw "$TEST_IMG.raw" | _filter_qemu_io _verify_img _verify_l2_bitmap "$c" @@ -202,9 +210,10 @@ for use_backing_file in yes no; do alloc="$(seq 16 31)"; zero="$(seq 0 15)" _run_test sc=0 len=32k cmd=unmap - ### Zero and unmap cluster #0 + ### Zero and unmap second half of cluster #0 (this will unmap it and + ### discard l2 entry) alloc=""; zero="$(seq 0 31)" - _run_test sc=0 len=64k cmd=unmap + _run_test sc=16 len=32k cmd=unmap ### Write subcluster #1 (middle of subcluster) alloc="1"; zero="0 $(seq 2 31)" @@ -439,6 +448,12 @@ for use_backing_file in yes no; do _verify_l2_bitmap 16 _verify_l2_bitmap 17 + # Unmap subclusters #0-#3 of an unallocated cluster #8. Since + # 'write -z -u' doesn't lead to full discard, subclusters should become + # explicitly zeroized + alloc=""; zero="$(seq 0 3)" + _run_test c=8 sc=0 len=8k cmd=unmap + # Cluster-aligned request from clusters #9 to #11 alloc=""; zero="$(seq 0 31)" _run_test c=9 sc=0 len=192k cmd=unmap @@ -523,26 +538,45 @@ for use_backing_file in yes no; do echo echo "### Discarding clusters with non-zero bitmaps (backing file: $use_backing_file) ###" echo + + _reset_img 1M + + # Write first half of cluster #0 and discard another half + alloc="$(seq 0 15)"; zero="" + _run_test sc=0 len=32k + # When discarding unallocated subclusters, they only have to be + # explicitly zeroized when the image has a backing file if [ "$use_backing_file" = "yes" ]; then - _make_test_img -o extended_l2=on -F raw -b "$TEST_IMG.base" 1M + alloc="$(seq 0 15)"; zero="$(seq 16 31)" else - _make_test_img -o extended_l2=on 1M + alloc="$(seq 0 15)"; zero="" fi - # Write clusters #0-#2 and then discard them - $QEMU_IO -c 'write -q 0 128k' "$TEST_IMG" - $QEMU_IO -c 'discard -q 0 128k' "$TEST_IMG" + _run_test sc=16 len=32k cmd=discard + + # Write cluster #0 and discard its subclusters #0-#3 + alloc="$(seq 0 31)"; zero="" + _run_test sc=0 len=64k + alloc="$(seq 4 31)"; zero="$(seq 0 3)" + _run_test sc=0 len=8k cmd=discard + + # Discard remaining subclusters #4-#32. This should unmap the cluster + # and discard its l2 entry + alloc=""; zero="$(seq 0 31)" + _run_test sc=4 len=56k cmd=discard + + # Write clusters #0-#1 and then discard them + alloc="$(seq 0 31)"; zero="" + _run_test sc=0 len=128k # 'qemu-io discard' doesn't do a full discard, it zeroizes the - # cluster, so both clusters have all zero bits set now + # cluster, so both clusters have all zero bits set after discard alloc=""; zero="$(seq 0 31)" - _verify_l2_bitmap 0 + _run_test sc=0 len=128k cmd=discard _verify_l2_bitmap 1 + # Now mark the 2nd half of the subclusters from cluster #0 as unallocated poke_file "$TEST_IMG" $(($l2_offset+8)) "\x00\x00" + # Discard cluster #0 again to see how the zero bits have changed - $QEMU_IO -c 'discard -q 0 64k' "$TEST_IMG" - # And do a full discard of cluster #1 by shrinking and growing the image - $QEMU_IMG resize --shrink "$TEST_IMG" 64k - $QEMU_IMG resize "$TEST_IMG" 1M # A normal discard sets all 'zero' bits only if the image has a # backing file, otherwise it won't touch them. if [ "$use_backing_file" = "yes" ]; then @@ -550,7 +584,11 @@ for use_backing_file in yes no; do else alloc=""; zero="$(seq 0 15)" fi - _verify_l2_bitmap 0 + _run_test sc=0 len=64k cmd=discard + + # And do a full discard of cluster #1 by shrinking and growing the image + $QEMU_IMG resize --shrink "$TEST_IMG" 64k + $QEMU_IMG resize "$TEST_IMG" 1M # A full discard should clear the L2 entry completely. However # when growing an image with a backing file the new clusters are # zeroized to hide the stale data from the backing file diff --git a/tests/qemu-iotests/271.out b/tests/qemu-iotests/271.out index 0b24d50159..c03e4c9bc2 100644 --- a/tests/qemu-iotests/271.out +++ b/tests/qemu-iotests/271.out @@ -29,14 +29,17 @@ L2 entry #0: 0x8000000000050000 ffffffff00000000 write -q -P PATTERN 0 64k L2 entry #0: 0x8000000000050000 00000000ffffffff write -q -z -u 0 32k +file_do_fallocate fd=N mode=0x03 offset=327680 len=32768 L2 entry #0: 0x8000000000050000 0000ffffffff0000 -write -q -z -u 0 64k +write -q -z -u 32k 32k +file_do_fallocate fd=N mode=0x03 offset=327680 len=65536 L2 entry #0: 0x0000000000000000 ffffffff00000000 write -q -P PATTERN 3k 512 L2 entry #0: 0x8000000000050000 fffffffd00000002 write -q -P PATTERN 0 64k L2 entry #0: 0x8000000000050000 00000000ffffffff discard -q 0 64k +file_do_fallocate fd=N mode=0x03 offset=327680 len=65536 L2 entry #0: 0x0000000000000000 ffffffff00000000 write -q -c -P PATTERN 0 64k L2 entry #0: 0x4000000000050000 0000000000000000 @@ -71,14 +74,17 @@ L2 entry #0: 0x8000000000050000 ffffffff00000000 write -q -P PATTERN 0 64k L2 entry #0: 0x8000000000050000 00000000ffffffff write -q -z -u 0 32k +file_do_fallocate fd=N mode=0x03 offset=327680 len=32768 L2 entry #0: 0x8000000000050000 0000ffffffff0000 -write -q -z -u 0 64k +write -q -z -u 32k 32k +file_do_fallocate fd=N mode=0x03 offset=327680 len=65536 L2 entry #0: 0x0000000000000000 ffffffff00000000 write -q -P PATTERN 3k 512 L2 entry #0: 0x8000000000050000 fffffffd00000002 write -q -P PATTERN 0 64k L2 entry #0: 0x8000000000050000 00000000ffffffff discard -q 0 64k +file_do_fallocate fd=N mode=0x03 offset=327680 len=65536 L2 entry #0: 0x0000000000000000 ffffffff00000000 write -q -c -P PATTERN 0 64k L2 entry #0: 0x4000000000050000 0000000000000000 @@ -301,15 +307,20 @@ L2 entry #14: 0x80000000000a0000 00000000ffffffff L2 entry #15: 0x80000000000b0000 00000000ffffffff L2 entry #16: 0x80000000000c0000 00000000ffffffff L2 entry #17: 0x80000000000d0000 00000000ffffffff +write -q -z -u 512k 8k +L2 entry #8: 0x0000000000000000 0000000f00000000 write -q -z -u 576k 192k +file_do_fallocate fd=N mode=0x03 offset=327680 len=196608 L2 entry #9: 0x0000000000000000 ffffffff00000000 L2 entry #10: 0x0000000000000000 ffffffff00000000 L2 entry #11: 0x0000000000000000 ffffffff00000000 write -q -z -u 800k 128k +file_do_fallocate fd=N mode=0x03 offset=557056 len=131072 L2 entry #12: 0x8000000000080000 ffff00000000ffff L2 entry #13: 0x0000000000000000 ffffffff00000000 L2 entry #14: 0x80000000000a0000 0000ffffffff0000 write -q -z -u 991k 128k +file_do_fallocate fd=N mode=0x03 offset=753664 len=129024 L2 entry #15: 0x80000000000b0000 ffff00000000ffff L2 entry #16: 0x0000000000000000 ffffffff00000000 L2 entry #17: 0x80000000000d0000 00007fffffff8000 @@ -339,6 +350,7 @@ L2 entry #27: 0x4000000000120000 0000000000000000 write -q -c -P PATTERN 1792k 64k L2 entry #28: 0x4000000000130000 0000000000000000 write -q -z -u 1152k 192k +file_do_fallocate fd=N mode=0x03 offset=327680 len=196608 L2 entry #18: 0x0000000000000000 ffffffff00000000 L2 entry #19: 0x0000000000000000 ffffffff00000000 L2 entry #20: 0x0000000000000000 ffffffff00000000 @@ -351,6 +363,8 @@ L2 entry #24: 0x8000000000090000 00000000ffffffff L2 entry #25: 0x80000000000e0000 00000000ffffffff L2 entry #26: 0x80000000000f0000 00000000ffffffff write -q -z -u 1759k 128k +file_do_fallocate fd=N mode=0x03 offset=819200 len=32768 +file_do_fallocate fd=N mode=0x03 offset=1245184 len=65536 L2 entry #27: 0x80000000000c0000 ffff00000000ffff L2 entry #28: 0x0000000000000000 ffffffff00000000 L2 entry #29: 0x8000000000100000 00007fff00008000 @@ -369,15 +383,20 @@ L2 entry #14: 0x80000000000a0000 00000000ffffffff L2 entry #15: 0x80000000000b0000 00000000ffffffff L2 entry #16: 0x80000000000c0000 00000000ffffffff L2 entry #17: 0x80000000000d0000 00000000ffffffff +write -q -z -u 512k 8k +L2 entry #8: 0x0000000000000000 0000000f00000000 write -q -z -u 576k 192k +file_do_fallocate fd=N mode=0x03 offset=327680 len=196608 L2 entry #9: 0x0000000000000000 ffffffff00000000 L2 entry #10: 0x0000000000000000 ffffffff00000000 L2 entry #11: 0x0000000000000000 ffffffff00000000 write -q -z -u 800k 128k +file_do_fallocate fd=N mode=0x03 offset=557056 len=131072 L2 entry #12: 0x8000000000080000 ffff00000000ffff L2 entry #13: 0x0000000000000000 ffffffff00000000 L2 entry #14: 0x80000000000a0000 0000ffffffff0000 write -q -z -u 991k 128k +file_do_fallocate fd=N mode=0x03 offset=753664 len=129024 L2 entry #15: 0x80000000000b0000 ffff00000000ffff L2 entry #16: 0x0000000000000000 ffffffff00000000 L2 entry #17: 0x80000000000d0000 00007fffffff8000 @@ -407,6 +426,7 @@ L2 entry #27: 0x4000000000120000 0000000000000000 write -q -c -P PATTERN 1792k 64k L2 entry #28: 0x4000000000130000 0000000000000000 write -q -z -u 1152k 192k +file_do_fallocate fd=N mode=0x03 offset=327680 len=196608 L2 entry #18: 0x0000000000000000 ffffffff00000000 L2 entry #19: 0x0000000000000000 ffffffff00000000 L2 entry #20: 0x0000000000000000 ffffffff00000000 @@ -419,28 +439,69 @@ L2 entry #24: 0x8000000000090000 00000000ffffffff L2 entry #25: 0x80000000000e0000 00000000ffffffff L2 entry #26: 0x80000000000f0000 00000000ffffffff write -q -z -u 1759k 128k +file_do_fallocate fd=N mode=0x03 offset=819200 len=32768 +file_do_fallocate fd=N mode=0x03 offset=1245184 len=65536 L2 entry #27: 0x80000000000c0000 ffff00000000ffff L2 entry #28: 0x0000000000000000 ffffffff00000000 L2 entry #29: 0x0000000000000000 0000ffff00000000 ### Discarding clusters with non-zero bitmaps (backing file: yes) ### +Formatting 'TEST_DIR/t.IMGFMT.raw', fmt=raw size=1048576 +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=raw size=1048576 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=raw +write -q -P PATTERN 0 32k +L2 entry #0: 0x8000000000050000 000000000000ffff +discard -q 32k 32k +file_do_fallocate fd=N mode=0x03 offset=360448 len=32768 +L2 entry #0: 0x8000000000050000 ffff00000000ffff +write -q -P PATTERN 0 64k +L2 entry #0: 0x8000000000050000 00000000ffffffff +discard -q 0 8k +file_do_fallocate fd=N mode=0x03 offset=327680 len=8192 +L2 entry #0: 0x8000000000050000 0000000ffffffff0 +discard -q 8k 56k +file_do_fallocate fd=N mode=0x03 offset=327680 len=65536 +L2 entry #0: 0x0000000000000000 ffffffff00000000 +write -q -P PATTERN 0 128k +L2 entry #0: 0x8000000000050000 00000000ffffffff +discard -q 0 128k +file_do_fallocate fd=N mode=0x03 offset=327680 len=131072 L2 entry #0: 0x0000000000000000 ffffffff00000000 L2 entry #1: 0x0000000000000000 ffffffff00000000 +discard -q 0 64k +L2 entry #0: 0x0000000000000000 ffffffff00000000 Image resized. Image resized. -L2 entry #0: 0x0000000000000000 ffffffff00000000 L2 entry #1: 0x0000000000000000 ffffffff00000000 ### Discarding clusters with non-zero bitmaps (backing file: no) ### +Formatting 'TEST_DIR/t.IMGFMT.raw', fmt=raw size=1048576 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 +write -q -P PATTERN 0 32k +L2 entry #0: 0x8000000000050000 000000000000ffff +discard -q 32k 32k +file_do_fallocate fd=N mode=0x03 offset=360448 len=32768 +L2 entry #0: 0x8000000000050000 000000000000ffff +write -q -P PATTERN 0 64k +L2 entry #0: 0x8000000000050000 00000000ffffffff +discard -q 0 8k +file_do_fallocate fd=N mode=0x03 offset=327680 len=8192 +L2 entry #0: 0x8000000000050000 0000000ffffffff0 +discard -q 8k 56k +file_do_fallocate fd=N mode=0x03 offset=327680 len=65536 +L2 entry #0: 0x0000000000000000 ffffffff00000000 +write -q -P PATTERN 0 128k +L2 entry #0: 0x8000000000050000 00000000ffffffff +discard -q 0 128k +file_do_fallocate fd=N mode=0x03 offset=327680 len=131072 L2 entry #0: 0x0000000000000000 ffffffff00000000 L2 entry #1: 0x0000000000000000 ffffffff00000000 +discard -q 0 64k +L2 entry #0: 0x0000000000000000 0000ffff00000000 Image resized. Image resized. -L2 entry #0: 0x0000000000000000 0000ffff00000000 L2 entry #1: 0x0000000000000000 0000000000000000 ### Corrupted L2 entries - read test (allocated) ###
Add a bunch of test cases covering new subclusters behaviour: unmap of last allocated subclusters; unmap of subclusters within unallocated cluster; discard of unallocated subclusters within a cluster; regular discard of subclusters within a cluster; discard of last allocated subclusters. Also make all discard/unmap operations enable trace point 'file_do_fallocate' so that actual fallocate() calls are visible. Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com> --- tests/qemu-iotests/271 | 70 +++++++++++++++++++++++++++++--------- tests/qemu-iotests/271.out | 69 ++++++++++++++++++++++++++++++++++--- 2 files changed, 119 insertions(+), 20 deletions(-)