From: Kevin Wolf <kwolf@redhat.com>
To: anthony@codemonkey.ws
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 61/61] qemu-iotests: Add test for inactive L2 overlap
Date: Fri, 11 Oct 2013 17:05:51 +0200 [thread overview]
Message-ID: <1381503951-27985-62-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1381503951-27985-1-git-send-email-kwolf@redhat.com>
From: Max Reitz <mreitz@redhat.com>
Extend 060 by a test which creates a corrupted image with an active L2
entry pointing to an inactive L2 table and writes to the corresponding
guest offset.
Also, use overlap-check=all for all tests in 060.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
tests/qemu-iotests/060 | 47 +++++++++++++++++++++++++++++++++++++++-------
tests/qemu-iotests/060.out | 40 ++++++++++++++++++++++++++++++++++++++-
2 files changed, 79 insertions(+), 8 deletions(-)
diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
index 9bbc43b..bbb1909 100755
--- a/tests/qemu-iotests/060
+++ b/tests/qemu-iotests/060
@@ -21,10 +21,10 @@
# creator
owner=mreitz@redhat.com
-seq=`basename $0`
+seq="$(basename $0)"
echo "QA output created by $seq"
-here=`pwd`
+here="$PWD"
tmp=/tmp/$$
status=1 # failure is the default!
@@ -47,9 +47,15 @@ rt_offset=65536 # 0x10000 (XXX: just an assumption)
rb_offset=131072 # 0x20000 (XXX: just an assumption)
l1_offset=196608 # 0x30000 (XXX: just an assumption)
l2_offset=262144 # 0x40000 (XXX: just an assumption)
+l2_offset_after_snapshot=524288 # 0x80000 (XXX: just an assumption)
IMGOPTS="compat=1.1"
+OPEN_RW="open -o overlap-check=all $TEST_IMG"
+# Overlap checks are done before write operations only, therefore opening an
+# image read-only makes the overlap-check option irrelevant
+OPEN_RO="open -r $TEST_IMG"
+
echo
echo "=== Testing L2 reference into L1 ==="
echo
@@ -65,16 +71,18 @@ _check_test_img
./qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
# Try to write something, thereby forcing the corrupt bit to be set
-$QEMU_IO -c "write -P 0x2a 0 512" "$TEST_IMG" | _filter_qemu_io
+$QEMU_IO -c "$OPEN_RW" -c "write -P 0x2a 0 512" | _filter_qemu_io
# The corrupt bit must now be set
./qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
# Try to open the image R/W (which should fail)
-$QEMU_IO -c "read 0 512" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_testdir | _filter_imgfmt
+$QEMU_IO -c "$OPEN_RW" -c "read 0 512" 2>&1 | _filter_qemu_io \
+ | _filter_testdir \
+ | _filter_imgfmt
# Try to open it RO (which should succeed)
-$QEMU_IO -c "read 0 512" -r "$TEST_IMG" | _filter_qemu_io
+$QEMU_IO -c "$OPEN_RO" -c "read 0 512" | _filter_qemu_io
# We could now try to fix the image, but this would probably fail (how should an
# L2 table linked onto the L1 table be fixed?)
@@ -92,7 +100,7 @@ poke_file "$TEST_IMG" "$(($rb_offset+8))" "\x00\x01"
poke_file "$TEST_IMG" "$l2_offset" "\x80\x00\x00\x00\x00\x02\x00\x00"
_check_test_img
./qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
-$QEMU_IO -c "write -P 0x2a 0 512" "$TEST_IMG" | _filter_qemu_io
+$QEMU_IO -c "$OPEN_RW" -c "write -P 0x2a 0 512" | _filter_qemu_io
./qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
# Try to fix it
@@ -102,8 +110,33 @@ _check_test_img -r all
./qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
# Look if it's really really fixed
-$QEMU_IO -c "write -P 0x2a 0 512" "$TEST_IMG" | _filter_qemu_io
+$QEMU_IO -c "$OPEN_RW" -c "write -P 0x2a 0 512" | _filter_qemu_io
+./qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
+
+echo
+echo "=== Testing cluster data reference into inactive L2 table ==="
+echo
+_make_test_img 64M
+$QEMU_IO -c "$OPEN_RW" -c "write -P 1 0 512" | _filter_qemu_io
+$QEMU_IMG snapshot -c foo "$TEST_IMG"
+$QEMU_IO -c "$OPEN_RW" -c "write -P 2 0 512" | _filter_qemu_io
+# The inactive L2 table remains at its old offset
+poke_file "$TEST_IMG" "$l2_offset_after_snapshot" \
+ "\x80\x00\x00\x00\x00\x04\x00\x00"
+_check_test_img
./qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
+$QEMU_IO -c "$OPEN_RW" -c "write -P 3 0 512" | _filter_qemu_io
+./qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
+_check_test_img -r all
+./qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
+$QEMU_IO -c "$OPEN_RW" -c "write -P 4 0 512" | _filter_qemu_io
+./qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
+
+# Check data
+$QEMU_IO -c "$OPEN_RO" -c "read -P 4 0 512" | _filter_qemu_io
+$QEMU_IMG snapshot -a foo "$TEST_IMG"
+_check_test_img
+$QEMU_IO -c "$OPEN_RO" -c "read -P 1 0 512" | _filter_qemu_io
# success, all done
echo "*** done"
diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out
index 648f743..6c7bdbb 100644
--- a/tests/qemu-iotests/060.out
+++ b/tests/qemu-iotests/060.out
@@ -12,7 +12,6 @@ qcow2: Preventing invalid write on metadata (overlaps with active L1 table); ima
write failed: Input/output error
incompatible_features 0x2
qemu-io: can't open device TEST_DIR/t.IMGFMT: IMGFMT: Image is corrupt; cannot be opened read/write
-no file open, try 'help open'
read 512/512 bytes at offset 0
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
@@ -40,4 +39,43 @@ incompatible_features 0x0
wrote 512/512 bytes at offset 0
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
incompatible_features 0x0
+
+=== Testing cluster data reference into inactive L2 table ===
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
+wrote 512/512 bytes at offset 0
+512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+wrote 512/512 bytes at offset 0
+512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+ERROR cluster 4 refcount=1 reference=2
+Leaked cluster 9 refcount=1 reference=0
+
+1 errors were found on the image.
+Data may be corrupted, or further writes to the image may corrupt it.
+
+1 leaked clusters were found on the image.
+This means waste of disk space, but no harm to data.
+incompatible_features 0x0
+qcow2: Preventing invalid write on metadata (overlaps with inactive L2 table); image marked as corrupt.
+write failed: Input/output error
+incompatible_features 0x2
+Repairing cluster 4 refcount=1 reference=2
+Repairing cluster 9 refcount=1 reference=0
+Repairing OFLAG_COPIED data cluster: l2_entry=8000000000040000 refcount=2
+The following inconsistencies were found and repaired:
+
+ 1 leaked clusters
+ 2 corruptions
+
+Double checking the fixed image now...
+No errors were found on the image.
+incompatible_features 0x0
+wrote 512/512 bytes at offset 0
+512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+incompatible_features 0x0
+read 512/512 bytes at offset 0
+512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+No errors were found on the image.
+read 512/512 bytes at offset 0
+512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
*** done
--
1.8.1.4
prev parent reply other threads:[~2013-10-11 15:08 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-11 15:04 [Qemu-devel] [PULL 00/61] Block patches Kevin Wolf
2013-10-11 15:04 ` [Qemu-devel] [PULL 01/61] blockjob: rename BlockJobType to BlockJobDriver Kevin Wolf
2013-10-11 15:04 ` [Qemu-devel] [PULL 02/61] qapi: Introduce enum BlockJobType Kevin Wolf
2013-10-11 15:04 ` [Qemu-devel] [PULL 03/61] qapi: make use of new BlockJobType Kevin Wolf
2013-10-11 15:04 ` [Qemu-devel] [PULL 04/61] qapi: Add ImageInfoSpecific type Kevin Wolf
2013-10-11 15:04 ` [Qemu-devel] [PULL 05/61] block: Add bdrv_get_specific_info Kevin Wolf
2013-10-11 15:04 ` [Qemu-devel] [PULL 06/61] block/qapi: Human-readable ImageInfoSpecific dump Kevin Wolf
2013-10-11 15:04 ` [Qemu-devel] [PULL 07/61] qcow2: Add support for ImageInfoSpecific Kevin Wolf
2013-10-11 15:04 ` [Qemu-devel] [PULL 08/61] qemu-iotests: Discard specific info in _img_info Kevin Wolf
2013-10-11 15:04 ` [Qemu-devel] [PULL 09/61] qemu-iotests: Additional info from qemu-img info Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 10/61] qcow2: Alignment of snapshot table entries Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 11/61] qcow2: Use pread for inactive L1 in overlap check Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 12/61] qcow2: Free preallocated zero clusters Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 13/61] qcow2: Always use error path on writing snapshots Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 14/61] qcow2: Free allocated snapshot table on error Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 15/61] qcow2: Assert against snapshot name/ID overflow Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 16/61] block/get_block_status: avoid redundant callouts on raw devices Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 17/61] block: Add BlockDriver.bdrv_check_ext_snapshot Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 18/61] qemu-iotests: Discard preallocated zero clusters Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 19/61] ahci: set ahci mode on reset Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 20/61] block: qemu-iotests for vhdx, read sample dynamic image Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 21/61] qcow2: Add missing space in error message Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 22/61] qcow2: Remove wrong metadata overlap check Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 23/61] qcow2: Fix snapshot restoration in snapshot_create Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 24/61] qcow2: Use better type for numerical snapshot ID Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 25/61] block: Improve driver whitelist checks Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 26/61] qcow2: Use negated overflow check mask Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 27/61] qcow2: Make overlap check mask variable Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 28/61] qcow2: Add overlap-check options Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 29/61] qcow2: Array assigning options to OL check bits Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 30/61] qcow2: Add more overlap check bitmask macros Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 31/61] qcow2: Evaluate overlap check options Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 32/61] block/raw_bsd: Employ error parameter Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 33/61] block/raw-win32: " Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 34/61] blkdebug: " Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 35/61] blkverify: " Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 36/61] qemu-iotests: move blank lines of output in case 059 Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 37/61] block/raw-posix: Employ error parameter Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 38/61] tests: build the helper program by default Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 39/61] build: add command check-clean Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 40/61] vmdk: convert error code to use errp Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 41/61] vmdk: refuse enabling zeroed grain with flat images Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 42/61] qapi-types/visit.py: Pass whole expr dict for structs Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 43/61] qapi-types/visit.py: Inheritance " Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 44/61] blockdev: Introduce DriveInfo.enable_auto_del Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 45/61] blockdev: 'blockdev-add' QMP command Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 46/61] blockdev: Separate ID generation from DriveInfo creation Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 47/61] blockdev: Pass QDict to blockdev_init() Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 48/61] blockdev: Move parsing of 'media' option to drive_init Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 49/61] blockdev: Move parsing of 'if' " Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 50/61] blockdev: Moving parsing of geometry options " Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 51/61] blockdev: Move parsing of 'boot' option " Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 52/61] blockdev: Move bus/unit/index processing " Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 53/61] blockdev: Move virtio-blk device creation " Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 54/61] blockdev: Remove IF_* check for read-only blockdev_init Kevin Wolf
2013-10-15 15:53 ` Stefan Weil
2013-10-15 15:59 ` Kevin Wolf
2013-10-15 16:02 ` Stefan Weil
2013-10-11 15:05 ` [Qemu-devel] [PULL 55/61] qemu-iotests: Check autodel behaviour for device_del Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 56/61] blockdev: Remove 'media' parameter from blockdev_init() Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 57/61] blockdev: Don't disable COR automatically with blockdev-add Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 58/61] blockdev: blockdev_init() error conversion Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 59/61] vmdk: Fix vmdk_parse_extents Kevin Wolf
2013-10-11 15:05 ` [Qemu-devel] [PULL 60/61] qemu-io: Let "open" pass options to block driver Kevin Wolf
2013-10-11 15:05 ` Kevin Wolf [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1381503951-27985-62-git-send-email-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=anthony@codemonkey.ws \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).