Commit 33d70fb6 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

file-posix: Implement co versions of discard/flush 



This simplifies file-posix by implementing the coroutine variants of
the discard and flush BlockDriver callbacks. These were the last
remaining users of paio_submit(), which can be removed now.

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

block/file-posix.c

+24 −48
Original line number Diff line number Diff line
@@ -1754,31 +1754,6 @@ static inline int paio_submit_co(BlockDriverState *bs, int fd, 
    return paio_submit_co_full(bs, fd, offset, -1, 0, qiov, bytes, type);

}



static BlockAIOCB *paio_submit(BlockDriverState *bs, int fd,

        int64_t offset, QEMUIOVector *qiov, int bytes,

        BlockCompletionFunc *cb, void *opaque, int type)

{

    RawPosixAIOData *acb = g_new(RawPosixAIOData, 1);

    ThreadPool *pool;



    acb->bs = bs;

    acb->aio_type = type;

    acb->aio_fildes = fd;



    acb->aio_nbytes = bytes;

    acb->aio_offset = offset;



    if (qiov) {

        acb->aio_iov = qiov->iov;

        acb->aio_niov = qiov->niov;

        assert(qiov->size == acb->aio_nbytes);

    }



    trace_paio_submit(acb, opaque, offset, bytes, type);

    pool = aio_get_thread_pool(bdrv_get_aio_context(bs));

    return thread_pool_submit_aio(pool, aio_worker, acb, cb, opaque);

}



static int coroutine_fn raw_co_prw(BlockDriverState *bs, uint64_t offset,

                                   uint64_t bytes, QEMUIOVector *qiov, int type)

{
@@ -1845,15 +1820,17 @@ static void raw_aio_unplug(BlockDriverState *bs) 
#endif

}



static BlockAIOCB *raw_aio_flush(BlockDriverState *bs,

        BlockCompletionFunc *cb, void *opaque)

static int raw_co_flush_to_disk(BlockDriverState *bs)

{

    BDRVRawState *s = bs->opaque;

    int ret;



    if (fd_open(bs) < 0)

        return NULL;

    ret = fd_open(bs);

    if (ret < 0) {

        return ret;

    }



    return paio_submit(bs, s->fd, 0, NULL, 0, cb, opaque, QEMU_AIO_FLUSH);

    return paio_submit_co(bs, s->fd, 0, NULL, 0, QEMU_AIO_FLUSH);

}



static void raw_aio_attach_aio_context(BlockDriverState *bs,
@@ -2526,14 +2503,12 @@ static void coroutine_fn raw_co_invalidate_cache(BlockDriverState *bs, 
#endif /* !__linux__ */

}



static coroutine_fn BlockAIOCB *raw_aio_pdiscard(BlockDriverState *bs,

    int64_t offset, int bytes,

    BlockCompletionFunc *cb, void *opaque)

static coroutine_fn int

raw_co_pdiscard(BlockDriverState *bs, int64_t offset, int bytes)

{

    BDRVRawState *s = bs->opaque;



    return paio_submit(bs, s->fd, offset, NULL, bytes,

                       cb, opaque, QEMU_AIO_DISCARD);

    return paio_submit_co(bs, s->fd, offset, NULL, bytes, QEMU_AIO_DISCARD);

}



static int coroutine_fn raw_co_pwrite_zeroes(
@@ -2652,8 +2627,8 @@ BlockDriver bdrv_file = { 


    .bdrv_co_preadv         = raw_co_preadv,

    .bdrv_co_pwritev        = raw_co_pwritev,

    .bdrv_aio_flush = raw_aio_flush,

    .bdrv_aio_pdiscard = raw_aio_pdiscard,

    .bdrv_co_flush_to_disk  = raw_co_flush_to_disk,

    .bdrv_co_pdiscard       = raw_co_pdiscard,

    .bdrv_co_copy_range_from = raw_co_copy_range_from,

    .bdrv_co_copy_range_to  = raw_co_copy_range_to,

    .bdrv_refresh_limits = raw_refresh_limits,
@@ -3019,17 +2994,18 @@ static int fd_open(BlockDriverState *bs) 
    return -EIO;

}



static coroutine_fn BlockAIOCB *hdev_aio_pdiscard(BlockDriverState *bs,

    int64_t offset, int bytes,

    BlockCompletionFunc *cb, void *opaque)

static coroutine_fn int

hdev_co_pdiscard(BlockDriverState *bs, int64_t offset, int bytes)

{

    BDRVRawState *s = bs->opaque;

    int ret;



    if (fd_open(bs) < 0) {

        return NULL;

    ret = fd_open(bs);

    if (ret < 0) {

        return ret;

    }

    return paio_submit(bs, s->fd, offset, NULL, bytes,

                       cb, opaque, QEMU_AIO_DISCARD|QEMU_AIO_BLKDEV);

    return paio_submit_co(bs, s->fd, offset, NULL, bytes,

                          QEMU_AIO_DISCARD | QEMU_AIO_BLKDEV);

}



static coroutine_fn int hdev_co_pwrite_zeroes(BlockDriverState *bs,
@@ -3133,8 +3109,8 @@ static BlockDriver bdrv_host_device = { 


    .bdrv_co_preadv         = raw_co_preadv,

    .bdrv_co_pwritev        = raw_co_pwritev,

    .bdrv_aio_flush	= raw_aio_flush,

    .bdrv_aio_pdiscard   = hdev_aio_pdiscard,

    .bdrv_co_flush_to_disk  = raw_co_flush_to_disk,

    .bdrv_co_pdiscard       = hdev_co_pdiscard,

    .bdrv_co_copy_range_from = raw_co_copy_range_from,

    .bdrv_co_copy_range_to  = raw_co_copy_range_to,

    .bdrv_refresh_limits = raw_refresh_limits,
@@ -3258,7 +3234,7 @@ static BlockDriver bdrv_host_cdrom = { 


    .bdrv_co_preadv         = raw_co_preadv,

    .bdrv_co_pwritev        = raw_co_pwritev,

    .bdrv_aio_flush	= raw_aio_flush,

    .bdrv_co_flush_to_disk  = raw_co_flush_to_disk,

    .bdrv_refresh_limits = raw_refresh_limits,

    .bdrv_io_plug = raw_aio_plug,

    .bdrv_io_unplug = raw_aio_unplug,
@@ -3388,7 +3364,7 @@ static BlockDriver bdrv_host_cdrom = { 


    .bdrv_co_preadv         = raw_co_preadv,

    .bdrv_co_pwritev        = raw_co_pwritev,

    .bdrv_aio_flush	= raw_aio_flush,

    .bdrv_co_flush_to_disk  = raw_co_flush_to_disk,

    .bdrv_refresh_limits = raw_refresh_limits,

    .bdrv_io_plug = raw_aio_plug,

    .bdrv_io_unplug = raw_aio_unplug,