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

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging 



Pull request

v2:
 * Rebased to resolve scsi conflicts

# gpg: Signature made Tue 21 Feb 2017 11:56:24 GMT
# gpg:                using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request: (24 commits)
  coroutine-lock: make CoRwlock thread-safe and fair
  coroutine-lock: add mutex argument to CoQueue APIs
  coroutine-lock: place CoMutex before CoQueue in header
  test-aio-multithread: add performance comparison with thread-based mutexes
  coroutine-lock: add limited spinning to CoMutex
  coroutine-lock: make CoMutex thread-safe
  block: document fields protected by AioContext lock
  async: remove unnecessary inc/dec pairs
  aio-posix: partially inline aio_dispatch into aio_poll
  block: explicitly acquire aiocontext in aio callbacks that need it
  block: explicitly acquire aiocontext in bottom halves that need it
  block: explicitly acquire aiocontext in callbacks that need it
  block: explicitly acquire aiocontext in timers that need it
  aio: push aio_context_acquire/release down to dispatching
  qed: introduce qed_aio_start_io and qed_aio_next_io_cb
  blkdebug: reschedule coroutine on the AioContext it is running on
  coroutine-lock: reschedule coroutine on the AioContext it was running on
  nbd: convert to use qio_channel_yield
  io: make qio_channel_yield aware of AioContexts
  io: add methods to set I/O handlers on AioContext
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b8562561 a7b91d35

Makefile.objs

+0 −4
Original line number Diff line number Diff line
@@ -9,12 +9,8 @@ chardev-obj-y = chardev/ 
#######################################################################

# block-obj-y is code used by both qemu system emulation and qemu-img



block-obj-y = async.o thread-pool.o

block-obj-y += nbd/

block-obj-y += block.o blockjob.o

block-obj-y += main-loop.o iohandler.o qemu-timer.o

block-obj-$(CONFIG_POSIX) += aio-posix.o

block-obj-$(CONFIG_WIN32) += aio-win32.o

block-obj-y += block/

block-obj-y += qemu-io-cmds.o

block-obj-$(CONFIG_REPLICATION) += replication.o

block/backup.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static void coroutine_fn wait_for_overlapping_requests(BackupBlockJob *job, 
        retry = false;

        QLIST_FOREACH(req, &job->inflight_reqs, list) {

            if (end > req->start && start < req->end) {

                qemu_co_queue_wait(&req->wait_queue);

                qemu_co_queue_wait(&req->wait_queue, NULL);

                retry = true;

                break;

            }

block/blkdebug.c

+1 −8
Original line number Diff line number Diff line
@@ -405,12 +405,6 @@ out: 
    return ret;

}



static void error_callback_bh(void *opaque)

{

    Coroutine *co = opaque;

    qemu_coroutine_enter(co);

}



static int inject_error(BlockDriverState *bs, BlkdebugRule *rule)

{

    BDRVBlkdebugState *s = bs->opaque;
@@ -423,8 +417,7 @@ static int inject_error(BlockDriverState *bs, BlkdebugRule *rule) 
    }



    if (!immediately) {

        aio_bh_schedule_oneshot(bdrv_get_aio_context(bs), error_callback_bh,

                                qemu_coroutine_self());

        aio_co_schedule(qemu_get_current_aio_context(), qemu_coroutine_self());

        qemu_coroutine_yield();

    }

block/blkreplay.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static int64_t blkreplay_getlength(BlockDriverState *bs) 
static void blkreplay_bh_cb(void *opaque)

{

    Request *req = opaque;

    qemu_coroutine_enter(req->co);

    aio_co_wake(req->co);

    qemu_bh_delete(req->bh);

    g_free(req);

}

block/block-backend.c

+8 −5
Original line number Diff line number Diff line
@@ -880,7 +880,6 @@ static int blk_prw(BlockBackend *blk, int64_t offset, uint8_t *buf, 
{

    QEMUIOVector qiov;

    struct iovec iov;

    Coroutine *co;

    BlkRwCo rwco;



    iov = (struct iovec) {
@@ -897,9 +896,14 @@ static int blk_prw(BlockBackend *blk, int64_t offset, uint8_t *buf, 
        .ret    = NOT_DONE,

    };



    co = qemu_coroutine_create(co_entry, &rwco);

    if (qemu_in_coroutine()) {

        /* Fast-path if already in coroutine context */

        co_entry(&rwco);

    } else {

        Coroutine *co = qemu_coroutine_create(co_entry, &rwco);

        qemu_coroutine_enter(co);

        BDRV_POLL_WHILE(blk_bs(blk), rwco.ret == NOT_DONE);

    }



    return rwco.ret;

}
@@ -979,7 +983,6 @@ static void blk_aio_complete(BlkAioEmAIOCB *acb) 
static void blk_aio_complete_bh(void *opaque)

{

    BlkAioEmAIOCB *acb = opaque;



    assert(acb->has_returned);

    blk_aio_complete(acb);

}