Commit 6632f6ff authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/famz/tags/block-and-testing-pull-request' into staging 



# gpg: Signature made Mon 17 Jul 2017 04:47:05 BST
# gpg:                using RSA key 0xCA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021  AD56 CA35 624C 6A91 71C6

* remotes/famz/tags/block-and-testing-pull-request:
  travis: add no-TCG build
  docker.py: Improve subprocess exit code handling
  docker.py: Drop infile parameter
  docker: Don't enable networking as a side-effect of DEBUG=1
  ssh: support I/O from any AioContext
  sheepdog: add queue_lock
  qed: protect table cache with CoMutex
  qed: introduce bdrv_qed_init_state
  block: invoke .bdrv_drain callback in coroutine context and from AioContext
  qed: move tail of qed_aio_write_main to qed_aio_write_{cow, alloc}
  vvfat: make it thread-safe
  vpc: make it thread-safe
  vdi: make it thread-safe
  coroutine-lock: add qemu_co_rwlock_downgrade and qemu_co_rwlock_upgrade
  qcow2: call CoQueue APIs under CoMutex

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

.travis.yml

+3 −0
Original line number Diff line number Diff line
@@ -86,6 +86,9 @@ matrix: 
    - env: CONFIG="--enable-trace-backends=ust"

           TEST_CMD=""

      compiler: gcc

    - env: CONFIG="--disable-tcg"

           TEST_CMD=""

      compiler: gcc

    - env: CONFIG=""

      os: osx

      compiler: clang

block/io.c

+33 −9
Original line number Diff line number Diff line
@@ -149,6 +149,37 @@ bool bdrv_requests_pending(BlockDriverState *bs) 
    return false;

}



typedef struct {

    Coroutine *co;

    BlockDriverState *bs;

    bool done;

} BdrvCoDrainData;



static void coroutine_fn bdrv_drain_invoke_entry(void *opaque)

{

    BdrvCoDrainData *data = opaque;

    BlockDriverState *bs = data->bs;



    bs->drv->bdrv_co_drain(bs);



    /* Set data->done before reading bs->wakeup.  */

    atomic_mb_set(&data->done, true);

    bdrv_wakeup(bs);

}



static void bdrv_drain_invoke(BlockDriverState *bs)

{

    BdrvCoDrainData data = { .bs = bs, .done = false };



    if (!bs->drv || !bs->drv->bdrv_co_drain) {

        return;

    }



    data.co = qemu_coroutine_create(bdrv_drain_invoke_entry, &data);

    bdrv_coroutine_enter(bs, data.co);

    BDRV_POLL_WHILE(bs, !data.done);

}



static bool bdrv_drain_recurse(BlockDriverState *bs)

{

    BdrvChild *child, *tmp;
@@ -156,9 +187,8 @@ static bool bdrv_drain_recurse(BlockDriverState *bs) 


    waited = BDRV_POLL_WHILE(bs, atomic_read(&bs->in_flight) > 0);



    if (bs->drv && bs->drv->bdrv_drain) {

        bs->drv->bdrv_drain(bs);

    }

    /* Ensure any pending metadata writes are submitted to bs->file.  */

    bdrv_drain_invoke(bs);



    QLIST_FOREACH_SAFE(child, &bs->children, next, tmp) {

        BlockDriverState *bs = child->bs;
@@ -184,12 +214,6 @@ static bool bdrv_drain_recurse(BlockDriverState *bs) 
    return waited;

}



typedef struct {

    Coroutine *co;

    BlockDriverState *bs;

    bool done;

} BdrvCoDrainData;



static void bdrv_co_drain_bh_cb(void *opaque)

{

    BdrvCoDrainData *data = opaque;

block/qcow2.c

+2 −2
Original line number Diff line number Diff line
@@ -2025,8 +2025,6 @@ static coroutine_fn int qcow2_co_pwritev(BlockDriverState *bs, uint64_t offset, 
    ret = 0;



fail:

    qemu_co_mutex_unlock(&s->lock);



    while (l2meta != NULL) {

        QCowL2Meta *next;
@@ -2040,6 +2038,8 @@ fail: 
        l2meta = next;

    }



    qemu_co_mutex_unlock(&s->lock);



    qemu_iovec_destroy(&hd_qiov);

    qemu_vfree(cluster_data);

    trace_qcow2_writev_done_req(qemu_coroutine_self(), ret);

block/qed-cluster.c

+2 −2
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ static unsigned int qed_count_contiguous_clusters(BDRVQEDState *s, 
 *

 * On failure QED_CLUSTER_L2 or QED_CLUSTER_L1 is returned for missing L2 or L1

 * table offset, respectively. len is number of contiguous unallocated bytes.

 *

 * Called with table_lock held.

 */

int coroutine_fn qed_find_cluster(BDRVQEDState *s, QEDRequest *request,

                                  uint64_t pos, size_t *len,
@@ -112,7 +114,6 @@ int coroutine_fn qed_find_cluster(BDRVQEDState *s, QEDRequest *request, 
    }



    ret = qed_read_l2_table(s, request, l2_offset);

    qed_acquire(s);

    if (ret) {

        goto out;

    }
@@ -137,6 +138,5 @@ int coroutine_fn qed_find_cluster(BDRVQEDState *s, QEDRequest *request, 


out:

    *img_offset = offset;

    qed_release(s);

    return ret;

}

block/qed-l2-cache.c

+6 −0
Original line number Diff line number Diff line
@@ -101,6 +101,8 @@ CachedL2Table *qed_alloc_l2_cache_entry(L2TableCache *l2_cache) 
/**

 * Decrease an entry's reference count and free if necessary when the reference

 * count drops to zero.

 *

 * Called with table_lock held.

 */

void qed_unref_l2_cache_entry(CachedL2Table *entry)

{
@@ -122,6 +124,8 @@ void qed_unref_l2_cache_entry(CachedL2Table *entry) 
 *

 * For a cached entry, this function increases the reference count and returns

 * the entry.

 *

 * Called with table_lock held.

 */

CachedL2Table *qed_find_l2_cache_entry(L2TableCache *l2_cache, uint64_t offset)

{
@@ -150,6 +154,8 @@ CachedL2Table *qed_find_l2_cache_entry(L2TableCache *l2_cache, uint64_t offset) 
 * N.B. This function steals a reference to the l2_table from the caller so the

 * caller must obtain a new reference by issuing a call to

 * qed_find_l2_cache_entry().

 *

 * Called with table_lock held.

 */

void qed_commit_l2_cache_entry(L2TableCache *l2_cache, CachedL2Table *l2_table)

{