All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 34/48] iotests: Extend test 112 for qemu-img amend
Date: Fri, 18 Dec 2015 16:07:40 +0100	[thread overview]
Message-ID: <1450451274-7472-35-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1450451274-7472-1-git-send-email-kwolf@redhat.com>

From: Max Reitz <mreitz@redhat.com>

Add tests for conversion between different refcount widths.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/112     | 109 +++++++++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/112.out |  71 +++++++++++++++++++++++++++++
 2 files changed, 180 insertions(+)

diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112
index 3f054a3..34ba06a 100755
--- a/tests/qemu-iotests/112
+++ b/tests/qemu-iotests/112
@@ -180,6 +180,115 @@ $QEMU_IMG snapshot -c foo "$TEST_IMG"
 # leaked (refcount=UINT64_MAX reference=1)
 _check_test_img
 
+echo
+echo '=== Amend from refcount_bits=16 to refcount_bits=1 ==='
+echo
+
+_make_test_img 64M
+print_refcount_bits
+
+$QEMU_IO -c 'write 16M 32M' "$TEST_IMG" | _filter_qemu_io
+$QEMU_IMG amend -o refcount_bits=1 "$TEST_IMG"
+_check_test_img
+print_refcount_bits
+
+echo
+echo '=== Amend from refcount_bits=1 to refcount_bits=64 ==='
+echo
+
+$QEMU_IMG amend -o refcount_bits=64 "$TEST_IMG"
+_check_test_img
+print_refcount_bits
+
+echo
+echo '=== Amend to compat=0.10 ==='
+echo
+
+# Should not work because refcount_bits needs to be 16 for compat=0.10
+$QEMU_IMG amend -o compat=0.10 "$TEST_IMG"
+print_refcount_bits
+# Should work
+$QEMU_IMG amend -o compat=0.10,refcount_bits=16 "$TEST_IMG"
+_check_test_img
+print_refcount_bits
+
+# Get back to compat=1.1 and refcount_bits=16
+$QEMU_IMG amend -o compat=1.1 "$TEST_IMG"
+print_refcount_bits
+# Should not work
+$QEMU_IMG amend -o refcount_bits=32,compat=0.10 "$TEST_IMG"
+print_refcount_bits
+
+echo
+echo '=== Amend with snapshot ==='
+echo
+
+$QEMU_IMG snapshot -c foo "$TEST_IMG"
+# Just to have different refcounts across the image
+$QEMU_IO -c 'write 0 16M' "$TEST_IMG" | _filter_qemu_io
+
+# Should not work (may work in the future by first decreasing all refcounts so
+# they fit into the target range by copying them)
+$QEMU_IMG amend -o refcount_bits=1 "$TEST_IMG"
+_check_test_img
+print_refcount_bits
+
+# Should work
+$QEMU_IMG amend -o refcount_bits=2 "$TEST_IMG"
+_check_test_img
+print_refcount_bits
+
+echo
+echo '=== Testing too many references for check ==='
+echo
+
+IMGOPTS="$IMGOPTS,refcount_bits=1" _make_test_img 64M
+print_refcount_bits
+
+# This cluster should be created at 0x50000
+$QEMU_IO -c 'write 0 64k' "$TEST_IMG" | _filter_qemu_io
+# Now make the second L2 entry (the L2 table should be at 0x40000) point to that
+# cluster, so we have two references
+poke_file "$TEST_IMG" $((0x40008)) "\x80\x00\x00\x00\x00\x05\x00\x00"
+
+# This should say "please use amend"
+_check_test_img -r all
+
+# So we do that
+$QEMU_IMG amend -o refcount_bits=2 "$TEST_IMG"
+print_refcount_bits
+
+# And try again
+_check_test_img -r all
+
+echo
+echo '=== Multiple walks necessary during amend ==='
+echo
+
+IMGOPTS="$IMGOPTS,refcount_bits=1,cluster_size=512" _make_test_img 64k
+
+# Cluster 0 is the image header, clusters 1 to 4 are used by the L1 table, a
+# single L2 table, the reftable and a single refblock. This creates 58 data
+# clusters (actually, the L2 table is created here, too), so in total there are
+# then 63 used clusters in the image. With a refcount width of 64, one refblock
+# describes 64 clusters (512 bytes / 64 bits/entry = 64 entries), so this will
+# make the first refblock in the amended image have exactly one free entry.
+$QEMU_IO -c "write 0 $((58 * 512))" "$TEST_IMG" | _filter_qemu_io
+
+# Now change the refcount width; since the first new refblock will have exactly
+# one free entry, that entry will be used to store its own reference. No other
+# refblocks are needed, so then the new reftable will be allocated; since the
+# first new refblock is completely filled up, this will require a new refblock
+# which is why the refcount width changing function will need to run through
+# everything one more time until the allocations are stable.
+# Having more walks than usual should be visible as regressing progress (from
+# 66.67 % (2/3 walks) to 50.00 % (2/4 walks)).
+$QEMU_IMG amend -o refcount_bits=64 -p "$TEST_IMG" | tr '\r' '\n' \
+                                                   | grep -A 1 '66.67'
+print_refcount_bits
+
+_check_test_img
+
 
 # success, all done
 echo '*** done'
diff --git a/tests/qemu-iotests/112.out b/tests/qemu-iotests/112.out
index 8dd3df0..81b04d1 100644
--- a/tests/qemu-iotests/112.out
+++ b/tests/qemu-iotests/112.out
@@ -81,4 +81,75 @@ Leaked cluster 6 refcount=1 reference=0
 
 2 leaked clusters were found on the image.
 This means waste of disk space, but no harm to data.
