Commit 6784273a authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/xanclic/tags/pull-block-2018-07-09' into staging 



Block patches for 3.0-rc0:
- qcow2 metadata overlap protection for the persistent bitmap directory
- Various bug fixes

# gpg: Signature made Mon 09 Jul 2018 19:54:38 BST
# 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

* remotes/xanclic/tags/pull-block-2018-07-09:
  qcow2: add overlap check for bitmap directory
  iotests: Add VMDK backing file correlation test
  vmdk: Fix possible segfault with non-VMDK backing
  raw: Drop superfluous semicolon
  qcow2: Drop unreachable break
  file-posix: Fix fd_open check in raw_co_copy_range_to
  qcow2: Drop unused cluster_data

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b3418105 0e4e4318

block/file-posix.c

+1 −1
Original line number Diff line number Diff line
@@ -2611,7 +2611,7 @@ static int coroutine_fn raw_co_copy_range_to(BlockDriverState *bs, 
    }



    src_s = src->bs->opaque;

    if (fd_open(bs) < 0 || fd_open(bs) < 0) {

    if (fd_open(src->bs) < 0 || fd_open(dst->bs) < 0) {

        return -EIO;

    }

    return paio_submit_co_full(bs, src_s->fd, src_offset, s->fd, dst_offset,

block/qcow2-bitmap.c

+6 −1
Original line number Diff line number Diff line
@@ -775,7 +775,12 @@ static int bitmap_list_store(BlockDriverState *bs, Qcow2BitmapList *bm_list, 
        }

    }



    ret = qcow2_pre_write_overlap_check(bs, 0, dir_offset, dir_size);

    /* Actually, even in in-place case ignoring QCOW2_OL_BITMAP_DIRECTORY is not

     * necessary, because we drop QCOW2_AUTOCLEAR_BITMAPS when updating bitmap

     * directory in-place (actually, turn-off the extension), which is checked

     * in qcow2_check_metadata_overlap() */

    ret = qcow2_pre_write_overlap_check(

            bs, in_place ? QCOW2_OL_BITMAP_DIRECTORY : 0, dir_offset, dir_size);

    if (ret < 0) {

        goto fail;

    }

block/qcow2-refcount.c

+10 −0
Original line number Diff line number Diff line
@@ -2705,6 +2705,16 @@ int qcow2_check_metadata_overlap(BlockDriverState *bs, int ign, int64_t offset, 
        }

    }



    if ((chk & QCOW2_OL_BITMAP_DIRECTORY) &&

        (s->autoclear_features & QCOW2_AUTOCLEAR_BITMAPS))

    {

        if (overlaps_with(s->bitmap_directory_offset,

                          s->bitmap_directory_size))

        {

            return QCOW2_OL_BITMAP_DIRECTORY;

        }

    }



    return 0;

}

block/qcow2.c

+14 −11
Original line number Diff line number Diff line
@@ -679,6 +679,11 @@ static QemuOptsList qcow2_runtime_opts = { 
            .type = QEMU_OPT_BOOL,

            .help = "Check for unintended writes into an inactive L2 table",

        },

        {

            .name = QCOW2_OPT_OVERLAP_BITMAP_DIRECTORY,

            .type = QEMU_OPT_BOOL,

            .help = "Check for unintended writes into the bitmap directory",

        },

        {

            .name = QCOW2_OPT_CACHE_SIZE,

            .type = QEMU_OPT_SIZE,
@@ -720,6 +725,7 @@ static const char *overlap_bool_option_names[QCOW2_OL_MAX_BITNR] = { 
    [QCOW2_OL_SNAPSHOT_TABLE_BITNR]   = QCOW2_OPT_OVERLAP_SNAPSHOT_TABLE,

    [QCOW2_OL_INACTIVE_L1_BITNR]      = QCOW2_OPT_OVERLAP_INACTIVE_L1,

    [QCOW2_OL_INACTIVE_L2_BITNR]      = QCOW2_OPT_OVERLAP_INACTIVE_L2,

    [QCOW2_OL_BITMAP_DIRECTORY_BITNR] = QCOW2_OPT_OVERLAP_BITMAP_DIRECTORY,

};



static void cache_clean_timer_cb(void *opaque)
@@ -3299,7 +3305,6 @@ qcow2_co_copy_range_from(BlockDriverState *bs, 
        case QCOW2_CLUSTER_COMPRESSED:

            ret = -ENOTSUP;

            goto out;

            break;



        case QCOW2_CLUSTER_NORMAL:

            child = bs->file;
@@ -3345,7 +3350,6 @@ qcow2_co_copy_range_to(BlockDriverState *bs, 
    int ret;

    unsigned int cur_bytes; /* number of sectors in current iteration */

    uint64_t cluster_offset;

    uint8_t *cluster_data = NULL;

    QCowL2Meta *l2meta = NULL;



    assert(!bs->encrypted);
@@ -3404,7 +3408,6 @@ fail: 


    qemu_co_mutex_unlock(&s->lock);



    qemu_vfree(cluster_data);

    trace_qcow2_writev_done_req(qemu_coroutine_self(), ret);



    return ret;

block/qcow2.h

+24 −21
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ 
#define QCOW2_OPT_OVERLAP_SNAPSHOT_TABLE "overlap-check.snapshot-table"

#define QCOW2_OPT_OVERLAP_INACTIVE_L1 "overlap-check.inactive-l1"

#define QCOW2_OPT_OVERLAP_INACTIVE_L2 "overlap-check.inactive-l2"

#define QCOW2_OPT_OVERLAP_BITMAP_DIRECTORY "overlap-check.bitmap-directory"

#define QCOW2_OPT_CACHE_SIZE "cache-size"

#define QCOW2_OPT_L2_CACHE_SIZE "l2-cache-size"

#define QCOW2_OPT_L2_CACHE_ENTRY_SIZE "l2-cache-entry-size"
@@ -408,8 +409,9 @@ typedef enum QCow2MetadataOverlap { 
    QCOW2_OL_SNAPSHOT_TABLE_BITNR   = 5,

    QCOW2_OL_INACTIVE_L1_BITNR      = 6,

    QCOW2_OL_INACTIVE_L2_BITNR      = 7,

    QCOW2_OL_BITMAP_DIRECTORY_BITNR = 8,



    QCOW2_OL_MAX_BITNR            = 8,

    QCOW2_OL_MAX_BITNR              = 9,



    QCOW2_OL_NONE             = 0,

    QCOW2_OL_MAIN_HEADER      = (1 << QCOW2_OL_MAIN_HEADER_BITNR),
@@ -422,12 +424,13 @@ typedef enum QCow2MetadataOverlap { 
    /* NOTE: Checking overlaps with inactive L2 tables will result in bdrv

     * reads. */

    QCOW2_OL_INACTIVE_L2      = (1 << QCOW2_OL_INACTIVE_L2_BITNR),

    QCOW2_OL_BITMAP_DIRECTORY = (1 << QCOW2_OL_BITMAP_DIRECTORY_BITNR),

} QCow2MetadataOverlap;



/* Perform all overlap checks which can be done in constant time */

#define QCOW2_OL_CONSTANT \

    (QCOW2_OL_MAIN_HEADER | QCOW2_OL_ACTIVE_L1 | QCOW2_OL_REFCOUNT_TABLE | \

     QCOW2_OL_SNAPSHOT_TABLE)

     QCOW2_OL_SNAPSHOT_TABLE | QCOW2_OL_BITMAP_DIRECTORY)



/* Perform all overlap checks which don't require disk access */

#define QCOW2_OL_CACHED \