Commit fd69ad86 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging 



Block layer patches

# gpg: Signature made Tue 03 Apr 2018 16:48:53 BST
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  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
  iotests: fix 208 for luks format
  iotests: Update 186 after commit ac64273c
  iotests: Update 051 and 186 after commit 14545097
  block: handle invalid lseek returns gracefully
  gluster: Fix blockdev-add with server.N.type=unix

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents e5efa1f5 9c1386d3

block/file-posix.c

+15 −4
Original line number Diff line number Diff line
@@ -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");
@@ -2114,7 +2115,12 @@ static int find_allocation(BlockDriverState *bs, off_t start, 
    if (offs < 0) {

        return -errno;          /* D3 or D4 */

    }

    assert(offs >= start);



    if (offs < start) {

        /* This is not a valid return by lseek().  We are safe to just return

         * -EIO in this case, and we'll treat it like D4. */

        return -EIO;

    }



    if (offs > start) {

        /* D2: in hole, next data at offs */
@@ -2146,7 +2152,12 @@ static int find_allocation(BlockDriverState *bs, off_t start, 
    if (offs < 0) {

        return -errno;          /* D1 and (H3 or H4) */

    }

    assert(offs >= start);



    if (offs < start) {

        /* This is not a valid return by lseek().  We are safe to just return

         * -EIO in this case, and we'll treat it like H4. */

        return -EIO;

    }



    if (offs > start) {

        /*

tests/qemu-iotests/051.pc.out

+0 −20
Original line number Diff line number Diff line
@@ -117,20 +117,10 @@ Testing: -drive if=ide,media=cdrom 
QEMU X.Y.Z monitor - type 'help' for more information

(qemu) quit



Testing: -drive if=scsi,media=cdrom

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) QEMU_PROG: -drive if=scsi,media=cdrom: warning: bus=0,unit=0 is deprecated with this machine type

quit



Testing: -drive if=ide

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) QEMU_PROG: Initialization of device ide-hd failed: Device needs media, but drive is empty



Testing: -drive if=scsi

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) QEMU_PROG: -drive if=scsi: warning: bus=0,unit=0 is deprecated with this machine type

QEMU_PROG: -drive if=scsi: Device needs media, but drive is empty



Testing: -drive if=virtio

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) QEMU_PROG: -drive if=virtio: Device needs media, but drive is empty
@@ -170,20 +160,10 @@ Testing: -drive file=TEST_DIR/t.qcow2,if=ide,media=cdrom,readonly=on 
QEMU X.Y.Z monitor - type 'help' for more information

(qemu) quit



Testing: -drive file=TEST_DIR/t.qcow2,if=scsi,media=cdrom,readonly=on

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=scsi,media=cdrom,readonly=on: warning: bus=0,unit=0 is deprecated with this machine type

quit



Testing: -drive file=TEST_DIR/t.qcow2,if=ide,readonly=on

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) QEMU_PROG: Initialization of device ide-hd failed: Block node is read-only



Testing: -drive file=TEST_DIR/t.qcow2,if=scsi,readonly=on

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=scsi,readonly=on: warning: bus=0,unit=0 is deprecated with this machine type

quit



Testing: -drive file=TEST_DIR/t.qcow2,if=virtio,readonly=on

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) quit

tests/qemu-iotests/106

+24 −0
Original line number Diff line number Diff line
@@ -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

tests/qemu-iotests/106.out

+10 −0
Original line number Diff line number Diff line
@@ -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

tests/qemu-iotests/122

+47 −0
Original line number Diff line number Diff line
@@ -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