A fix for preallocated truncation, a new iotest, and a fix to make the iotests work more comfortably on ppc64
-----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJaw6CJAAoJEPQH2wBh1c9AZvcIAL51TsxzLBfYbEr7t/OqaYcT KptgkLn8UPUsVwEaZ1i9T+qpPqUhCgUeqBki4wTpGOfwmRO633L81lhlvLU1RD5f a9qsIWtvG0eYw+BU4P+ojltufdeQRQMxuLVhoiq2ur9vC8zUy6tEnF+yqOdWHYsm 83Z2T/NFZ192zIwPD3Rq9/+ijllJOhODrHdAcnwBp0IuvlXi5FV7GjccB4scW/Ym LwDe7cNWv0XlzRlosyhTRs0HiOm+XiLAj5t9dVKFiuZsUwGFEXx6GiRtUutDf1j8 5ham2wiYLsvxnSgRoUk486Txuj2ceNYDOvnllSv3uFh2kZyTaYewOL1acQFmtVw= =5AX/ -----END PGP SIGNATURE----- Merge remote-tracking branch 'mreitz/tags/pull-block-2018-04-03' into queue-block A fix for preallocated truncation, a new iotest, and a fix to make the iotests work more comfortably on ppc64 # gpg: Signature made Tue Apr 3 17:40:57 2018 CEST # gpg: using RSA key F407DB0061D5CF40 # gpg: Good signature from "Max Reitz <mreitz@redhat.com>" # Primary key fingerprint: 91BE B60A 30DB 3E88 57D1 1829 F407 DB00 61D5 CF40 * mreitz/tags/pull-block-2018-04-03: iotests: Test abnormally large size in compressed cluster descriptor qemu-iotests: Use ppc64 qemu_arch on ppc64le host iotests: Test preallocated truncate of 2G image block/file-posix: Fix fully preallocated truncate Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf
commit
9c1386d3ff
|
|
@ -1701,6 +1701,7 @@ static int raw_regular_truncate(int fd, int64_t offset, PreallocMode prealloc,
|
|||
case PREALLOC_MODE_FULL:
|
||||
{
|
||||
int64_t num = 0, left = offset - current_length;
|
||||
off_t seek_result;
|
||||
|
||||
/*
|
||||
* Knowing the final size from the beginning could allow the file
|
||||
|
|
@ -1715,8 +1716,8 @@ static int raw_regular_truncate(int fd, int64_t offset, PreallocMode prealloc,
|
|||
|
||||
buf = g_malloc0(65536);
|
||||
|
||||
result = lseek(fd, current_length, SEEK_SET);
|
||||
if (result < 0) {
|
||||
seek_result = lseek(fd, current_length, SEEK_SET);
|
||||
if (seek_result < 0) {
|
||||
result = -errno;
|
||||
error_setg_errno(errp, -result,
|
||||
"Failed to seek to the old end of file");
|
||||
|
|
|
|||
|
|
@ -86,6 +86,30 @@ for growth_mode in falloc full off; do
|
|||
$QEMU_IMG resize -f "$IMGFMT" --shrink --preallocation=$growth_mode "$TEST_IMG" -${GROWTH_SIZE}K
|
||||
done
|
||||
|
||||
echo
|
||||
echo '=== Testing image growth on 2G empty image ==='
|
||||
|
||||
for growth_mode in falloc full; do
|
||||
echo
|
||||
echo "--- growth_mode=$growth_mode ---"
|
||||
|
||||
# Maybe we want to do an lseek() to the end of the file before the
|
||||
# preallocation; if the file has a length of 2 GB, that would
|
||||
# return an integer that overflows to negative when put into a
|
||||
# plain int. We should use the correct type for the result, and
|
||||
# this tests we do.
|
||||
|
||||
_make_test_img 2G
|
||||
$QEMU_IMG resize -f "$IMGFMT" --preallocation=$growth_mode "$TEST_IMG" +${GROWTH_SIZE}K
|
||||
|
||||
actual_size=$($QEMU_IMG info -f "$IMGFMT" "$TEST_IMG" | grep 'disk size')
|
||||
actual_size=$(echo "$actual_size" | sed -e 's/^[^0-9]*\([0-9]\+\).*$/\1/')
|
||||
|
||||
if [ $actual_size -lt $GROWTH_SIZE ]; then
|
||||
echo "ERROR: Image should have at least ${GROWTH_SIZE}K, but has ${actual_size}K"
|
||||
fi
|
||||
done
|
||||
|
||||
# success, all done
|
||||
echo '*** done'
|
||||
rm -f $seq.full
|
||||
|
|
|
|||
|
|
@ -47,4 +47,14 @@ qemu-img: Preallocation can only be used for growing images
|
|||
|
||||
--- growth_mode=off ---
|
||||
Image resized.
|
||||
|
||||
=== Testing image growth on 2G empty image ===
|
||||
|
||||
--- growth_mode=falloc ---
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648
|
||||
Image resized.
|
||||
|
||||
--- growth_mode=full ---
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648
|
||||
Image resized.
|
||||
*** done
|
||||
|
|
|
|||
|
|
@ -129,6 +129,53 @@ $QEMU_IO -c "read -P 0x44 1023k 1k" "$TEST_IMG" 2>&1 | _filter_qemu_io | _fil
|
|||
$QEMU_IO -c "read -P 0 1024k 1022k" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_testdir
|
||||
|
||||
|
||||
echo
|
||||
echo "=== Corrupted size field in compressed cluster descriptor ==="
|
||||
echo
|
||||
# Create an empty image and fill half of it with compressed data.
|
||||
# The L2 entries of the two compressed clusters are located at
|
||||
# 0x800000 and 0x800008, their original values are 0x4008000000a00000
|
||||
# and 0x4008000000a00802 (5 sectors for compressed data each).
|
||||
_make_test_img 8M -o cluster_size=2M
|
||||
$QEMU_IO -c "write -c -P 0x11 0 2M" -c "write -c -P 0x11 2M 2M" "$TEST_IMG" \
|
||||
2>&1 | _filter_qemu_io | _filter_testdir
|
||||
|
||||
# Reduce size of compressed data to 4 sectors: this corrupts the image.
|
||||
poke_file "$TEST_IMG" $((0x800000)) "\x40\x06"
|
||||
$QEMU_IO -c "read -P 0x11 0 4M" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_testdir
|
||||
|
||||
# 'qemu-img check' however doesn't see anything wrong because it
|
||||
# doesn't try to decompress the data and the refcounts are consistent.
|
||||
# TODO: update qemu-img so this can be detected.
|
||||
_check_test_img
|
||||
|
||||
# Increase size of compressed data to the maximum (8192 sectors).
|
||||
# This makes QEMU read more data (8192 sectors instead of 5, host
|
||||
# addresses [0xa00000, 0xdfffff]), but the decompression algorithm
|
||||
# stops once we have enough to restore the uncompressed cluster, so
|
||||
# the rest of the data is ignored.
|
||||
poke_file "$TEST_IMG" $((0x800000)) "\x7f\xfe"
|
||||
# Do it also for the second compressed cluster (L2 entry at 0x800008).
|
||||
# In this case the compressed data would span 3 host clusters
|
||||
# (host addresses: [0xa00802, 0xe00801])
|
||||
poke_file "$TEST_IMG" $((0x800008)) "\x7f\xfe"
|
||||
|
||||
# Here the image is too small so we're asking QEMU to read beyond the
|
||||
# end of the image.
|
||||
$QEMU_IO -c "read -P 0x11 0 4M" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_testdir
|
||||
# But if we grow the image we won't be reading beyond its end anymore.
|
||||
$QEMU_IO -c "write -P 0x22 4M 4M" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_testdir
|
||||
$QEMU_IO -c "read -P 0x11 0 4M" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_testdir
|
||||
|
||||
# The refcount data is however wrong because due to the increased size
|
||||
# of the compressed data it now reaches the following host clusters.
|
||||
# This can be repaired by qemu-img check by increasing the refcount of
|
||||
# those clusters.
|
||||
# TODO: update qemu-img to correct the compressed cluster size instead.
|
||||
_check_test_img -r all
|
||||
$QEMU_IO -c "read -P 0x11 0 4M" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_testdir
|
||||
$QEMU_IO -c "read -P 0x22 4M 4M" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_testdir
|
||||
|
||||
echo
|
||||
echo "=== Full allocation with -S 0 ==="
|
||||
echo
|
||||
|
|
|
|||
|
|
@ -99,6 +99,39 @@ read 1024/1024 bytes at offset 1047552
|
|||
read 1046528/1046528 bytes at offset 1048576
|
||||
1022 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
|
||||
=== Corrupted size field in compressed cluster descriptor ===
|
||||
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=8388608
|
||||
wrote 2097152/2097152 bytes at offset 0
|
||||
2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
wrote 2097152/2097152 bytes at offset 2097152
|
||||
2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
read failed: Input/output error
|
||||
No errors were found on the image.
|
||||
read 4194304/4194304 bytes at offset 0
|
||||
4 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
wrote 4194304/4194304 bytes at offset 4194304
|
||||
4 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
read 4194304/4194304 bytes at offset 0
|
||||
4 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
ERROR cluster 6 refcount=1 reference=3
|
||||
ERROR cluster 7 refcount=1 reference=2
|
||||
Repairing cluster 6 refcount=1 reference=3
|
||||
Repairing cluster 7 refcount=1 reference=2
|
||||
Repairing OFLAG_COPIED data cluster: l2_entry=8000000000c00000 refcount=3
|
||||
Repairing OFLAG_COPIED data cluster: l2_entry=8000000000e00000 refcount=2
|
||||
The following inconsistencies were found and repaired:
|
||||
|
||||
0 leaked clusters
|
||||
4 corruptions
|
||||
|
||||
Double checking the fixed image now...
|
||||
No errors were found on the image.
|
||||
read 4194304/4194304 bytes at offset 0
|
||||
4 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
read 4194304/4194304 bytes at offset 4194304
|
||||
4 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
|
||||
=== Full allocation with -S 0 ===
|
||||
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
|
||||
|
|
|
|||
|
|
@ -538,8 +538,8 @@ if [ -z "$QEMU_PROG" ]
|
|||
then
|
||||
if [ -x "$build_iotests/qemu" ]; then
|
||||
export QEMU_PROG="$build_iotests/qemu"
|
||||
elif [ -x "$build_root/$arch-softmmu/qemu-system-$arch" ]; then
|
||||
export QEMU_PROG="$build_root/$arch-softmmu/qemu-system-$arch"
|
||||
elif [ -x "$build_root/${qemu_arch}-softmmu/qemu-system-${qemu_arch}" ]; then
|
||||
export QEMU_PROG="$build_root/${qemu_arch}-softmmu/qemu-system-${qemu_arch}"
|
||||
else
|
||||
pushd "$build_root" > /dev/null
|
||||
for binary in *-softmmu/qemu-system-*
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ PATH=".:$PATH"
|
|||
|
||||
HOSTOS=`uname -s`
|
||||
arch=`uname -m`
|
||||
[[ "$arch" =~ "ppc64" ]] && qemu_arch=ppc64 || qemu_arch="$arch"
|
||||
|
||||
export PWD=`pwd`
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue