Commit f0a9c18f authored by Eric Blake's avatar Eric Blake Committed by Kevin Wolf
Browse files

qemu-io: Relax 'alloc' now that block-status doesn't assert 



Previously, the alloc command required that input parameters be
sector-aligned and clamped to 32 bits, because the underlying
bdrv_is_allocated used a 32-bit parameter and asserted aligned
inputs.  But now that we have fixed block status to report a
64-bit bytes value, and to properly round requests on behalf of
guests, we can pass any values, and can use qemu-io to add
coverage that our rounding is correct regardless of the guest
alignment constraints.

Update iotest 177 to intentionally probe block status at
unaligned boundaries as well as with a bytes value that does not
map to 32-bit sectors, which also required tweaking the image
prep to leave an unallocated portion to the image under test.

Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 8cbf74b2

qemu-io-cmds.c

+0 −13
Original line number Diff line number Diff line
@@ -1769,10 +1769,6 @@ static int alloc_f(BlockBackend *blk, int argc, char **argv) 
    if (offset < 0) {

        print_cvtnum_err(offset, argv[1]);

        return 0;

    } else if (!QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE)) {

        printf("%" PRId64 " is not a sector-aligned value for 'offset'\n",

               offset);

        return 0;

    }



    if (argc == 3) {
@@ -1780,19 +1776,10 @@ static int alloc_f(BlockBackend *blk, int argc, char **argv) 
        if (count < 0) {

            print_cvtnum_err(count, argv[2]);

            return 0;

        } else if (count > INT_MAX * BDRV_SECTOR_SIZE) {

            printf("length argument cannot exceed %llu, given %s\n",

                   INT_MAX * BDRV_SECTOR_SIZE, argv[2]);

            return 0;

        }

    } else {

        count = BDRV_SECTOR_SIZE;

    }

    if (!QEMU_IS_ALIGNED(count, BDRV_SECTOR_SIZE)) {

        printf("%" PRId64 " is not a sector-aligned value for 'count'\n",

               count);

        return 0;

    }



    remaining = count;

    sum_alloc = 0;

tests/qemu-iotests/177

+10 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ echo "== setting up files ==" 
TEST_IMG="$TEST_IMG.base" _make_test_img $size

$QEMU_IO -c "write -P 11 0 $size" "$TEST_IMG.base" | _filter_qemu_io

_make_test_img -b "$TEST_IMG.base"

$QEMU_IO -c "write -P 22 0 $size" "$TEST_IMG" | _filter_qemu_io

$QEMU_IO -c "write -P 22 0 110M" "$TEST_IMG" | _filter_qemu_io



# Limited to 64k max-transfer

echo
@@ -81,6 +81,13 @@ limits=align=512,opt-write-zero=15M,max-write-zero=15M,opt-discard=15M,max-disca 
$QEMU_IO -c "open -o $options,$limits blkdebug::$TEST_IMG" \

         -c "discard 80000001 30M" | _filter_qemu_io



echo

echo "== block status smaller than alignment =="

limits=align=4k

$QEMU_IO -c "open -o $options,$limits blkdebug::$TEST_IMG" \

	 -c "alloc 1 1" -c "alloc 0x6dffff0 1000" -c "alloc 127m 5P" \

	 -c map | _filter_qemu_io



echo

echo "== verify image content =="
@@ -103,7 +110,8 @@ function verify_io() 
    echo read -P 0 32M 32M

    echo read -P 22 64M 13M

    echo read -P $discarded 77M 29M

    echo read -P 22 106M 22M

    echo read -P 22 106M 4M

    echo read -P 11 110M 18M

}



verify_io | $QEMU_IO -r "$TEST_IMG" | _filter_qemu_io

tests/qemu-iotests/177.out

+14 −5
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=134217728 
wrote 134217728/134217728 bytes at offset 0

128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/t.IMGFMT.base

wrote 134217728/134217728 bytes at offset 0

128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

wrote 115343360/115343360 bytes at offset 0

110 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)



== constrained alignment and max-transfer ==

wrote 131072/131072 bytes at offset 1000
@@ -26,6 +26,13 @@ wrote 33554432/33554432 bytes at offset 33554432 
discard 31457280/31457280 bytes at offset 80000001

30 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)



== block status smaller than alignment ==

1/1 bytes allocated at offset 1 bytes

16/1000 bytes allocated at offset 110 MiB

0/1048576 bytes allocated at offset 127 MiB

110 MiB (0x6e00000) bytes     allocated at offset 0 bytes (0x0)

18 MiB (0x1200000) bytes not allocated at offset 110 MiB (0x6e00000)



== verify image content ==

read 1000/1000 bytes at offset 0

1000 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
@@ -43,12 +50,14 @@ read 13631488/13631488 bytes at offset 67108864 
13 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

read 30408704/30408704 bytes at offset 80740352

29 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

read 23068672/23068672 bytes at offset 111149056

22 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

read 4194304/4194304 bytes at offset 111149056

4 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

read 18874368/18874368 bytes at offset 115343360

18 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

Offset          Length          File

0               0x800000        TEST_DIR/t.IMGFMT

0x900000        0x2400000       TEST_DIR/t.IMGFMT

0x3c00000       0x1100000       TEST_DIR/t.IMGFMT

0x6a00000       0x1600000       TEST_DIR/t.IMGFMT

0x6a00000       0x400000        TEST_DIR/t.IMGFMT

No errors were found on the image.

*** done