+
+=== Amend from refcount_bits=16 to refcount_bits=1 ===
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
+refcount bits: 16
+wrote 33554432/33554432 bytes at offset 16777216
+32 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+No errors were found on the image.
+refcount bits: 1
+
+=== Amend from refcount_bits=1 to refcount_bits=64 ===
+
+No errors were found on the image.
+refcount bits: 64
+
+=== Amend to compat=0.10 ===
+
+qemu-img: compat=0.10 requires refcount_bits=16
+qemu-img: Error while amending options: Operation not supported
+refcount bits: 64
+No errors were found on the image.
+refcount bits: 16
+refcount bits: 16
+qemu-img: Different refcount widths than 16 bits require compatibility level 1.1 or above (use compat=1.1 or greater)
+qemu-img: Error while amending options: Invalid argument
+refcount bits: 16
+
+=== Amend with snapshot ===
+
+wrote 16777216/16777216 bytes at offset 0
+16 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+qemu-img: Cannot decrease refcount entry width to 1 bits: Cluster at offset 0x50000 has a refcount of 2
+qemu-img: Error while amending options: Invalid argument
+No errors were found on the image.
+refcount bits: 16
+No errors were found on the image.
+refcount bits: 2
+
+=== Testing too many references for check ===
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
+refcount bits: 1
+wrote 65536/65536 bytes at offset 0
+64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+ERROR: overflow cluster offset=0x50000
+Use qemu-img amend to increase the refcount entry width or qemu-img convert to create a clean copy if the image cannot be opened for writing
+
+1 errors were found on the image.
+Data may be corrupted, or further writes to the image may corrupt it.
+refcount bits: 2
+ERROR cluster 5 refcount=1 reference=2
+Repairing cluster 5 refcount=1 reference=2
+Repairing OFLAG_COPIED data cluster: l2_entry=8000000000050000 refcount=2
+Repairing OFLAG_COPIED data cluster: l2_entry=8000000000050000 refcount=2
+The following inconsistencies were found and repaired:
+
+    0 leaked clusters
+    3 corruptions
+
+Double checking the fixed image now...
+No errors were found on the image.
+
+=== Multiple walks necessary during amend ===
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=65536
+wrote 29696/29696 bytes at offset 0
+29 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+    (66.67/100%)
+    (50.00/100%)
+refcount bits: 64
+No errors were found on the image.
 *** done
-- 
1.8.3.1

  parent reply	other threads:[~2015-12-18 15:08 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-18 15:07 [Qemu-devel] [PULL 00/48] Block patches Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 01/48] iotests: 124: Split into two test classes Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 02/48] iotests: 124: move incremental failure test Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 03/48] iotests: 124: don't reopen qcow2 Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 04/48] qcow2: Add .bdrv_join_options callback Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 05/48] block: Fix reopen with semantically overlapping options Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 06/48] mirror: Error out when a BDS would get two BBs Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 07/48] block: Allow references for backing files Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 08/48] block: Consider all block layer options in append_open_options Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 09/48] block: Exclude nested options only for children in append_open_options() Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 10/48] block: Pass driver-specific options to .bdrv_refresh_filename() Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 11/48] block: Keep "driver" in bs->options Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 12/48] block: Allow specifying child options in reopen Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 13/48] block: reopen: Document option precedence and refactor accordingly Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 14/48] block: Add infrastructure for option inheritance Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 15/48] block: Split out parse_json_protocol() Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 16/48] block: Introduce bs->explicit_options Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 17/48] blockdev: Set 'format' indicates non-empty drive Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 18/48] qemu-iotests: Remove cache mode test without medium Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 19/48] block: reopen: Extract QemuOpts for generic block layer options Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 20/48] block: Move cache options into options QDict Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 21/48] blkdebug: Enable reopen Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 22/48] qemu-iotests: Try setting cache mode for children Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 23/48] qemu-iotests: Test cache mode option inheritance Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 24/48] qemu-iotests: Test reopen with node-name/driver options Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 25/48] progress: Allow regressing progress Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 26/48] block: Add opaque value to the amend CB Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 27/48] qcow2: Use error_report() in qcow2_amend_options() Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 28/48] qcow2: Use abort() instead of assert(false) Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 29/48] qcow2: Split upgrade/downgrade paths for amend Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 30/48] qcow2: Use intermediate helper CB " Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 31/48] qcow2: Add function for refcount order amendment Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 32/48] qcow2: Invoke refcount order amendment function Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 33/48] qcow2: Point to amend function in check Kevin Wolf
2015-12-18 15:07 ` Kevin Wolf [this message]
2015-12-18 15:07 ` [Qemu-devel] [PULL 35/48] qcow2: insert assert into qcow2_get_specific_info() Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 36/48] raw-posix: Make aio=native option binding Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 37/48] block: Remove prototype of bdrv_swap from header Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 38/48] iotests: Update comments for bdrv_swap() in 094 Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 39/48] block: use drained section around bdrv_snapshot_delete Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 40/48] block: fix bdrv_ioctl called from coroutine Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 41/48] qemu-iotests: refine common.config Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 42/48] qemu-iotests: s390x: fix test 051 Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 43/48] qemu-iotests: s390x: fix test 068 Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 44/48] block/qapi: do not redundantly print "actual path" Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 45/48] block/qapi: always report full_backing_filename Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 46/48] block/qapi: explicitly warn if !has_full_backing_filename Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 47/48] qemu-img: abort when full_backing_filename not present Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 48/48] block/qapi: allow best-effort query Kevin Wolf
2015-12-18 17:04 ` [Qemu-devel] [PULL 00/48] Block patches Peter Maydell

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=1450451274-7472-35-git-send-email-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=qemu-block@nongnu.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.