Commit 7851f1a7 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Block layer patches:

- Copy offloading fixes for when the copy increases the image size
- Temporary revert of the removal of deprecated -drive options
- Fix request serialisation in the image fleecing scenario
- Fix copy-on-read crash with unaligned image size
- Fix another drain crash

# gpg: Signature made Tue 10 Jul 2018 16:37:52 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: (24 commits)
  block: Use common write req handling in truncate
  block: Fix bdrv_co_truncate overlap check
  block: Use common req handling in copy offloading
  block: Use common req handling for discard
  block: Fix handling of image enlarging write
  block: Extract common write req handling
  block: Use uint64_t for BdrvTrackedRequest byte fields
  block: Use BdrvChild to discard
  block: Add copy offloading trace points
  block: Prefix file driver trace points with "file_"
  Revert "block: Remove deprecated -drive geometry options"
  Revert "block: Remove deprecated -drive option addr"
  Revert "block: Remove deprecated -drive option serial"
  Revert "block: Remove dead deprecation warning code"
  block/blklogwrites: Make sure the log sector size is not too small
  qapi/block-core.json: Add missing documentation for blklogwrites log-append option
  block/backup: fix fleecing scheme: use serialized writes
  block: add BDRV_REQ_SERIALISING flag
  block: split flags in copy_range
  block/io: fix copy_range
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 0956ee3e cd47d792

block.c

+1 −1
Original line number Diff line number Diff line
@@ -2066,7 +2066,7 @@ static void bdrv_replace_child_noperm(BdrvChild *child, 
            }

            assert(num >= 0);

            for (i = 0; i < num; i++) {

                child->role->drained_begin(child);

                bdrv_parent_drained_begin_single(child, true);

            }

        }

block/backup.c

+14 −6
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ typedef struct BackupBlockJob { 
    HBitmap *copy_bitmap;

    bool use_copy_range;

    int64_t copy_range_size;



    bool serialize_target_writes;

} BackupBlockJob;



static const BlockJobDriver backup_job_driver;
@@ -102,6 +104,8 @@ static int coroutine_fn backup_cow_with_bounce_buffer(BackupBlockJob *job, 
    QEMUIOVector qiov;

    BlockBackend *blk = job->common.blk;

    int nbytes;

    int read_flags = is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0;

    int write_flags = job->serialize_target_writes ? BDRV_REQ_SERIALISING : 0;



    hbitmap_reset(job->copy_bitmap, start / job->cluster_size, 1);

    nbytes = MIN(job->cluster_size, job->len - start);
@@ -112,8 +116,7 @@ static int coroutine_fn backup_cow_with_bounce_buffer(BackupBlockJob *job, 
    iov.iov_len = nbytes;

    qemu_iovec_init_external(&qiov, &iov, 1);



    ret = blk_co_preadv(blk, start, qiov.size, &qiov,

                        is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0);

    ret = blk_co_preadv(blk, start, qiov.size, &qiov, read_flags);

    if (ret < 0) {

        trace_backup_do_cow_read_fail(job, start, ret);

        if (error_is_read) {
@@ -124,11 +127,11 @@ static int coroutine_fn backup_cow_with_bounce_buffer(BackupBlockJob *job, 


    if (qemu_iovec_is_zero(&qiov)) {

        ret = blk_co_pwrite_zeroes(job->target, start,

                                   qiov.size, BDRV_REQ_MAY_UNMAP);

                                   qiov.size, write_flags | BDRV_REQ_MAY_UNMAP);

    } else {

        ret = blk_co_pwritev(job->target, start,

                             qiov.size, &qiov,

                             job->compress ? BDRV_REQ_WRITE_COMPRESSED : 0);

                             qiov.size, &qiov, write_flags |

                             (job->compress ? BDRV_REQ_WRITE_COMPRESSED : 0));

    }

    if (ret < 0) {

        trace_backup_do_cow_write_fail(job, start, ret);
@@ -156,6 +159,8 @@ static int coroutine_fn backup_cow_with_offload(BackupBlockJob *job, 
    int nr_clusters;

    BlockBackend *blk = job->common.blk;

    int nbytes;

    int read_flags = is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0;

    int write_flags = job->serialize_target_writes ? BDRV_REQ_SERIALISING : 0;



    assert(QEMU_IS_ALIGNED(job->copy_range_size, job->cluster_size));

    nbytes = MIN(job->copy_range_size, end - start);
@@ -163,7 +168,7 @@ static int coroutine_fn backup_cow_with_offload(BackupBlockJob *job, 
    hbitmap_reset(job->copy_bitmap, start / job->cluster_size,

                  nr_clusters);

    ret = blk_co_copy_range(blk, start, job->target, start, nbytes,

                            is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0);

                            read_flags, write_flags);

    if (ret < 0) {

        trace_backup_do_cow_copy_range_fail(job, start, ret);

        hbitmap_set(job->copy_bitmap, start / job->cluster_size,
@@ -701,6 +706,9 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, 
                       sync_bitmap : NULL;

    job->compress = compress;



    /* Detect image-fleecing (and similar) schemes */

    job->serialize_target_writes = bdrv_chain_contains(target, bs);



    /* If there is no backing file on the target, we cannot rely on COW if our

     * backup cluster size is smaller than the target cluster size. Even for

     * targets with a backing file, try to avoid COW if possible. */

block/blkdebug.c

+1 −1
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ static int coroutine_fn blkdebug_co_pdiscard(BlockDriverState *bs, 
        return err;

    }



    return bdrv_co_pdiscard(bs->file->bs, offset, bytes);

    return bdrv_co_pdiscard(bs->file, offset, bytes);

}



static int coroutine_fn blkdebug_co_block_status(BlockDriverState *bs,

block/blklogwrites.c

+5 −2
Original line number Diff line number Diff line
@@ -89,7 +89,10 @@ static inline uint32_t blk_log_writes_log2(uint32_t value) 


static inline bool blk_log_writes_sector_size_valid(uint32_t sector_size)

{

    return sector_size < (1ull << 24) && is_power_of_2(sector_size);

    return is_power_of_2(sector_size) &&

        sector_size >= sizeof(struct log_write_super) &&

        sector_size >= sizeof(struct log_write_entry) &&

        sector_size < (1ull << 24);

}



static uint64_t blk_log_writes_find_cur_log_sector(BdrvChild *log,
@@ -483,7 +486,7 @@ static int coroutine_fn blk_log_writes_co_do_file_flush(BlkLogWritesFileReq *fr) 
static int coroutine_fn

blk_log_writes_co_do_file_pdiscard(BlkLogWritesFileReq *fr)

{

    return bdrv_co_pdiscard(fr->bs->file->bs, fr->offset, fr->bytes);

    return bdrv_co_pdiscard(fr->bs->file, fr->offset, fr->bytes);

}



static int coroutine_fn

block/blkreplay.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static int coroutine_fn blkreplay_co_pdiscard(BlockDriverState *bs, 
                                              int64_t offset, int bytes)

{

    uint64_t reqid = blkreplay_next_id();

    int ret = bdrv_co_pdiscard(bs->file->bs, offset, bytes);

    int ret = bdrv_co_pdiscard(bs->file, offset, bytes);

    block_request_create(reqid, bs, qemu_coroutine_self());

    qemu_coroutine_yield();