new file mode 100755
@@ -0,0 +1,256 @@
+#!/bin/bash
+#
+# Test qcow2 images with extended L2 entries
+#
+# Copyright (C) 2019 Igalia, S.L.
+# Author: Alberto Garcia <berto@igalia.com>
+#
+# 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/>.
+#
+
+# creator
+owner=berto@igalia.com
+
+seq="$(basename $0)"
+echo "QA output created by $seq"
+
+here="$PWD"
+status=1 # failure is the default!
+
+_cleanup()
+{
+ _cleanup_test_img
+ rm -f "$TEST_IMG.raw"
+ rm -f "$TEST_IMG.backing"
+}
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common.rc
+. ./common.filter
+
+_supported_fmt qcow2
+_supported_proto file nfs
+_supported_os Linux
+
+IMGOPTS="extended_l2=on"
+l2_offset=262144 # 0x40000
+
+_verify_img()
+{
+ $QEMU_IMG compare "$TEST_IMG" "$TEST_IMG.raw" | grep -v 'Images are identical'
+ $QEMU_IMG check "$TEST_IMG" | _filter_qemu_img_check | \
+ grep -v 'No errors were found on the image'
+}
+
+_read_l2_entry()
+{
+ entry_no=$1
+ nentries=$2
+ offset=$(($l2_offset + $entry_no * 16))
+ length=$((nentries * 16))
+ $QEMU_IO -f raw -c "read -v $offset $length" "$TEST_IMG" | _filter_qemu_io | head -n -2
+}
+
+_test_write()
+{
+ cmd="$1"
+ l2_entry_idx="$2"
+ l2_entry_num="$3"
+ raw_cmd=`echo $1 | sed s/-c//` # Raw images don't support -c
+ echo "$cmd"
+ $QEMU_IO -c "$cmd" "$TEST_IMG" | _filter_qemu_io
+ $QEMU_IO -c "$raw_cmd" -f raw "$TEST_IMG.raw" | _filter_qemu_io
+ _verify_img
+ if [ -n "$l2_entry_idx" ]; then
+ _read_l2_entry "$l2_entry_idx" "$l2_entry_num"
+ fi
+}
+
+_reset_img()
+{
+ $QEMU_IMG create -f raw "$TEST_IMG.raw" 1M | _filter_img_create
+ if [ "$use_backing_file" = "yes" ]; then
+ $QEMU_IMG create -f raw "$TEST_IMG.backing" 1M | _filter_img_create
+ $QEMU_IO -c 'write -q -P 0xFF 0 1M' -f raw "$TEST_IMG.backing" | _filter_qemu_io
+ $QEMU_IO -c 'write -q -P 0xFF 0 1M' -f raw "$TEST_IMG.raw" | _filter_qemu_io
+ _make_test_img -b "$TEST_IMG.backing" 1M
+ else
+ _make_test_img 1M
+ fi
+}
+
+# Test that writing to an image with subclusters produces the expected
+# results, in images with and without backing files
+for use_backing_file in yes no; do
+ echo
+ echo "### Standard write tests (backing file: $use_backing_file) ###"
+ echo
+ _reset_img
+ ### Write subcluster #0 (beginning of subcluster) ###
+ _test_write 'write -q -P 1 0 1k' 0 1
+
+ ### Write subcluster #1 (middle of subcluster) ###
+ _test_write 'write -q -P 2 3k 512' 0 1
+
+ ### Write subcluster #2 (end of subcluster) ###
+ _test_write 'write -q -P 3 5k 1k' 0 1
+
+ ### Write subcluster #3 (full subcluster) ###
+ _test_write 'write -q -P 4 6k 2k' 0 1
+
+ ### Write subclusters #4-6 (full subclusters) ###
+ _test_write 'write -q -P 5 8k 6k' 0 1
+
+ ### Write subclusters #7-9 (partial subclusters) ###
+ _test_write 'write -q -P 6 15k 4k' 0 1
+
+ ### Write subcluster #16 (partial subcluster) ###
+ _test_write 'write -q -P 7 32k 1k' 0 2
+
+ ### Write subcluster #31-#34 (cluster overlap) ###
+ _test_write 'write -q -P 8 63k 4k' 0 2
+
+ ### Zero subcluster #1 (TODO: use the "all zeros" bit)
+ _test_write 'write -q -z 2k 2k' 0 1
+
+ ### Zero cluster #0
+ _test_write 'write -q -z 0 64k' 0 1
+
+ ### Fill cluster #0 with data
+ _test_write 'write -q -P 9 0 64k' 0 1
+
+ ### Zero and unmap half of cluster #0 (this won't unmap it)
+ _test_write 'write -q -z -u 0 32k' 0 1
+
+ ### Zero and unmap cluster #0
+ _test_write 'write -q -z -u 0 64k' 0 1
+
+ ### Write subcluster #2 (middle of subcluster)
+ _test_write 'write -q -P 10 3k 512' 0 1
+
+ ### Fill cluster #0 with data
+ _test_write 'write -q -P 11 0 64k' 0 1
+
+ ### Discard cluster #0
+ _test_write 'discard -q 0 64k' 0 1
+
+ ### Write compressed data to cluster #0
+ _test_write 'write -q -c -P 12 0 64k' 0 1
+
+ ### Write subcluster #2 (middle of subcluster)
+ _test_write 'write -q -P 13 3k 512' 0 1
+done
+
+# Test that corrupted L2 entries are detected in both read and write
+# operations
+for corruption_test_cmd in read write; do
+ echo
+ echo "### Corrupted L2 entries - $corruption_test_cmd test (allocated) ###"
+ echo
+ echo "# 'cluster is zero' bit set on the standard cluster descriptor"
+ echo
+ _make_test_img 1M
+ $QEMU_IO -c 'write -q 0 2k' "$TEST_IMG"
+ poke_file "$TEST_IMG" $(($l2_offset+7)) "\x01"
+ $QEMU_IO -c "$corruption_test_cmd 0 1k" "$TEST_IMG"
+
+ echo
+ echo "# Both 'subcluster is zero' and 'subcluster is allocated' bits set"
+ echo
+ _make_test_img 1M
+ $QEMU_IO -c 'write -q 0 2k' "$TEST_IMG"
+ poke_file "$TEST_IMG" $(($l2_offset+8)) "\x80"
+ $QEMU_IO -c "$corruption_test_cmd 0 1k" "$TEST_IMG"
+
+ echo
+ echo "### Corrupted L2 entries - $corruption_test_cmd test (unallocated) ###"
+ echo
+ echo "# 'cluster is zero' bit set on the standard cluster descriptor"
+ echo
+ _make_test_img 1M
+ # Write to cluster #4 in order to initialize the L2 table
+ $QEMU_IO -c 'write -q 256k 1k' "$TEST_IMG"
+ poke_file "$TEST_IMG" $(($l2_offset+7)) "\x01"
+ $QEMU_IO -c "$corruption_test_cmd 0 1k" "$TEST_IMG"
+
+ echo
+ echo "# 'subcluster is allocated' bit set"
+ echo
+ _make_test_img 1M
+ # Write to cluster #4 in order to initialize the L2 table
+ $QEMU_IO -c 'write -q 256k 1k' "$TEST_IMG"
+ poke_file "$TEST_IMG" $(($l2_offset+12)) "\x80"
+ _read_l2_entry 0 1
+ $QEMU_IO -c "$corruption_test_cmd 0 1k" "$TEST_IMG"
+
+ echo
+ echo "# Both 'subcluster is zero' and 'subcluster is allocated' bits set"
+ echo
+ _make_test_img 1M
+ # Write to cluster #4 in order to initialize the L2 table
+ $QEMU_IO -c 'write -q 256k 1k' "$TEST_IMG"
+ poke_file "$TEST_IMG" $(($l2_offset+8)) "\x80\x00\x00\x00\x80"
+ $QEMU_IO -c "$corruption_test_cmd 0 1k" "$TEST_IMG"
+
+ echo
+ echo "### Compressed cluster with subcluster bitmap != 0 - $corruption_test_cmd test ###"
+ echo
+ _make_test_img 1M
+ $QEMU_IO -c 'write -q -c 0 64k' "$TEST_IMG"
+ poke_file "$TEST_IMG" $(($l2_offset+8)) "\x01"
+ $QEMU_IO -c "$corruption_test_cmd 0 1k" "$TEST_IMG"
+done
+
+echo
+echo "### Image creation options ###"
+echo
+echo "# cluster_size < 16k"
+IMGOPTS="extended_l2=on,cluster_size=8k" _make_test_img 1M
+
+echo "# backing file and preallocation=metadata"
+IMGOPTS="extended_l2=on,preallocation=metadata" _make_test_img -b "$TEST_IMG.backing" 1M
+
+echo "# backing file and preallocation=falloc"
+IMGOPTS="extended_l2=on,preallocation=falloc" _make_test_img -b "$TEST_IMG.backing" 1M
+
+echo "# backing file and preallocation=full"
+IMGOPTS="extended_l2=on,preallocation=full" _make_test_img -b "$TEST_IMG.backing" 1M
+
+echo
+echo "### qemu-img measure ###"
+echo
+echo "# 512MB, extended_l2=off" # This needs one L2 table
+$QEMU_IMG measure --size 512M -O qcow2 -o extended_l2=off
+echo "# 512MB, extended_l2=on" # This needs two L2 tables
+$QEMU_IMG measure --size 512M -O qcow2 -o extended_l2=on
+
+echo "# 16K clusters, 64GB, extended_l2=off" # This needs one L1 table
+$QEMU_IMG measure --size 64G -O qcow2 -o cluster_size=16k,extended_l2=off
+echo "# 16K clusters, 64GB, extended_l2=on" # This needs two L2 tables
+$QEMU_IMG measure --size 64G -O qcow2 -o cluster_size=16k,extended_l2=on
+
+echo "# 8k clusters" # This should fail
+$QEMU_IMG measure --size 1M -O qcow2 -o cluster_size=8k,extended_l2=on
+
+echo "# 1024 TB" # Maximum allowed size with extended_l2=on and 64K clusters
+$QEMU_IMG measure --size 1024T -O qcow2 -o extended_l2=on
+echo "# 1025 TB" # This should fail
+$QEMU_IMG measure --size 1025T -O qcow2 -o extended_l2=on
+
+# success, all done
+echo "*** done"
+rm -f $seq.full
+status=0
+
new file mode 100644
@@ -0,0 +1,208 @@
+QA output created by 271
+
+### Standard write tests (backing file: yes) ###
+
+Formatting 'TEST_DIR/t.IMGFMT.raw', fmt=raw size=1048576
+Formatting 'TEST_DIR/t.IMGFMT.backing', fmt=raw size=1048576
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT.backing
+write -q -P 1 0 1k
+00040000: 80 00 00 00 00 05 00 00 00 00 00 00 80 00 00 00 ................
+write -q -P 2 3k 512
+00040000: 80 00 00 00 00 05 00 00 00 00 00 00 c0 00 00 00 ................
+write -q -P 3 5k 1k
+00040000: 80 00 00 00 00 05 00 00 00 00 00 00 e0 00 00 00 ................
+write -q -P 4 6k 2k
+00040000: 80 00 00 00 00 05 00 00 00 00 00 00 f0 00 00 00 ................
+write -q -P 5 8k 6k
+00040000: 80 00 00 00 00 05 00 00 00 00 00 00 fe 00 00 00 ................
+write -q -P 6 15k 4k
+00040000: 80 00 00 00 00 05 00 00 00 00 00 00 ff c0 00 00 ................
+write -q -P 7 32k 1k
+00040000: 80 00 00 00 00 05 00 00 00 00 00 00 ff c0 80 00 ................
+00040010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
+write -q -P 8 63k 4k
+00040000: 80 00 00 00 00 05 00 00 00 00 00 00 ff c0 80 01 ................
+00040010: 80 00 00 00 00 06 00 00 00 00 00 00 c0 00 00 00 ................
+write -q -z 2k 2k
+00040000: 80 00 00 00 00 05 00 00 00 00 00 00 ff c0 80 01 ................
+write -q -z 0 64k
+00040000: 80 00 00 00 00 05 00 00 ff ff ff ff 00 00 00 00 ................
+write -q -P 9 0 64k
+00040000: 80 00 00 00 00 05 00 00 00 00 00 00 ff ff ff ff ................
+write -q -z -u 0 32k
+00040000: 80 00 00 00 00 05 00 00 00 00 00 00 ff ff ff ff ................
+write -q -z -u 0 64k
+00040000: 00 00 00 00 00 00 00 00 ff ff ff ff 00 00 00 00 ................
+write -q -P 10 3k 512
+00040000: 80 00 00 00 00 05 00 00 bf ff ff ff 40 00 00 00 ................
+write -q -P 11 0 64k
+00040000: 80 00 00 00 00 05 00 00 00 00 00 00 ff ff ff ff ................
+discard -q 0 64k
+00040000: 00 00 00 00 00 00 00 00 ff ff ff ff 00 00 00 00 ................
+write -q -c -P 12 0 64k
+00040000: 40 00 00 00 00 05 00 00 00 00 00 00 00 00 00 00 ................
+write -q -P 13 3k 512
+00040000: 80 00 00 00 00 07 00 00 00 00 00 00 ff ff ff ff ................
+
+### Standard write tests (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 1 0 1k
+00040000: 80 00 00 00 00 05 00 00 00 00 00 00 80 00 00 00 ................
+write -q -P 2 3k 512
+00040000: 80 00 00 00 00 05 00 00 00 00 00 00 c0 00 00 00 ................
+write -q -P 3 5k 1k
+00040000: 80 00 00 00 00 05 00 00 00 00 00 00 e0 00 00 00 ................
+write -q -P 4 6k 2k
+00040000: 80 00 00 00 00 05 00 00 00 00 00 00 f0 00 00 00 ................
+write -q -P 5 8k 6k
+00040000: 80 00 00 00 00 05 00 00 00 00 00 00 fe 00 00 00 ................
+write -q -P 6 15k 4k
+00040000: 80 00 00 00 00 05 00 00 00 00 00 00 ff c0 00 00 ................
+write -q -P 7 32k 1k
+00040000: 80 00 00 00 00 05 00 00 00 00 00 00 ff c0 80 00 ................
+00040010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
+write -q -P 8 63k 4k
+00040000: 80 00 00 00 00 05 00 00 00 00 00 00 ff c0 80 01 ................
+00040010: 80 00 00 00 00 06 00 00 00 00 00 00 c0 00 00 00 ................
+write -q -z 2k 2k
+00040000: 80 00 00 00 00 05 00 00 00 00 00 00 ff c0 80 01 ................
+write -q -z 0 64k
+00040000: 80 00 00 00 00 05 00 00 ff ff ff ff 00 00 00 00 ................
+write -q -P 9 0 64k
+00040000: 80 00 00 00 00 05 00 00 00 00 00 00 ff ff ff ff ................
+write -q -z -u 0 32k
+00040000: 80 00 00 00 00 05 00 00 00 00 00 00 ff ff ff ff ................
+write -q -z -u 0 64k
+00040000: 00 00 00 00 00 00 00 00 ff ff ff ff 00 00 00 00 ................
+write -q -P 10 3k 512
+00040000: 80 00 00 00 00 05 00 00 bf ff ff ff 40 00 00 00 ................
+write -q -P 11 0 64k
+00040000: 80 00 00 00 00 05 00 00 00 00 00 00 ff ff ff ff ................
+discard -q 0 64k
+00040000: 00 00 00 00 00 00 00 00 ff ff ff ff 00 00 00 00 ................
+write -q -c -P 12 0 64k
+00040000: 40 00 00 00 00 05 00 00 00 00 00 00 00 00 00 00 ................
+write -q -P 13 3k 512
+00040000: 80 00 00 00 00 07 00 00 00 00 00 00 ff ff ff ff ................
+
+### Corrupted L2 entries - read test (allocated) ###
+
+# 'cluster is zero' bit set on the standard cluster descriptor
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
+qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: 0x40000, L2 index: 0); further corruption events will be suppressed
+read failed: Input/output error
+
+# Both 'subcluster is zero' and 'subcluster is allocated' bits set
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
+qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: 0x40000, L2 index: 0); further corruption events will be suppressed
+read failed: Input/output error
+
+### Corrupted L2 entries - read test (unallocated) ###
+
+# 'cluster is zero' bit set on the standard cluster descriptor
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
+qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: 0x40000, L2 index: 0); further corruption events will be suppressed
+read failed: Input/output error
+
+# 'subcluster is allocated' bit set
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
+00040000: 00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 00 ................
+qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: 0x40000, L2 index: 0); further corruption events will be suppressed
+read failed: Input/output error
+
+# Both 'subcluster is zero' and 'subcluster is allocated' bits set
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
+qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: 0x40000, L2 index: 0); further corruption events will be suppressed
+read failed: Input/output error
+
+### Compressed cluster with subcluster bitmap != 0 - read test ###
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
+qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: 0x40000, L2 index: 0); further corruption events will be suppressed
+read failed: Input/output error
+
+### Corrupted L2 entries - write test (allocated) ###
+
+# 'cluster is zero' bit set on the standard cluster descriptor
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
+qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: 0x40000, L2 index: 0); further corruption events will be suppressed
+write failed: Input/output error
+
+# Both 'subcluster is zero' and 'subcluster is allocated' bits set
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
+qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: 0x40000, L2 index: 0); further corruption events will be suppressed
+write failed: Input/output error
+
+### Corrupted L2 entries - write test (unallocated) ###
+
+# 'cluster is zero' bit set on the standard cluster descriptor
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
+qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: 0x40000, L2 index: 0); further corruption events will be suppressed
+write failed: Input/output error
+
+# 'subcluster is allocated' bit set
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
+00040000: 00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 00 ................
+qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: 0x40000, L2 index: 0); further corruption events will be suppressed
+write failed: Input/output error
+
+# Both 'subcluster is zero' and 'subcluster is allocated' bits set
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
+qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: 0x40000, L2 index: 0); further corruption events will be suppressed
+write failed: Input/output error
+
+### Compressed cluster with subcluster bitmap != 0 - write test ###
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
+qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: 0x40000, L2 index: 0); further corruption events will be suppressed
+write failed: Input/output error
+
+### Image creation options ###
+
+# cluster_size < 16k
+qemu-img: TEST_DIR/t.IMGFMT: Extended L2 entries are only supported with cluster sizes of at least 16384 bytes
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
+# backing file and preallocation=metadata
+qemu-img: TEST_DIR/t.IMGFMT: Backing file and preallocation cannot be used at the same time
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT.backing preallocation=metadata
+# backing file and preallocation=falloc
+qemu-img: TEST_DIR/t.IMGFMT: Backing file and preallocation cannot be used at the same time
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT.backing preallocation=falloc
+# backing file and preallocation=full
+qemu-img: TEST_DIR/t.IMGFMT: Backing file and preallocation cannot be used at the same time
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT.backing preallocation=full
+
+### qemu-img measure ###
+
+# 512MB, extended_l2=off
+required size: 327680
+fully allocated size: 537198592
+# 512MB, extended_l2=on
+required size: 393216
+fully allocated size: 537264128
+# 16K clusters, 64GB, extended_l2=off
+required size: 42008576
+fully allocated size: 68761485312
+# 16K clusters, 64GB, extended_l2=on
+required size: 75579392
+fully allocated size: 68795056128
+# 8k clusters
+qemu-img: Extended L2 entries are only supported with cluster sizes of at least 16384 bytes
+# 1024 TB
+required size: 309285027840
+fully allocated size: 1126209191870464
+# 1025 TB
+qemu-img: The image size is too large (try using a larger cluster size)
+*** done
@@ -283,6 +283,7 @@
267 rw auto quick snapshot
268 rw auto quick
270 rw backing quick
+271 rw auto
272 rw
273 backing quick
277 rw quick
Signed-off-by: Alberto Garcia <berto@igalia.com> --- tests/qemu-iotests/271 | 256 +++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/271.out | 208 ++++++++++++++++++++++++++++++ tests/qemu-iotests/group | 1 + 3 files changed, 465 insertions(+) create mode 100755 tests/qemu-iotests/271 create mode 100644 tests/qemu-iotests/271.out