Commit 1bd2e35c authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Block layer patches:

- Fix slow pre-zeroing in qemu-img convert
- Test case for block job pausing on I/O errors

# gpg: Signature made Tue 26 Mar 2019 15:28:00 GMT
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  qemu-io: Add write -n for BDRV_REQ_NO_FALLBACK
  qemu-img: Use BDRV_REQ_NO_FALLBACK for pre-zeroing
  file-posix: Support BDRV_REQ_NO_FALLBACK for zero writes
  block: Advertise BDRV_REQ_NO_FALLBACK in filter drivers
  block: Add BDRV_REQ_NO_FALLBACK
  block: Remove error messages in bdrv_make_zero()
  iotests: add 248: test resume mirror after auto pause on ENOSPC

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 905870b5 c6e3f520

block/blkdebug.c

+1 −1
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags, 
    bs->supported_write_flags = BDRV_REQ_WRITE_UNCHANGED |

        (BDRV_REQ_FUA & bs->file->bs->supported_write_flags);

    bs->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED |

        ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP) &

        ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) &

            bs->file->bs->supported_zero_flags);

    ret = -EINVAL;

block/copy-on-read.c

+3 −4
Original line number Diff line number Diff line
@@ -34,11 +34,10 @@ static int cor_open(BlockDriverState *bs, QDict *options, int flags, 
    }



    bs->supported_write_flags = BDRV_REQ_WRITE_UNCHANGED |

                                (BDRV_REQ_FUA &

                                    bs->file->bs->supported_write_flags);

        (BDRV_REQ_FUA & bs->file->bs->supported_write_flags);



    bs->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED |

                               ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP) &

        ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) &

            bs->file->bs->supported_zero_flags);



    return 0;

block/file-posix.c

+16 −8
Original line number Diff line number Diff line
@@ -652,7 +652,7 @@ static int raw_open_common(BlockDriverState *bs, QDict *options, 
    }

#endif



    bs->supported_zero_flags = BDRV_REQ_MAY_UNMAP;

    bs->supported_zero_flags = BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK;

    ret = 0;

fail:

    if (filename && (bdrv_flags & BDRV_O_TEMPORARY)) {
@@ -1500,6 +1500,10 @@ static ssize_t handle_aiocb_write_zeroes_block(RawPosixAIOData *aiocb) 
    }



#ifdef BLKZEROOUT

    /* The BLKZEROOUT implementation in the kernel doesn't set

     * BLKDEV_ZERO_NOFALLBACK, so we can't call this if we have to avoid slow

     * fallbacks. */

    if (!(aiocb->aio_type & QEMU_AIO_NO_FALLBACK)) {

        do {

            uint64_t range[2] = { aiocb->aio_offset, aiocb->aio_nbytes };

            if (ioctl(aiocb->aio_fildes, BLKZEROOUT, range) == 0) {
@@ -1508,6 +1512,7 @@ static ssize_t handle_aiocb_write_zeroes_block(RawPosixAIOData *aiocb) 
        } while (errno == EINTR);



        ret = translate_err(-errno);

    }

#endif



    if (ret == -ENOTSUP) {
@@ -2659,6 +2664,9 @@ raw_do_pwrite_zeroes(BlockDriverState *bs, int64_t offset, int bytes, 
    if (blkdev) {

        acb.aio_type |= QEMU_AIO_BLKDEV;

    }

    if (flags & BDRV_REQ_NO_FALLBACK) {

        acb.aio_type |= QEMU_AIO_NO_FALLBACK;

    }



    if (flags & BDRV_REQ_MAY_UNMAP) {

        acb.aio_type |= QEMU_AIO_DISCARD;

block/io.c

+11 −5
Original line number Diff line number Diff line
@@ -909,8 +909,6 @@ int bdrv_make_zero(BdrvChild *child, BdrvRequestFlags flags) 
        }

        ret = bdrv_block_status(bs, offset, bytes, &bytes, NULL, NULL);

        if (ret < 0) {

            error_report("error getting block status at offset %" PRId64 ": %s",

                         offset, strerror(-ret));

            return ret;

        }

        if (ret & BDRV_BLOCK_ZERO) {
@@ -919,8 +917,6 @@ int bdrv_make_zero(BdrvChild *child, BdrvRequestFlags flags) 
        }

        ret = bdrv_pwrite_zeroes(child, offset, bytes, flags);

        if (ret < 0) {

            error_report("error writing zeroes at offset %" PRId64 ": %s",

                         offset, strerror(-ret));

            return ret;

        }

        offset += bytes;
@@ -1019,6 +1015,7 @@ static int coroutine_fn bdrv_driver_preadv(BlockDriverState *bs, 
    unsigned int nb_sectors;



    assert(!(flags & ~BDRV_REQ_MASK));

    assert(!(flags & BDRV_REQ_NO_FALLBACK));



    if (!drv) {

        return -ENOMEDIUM;
@@ -1065,6 +1062,7 @@ static int coroutine_fn bdrv_driver_pwritev(BlockDriverState *bs, 
    int ret;



    assert(!(flags & ~BDRV_REQ_MASK));

    assert(!(flags & BDRV_REQ_NO_FALLBACK));



    if (!drv) {

        return -ENOMEDIUM;
@@ -1471,6 +1469,10 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs, 
        return -ENOMEDIUM;

    }



    if ((flags & ~bs->supported_zero_flags) & BDRV_REQ_NO_FALLBACK) {

        return -ENOTSUP;

    }



    assert(alignment % bs->bl.request_alignment == 0);

    head = offset % alignment;

    tail = (offset + bytes) % alignment;
@@ -1514,7 +1516,7 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs, 
            assert(!bs->supported_zero_flags);

        }



        if (ret == -ENOTSUP) {

        if (ret == -ENOTSUP && !(flags & BDRV_REQ_NO_FALLBACK)) {

            /* Fall back to bounce buffer if write zeroes is unsupported */

            BdrvRequestFlags write_flags = flags & ~BDRV_REQ_ZERO_WRITE;
@@ -2953,6 +2955,10 @@ static int coroutine_fn bdrv_co_copy_range_internal( 
    BdrvTrackedRequest req;

    int ret;



    /* TODO We can support BDRV_REQ_NO_FALLBACK here */

    assert(!(read_flags & BDRV_REQ_NO_FALLBACK));

    assert(!(write_flags & BDRV_REQ_NO_FALLBACK));



    if (!dst || !dst->bs) {

        return -ENOMEDIUM;

    }

block/mirror.c

+2 −1
Original line number Diff line number Diff line
@@ -1548,7 +1548,8 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs, 
    }

    mirror_top_bs->total_sectors = bs->total_sectors;

    mirror_top_bs->supported_write_flags = BDRV_REQ_WRITE_UNCHANGED;

    mirror_top_bs->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED;

    mirror_top_bs->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED |

                                          BDRV_REQ_NO_FALLBACK;

    bs_opaque = g_new0(MirrorBDSOpaque, 1);

    mirror_top_bs->opaque = bs_opaque;

    bdrv_set_aio_context(mirror_top_bs, bdrv_get_aio_context(bs));