Blame SOURCES/kvm-test-bdrv-drain-bdrv_drain-works-with-cross-AioConte.patch

383d26
From 6ad2df3cb4ec0fbabc5d3e1beab138a071415bba Mon Sep 17 00:00:00 2001
383d26
From: Kevin Wolf <kwolf@redhat.com>
383d26
Date: Fri, 14 Sep 2018 10:54:59 +0200
383d26
Subject: [PATCH 08/49] test-bdrv-drain: bdrv_drain() works with
383d26
 cross-AioContext events
383d26
383d26
RH-Author: Kevin Wolf <kwolf@redhat.com>
383d26
Message-id: <20180914105540.18077-2-kwolf@redhat.com>
383d26
Patchwork-id: 82152
383d26
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH 01/42] test-bdrv-drain: bdrv_drain() works with cross-AioContext events
383d26
Bugzilla: 1601212
383d26
RH-Acked-by: John Snow <jsnow@redhat.com>
383d26
RH-Acked-by: Max Reitz <mreitz@redhat.com>
383d26
RH-Acked-by: Fam Zheng <famz@redhat.com>
383d26
383d26
As long as nobody keeps the other I/O thread from working, there is no
383d26
reason why bdrv_drain() wouldn't work with cross-AioContext events. The
383d26
key is that the root request we're waiting for is in the AioContext
383d26
we're polling (which it always is for bdrv_drain()) so that aio_poll()
383d26
is woken up in the end.
383d26
383d26
Add a test case that shows that it works. Remove the comment in
383d26
bdrv_drain() that claims otherwise.
383d26
383d26
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
383d26
(cherry picked from commit bb6756895459f181e2f25e877d3d7a10c297b5c8)
383d26
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
383d26
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
383d26
---
383d26
 block/io.c              |   4 --
383d26
 tests/test-bdrv-drain.c | 187 +++++++++++++++++++++++++++++++++++++++++++++++-
383d26
 2 files changed, 186 insertions(+), 5 deletions(-)
383d26
383d26
diff --git a/block/io.c b/block/io.c
383d26
index bb617de..7e0a169 100644
383d26
--- a/block/io.c
383d26
+++ b/block/io.c
383d26
@@ -369,10 +369,6 @@ void bdrv_unapply_subtree_drain(BdrvChild *child, BlockDriverState *old_parent)
383d26
  *
383d26
  * Note that unlike bdrv_drain_all(), the caller must hold the BlockDriverState
383d26
  * AioContext.
383d26
- *
383d26
- * Only this BlockDriverState's AioContext is run, so in-flight requests must
383d26
- * not depend on events in other AioContexts.  In that case, use
383d26
- * bdrv_drain_all() instead.
383d26
  */
383d26
 void coroutine_fn bdrv_co_drain(BlockDriverState *bs)
383d26
 {
383d26
diff --git a/tests/test-bdrv-drain.c b/tests/test-bdrv-drain.c
383d26
index 403446e..dee0a10 100644
383d26
--- a/tests/test-bdrv-drain.c
383d26
+++ b/tests/test-bdrv-drain.c
383d26
@@ -27,9 +27,13 @@
383d26
 #include "block/blockjob_int.h"
383d26
 #include "sysemu/block-backend.h"
383d26
 #include "qapi/error.h"
383d26
+#include "iothread.h"
383d26
+
383d26
+static QemuEvent done_event;
383d26
 
383d26
 typedef struct BDRVTestState {
383d26
     int drain_count;
383d26
+    AioContext *bh_indirection_ctx;
383d26
 } BDRVTestState;
383d26
 
383d26
 static void coroutine_fn bdrv_test_co_drain_begin(BlockDriverState *bs)
383d26
@@ -50,16 +54,29 @@ static void bdrv_test_close(BlockDriverState *bs)
383d26
     g_assert_cmpint(s->drain_count, >, 0);
383d26
 }
383d26
 
383d26
+static void co_reenter_bh(void *opaque)
383d26
+{
383d26
+    aio_co_wake(opaque);
383d26
+}
383d26
+
383d26
 static int coroutine_fn bdrv_test_co_preadv(BlockDriverState *bs,
383d26
                                             uint64_t offset, uint64_t bytes,
383d26
                                             QEMUIOVector *qiov, int flags)
383d26
 {
383d26
+    BDRVTestState *s = bs->opaque;
383d26
+
383d26
     /* We want this request to stay until the polling loop in drain waits for
383d26
      * it to complete. We need to sleep a while as bdrv_drain_invoke() comes
383d26
      * first and polls its result, too, but it shouldn't accidentally complete
383d26
      * this request yet. */
383d26
     qemu_co_sleep_ns(QEMU_CLOCK_REALTIME, 100000);
383d26
 
383d26
+    if (s->bh_indirection_ctx) {
383d26
+        aio_bh_schedule_oneshot(s->bh_indirection_ctx, co_reenter_bh,
383d26
+                                qemu_coroutine_self());
383d26
+        qemu_coroutine_yield();
383d26
+    }
383d26
+
383d26
     return 0;
383d26
 }
383d26
 
383d26
@@ -490,6 +507,164 @@ static void test_graph_change(void)
383d26
     blk_unref(blk_b);
383d26
 }
383d26
 
383d26
+struct test_iothread_data {
383d26
+    BlockDriverState *bs;
383d26
+    enum drain_type drain_type;
383d26
+    int *aio_ret;
383d26
+};
383d26
+
383d26
+static void test_iothread_drain_entry(void *opaque)
383d26
+{
383d26
+    struct test_iothread_data *data = opaque;
383d26
+
383d26
+    aio_context_acquire(bdrv_get_aio_context(data->bs));
383d26
+    do_drain_begin(data->drain_type, data->bs);
383d26
+    g_assert_cmpint(*data->aio_ret, ==, 0);
383d26
+    do_drain_end(data->drain_type, data->bs);
383d26
+    aio_context_release(bdrv_get_aio_context(data->bs));
383d26
+
383d26
+    qemu_event_set(&done_event);
383d26
+}
383d26
+
383d26
+static void test_iothread_aio_cb(void *opaque, int ret)
383d26
+{
383d26
+    int *aio_ret = opaque;
383d26
+    *aio_ret = ret;
383d26
+    qemu_event_set(&done_event);
383d26
+}
383d26
+
383d26
+/*
383d26
+ * Starts an AIO request on a BDS that runs in the AioContext of iothread 1.
383d26
+ * The request involves a BH on iothread 2 before it can complete.
383d26
+ *
383d26
+ * @drain_thread = 0 means that do_drain_begin/end are called from the main
383d26
+ * thread, @drain_thread = 1 means that they are called from iothread 1. Drain
383d26
+ * for this BDS cannot be called from iothread 2 because only the main thread
383d26
+ * may do cross-AioContext polling.
383d26
+ */
383d26
+static void test_iothread_common(enum drain_type drain_type, int drain_thread)
383d26
+{
383d26
+    BlockBackend *blk;
383d26
+    BlockDriverState *bs;
383d26
+    BDRVTestState *s;
383d26
+    BlockAIOCB *acb;
383d26
+    int aio_ret;
383d26
+    struct test_iothread_data data;
383d26
+
383d26
+    IOThread *a = iothread_new();
383d26
+    IOThread *b = iothread_new();
383d26
+    AioContext *ctx_a = iothread_get_aio_context(a);
383d26
+    AioContext *ctx_b = iothread_get_aio_context(b);
383d26
+
383d26
+    QEMUIOVector qiov;
383d26
+    struct iovec iov = {
383d26
+        .iov_base = NULL,
383d26
+        .iov_len = 0,
383d26
+    };
383d26
+    qemu_iovec_init_external(&qiov, &iov, 1);
383d26
+
383d26
+    /* bdrv_drain_all() may only be called from the main loop thread */
383d26
+    if (drain_type == BDRV_DRAIN_ALL && drain_thread != 0) {
383d26
+        goto out;
383d26
+    }
383d26
+
383d26
+    blk = blk_new(BLK_PERM_ALL, BLK_PERM_ALL);
383d26
+    bs = bdrv_new_open_driver(&bdrv_test, "test-node", BDRV_O_RDWR,
383d26
+                              &error_abort);
383d26
+    s = bs->opaque;
383d26
+    blk_insert_bs(blk, bs, &error_abort);
383d26
+
383d26
+    blk_set_aio_context(blk, ctx_a);
383d26
+    aio_context_acquire(ctx_a);
383d26
+
383d26
+    s->bh_indirection_ctx = ctx_b;
383d26
+
383d26
+    aio_ret = -EINPROGRESS;
383d26
+    if (drain_thread == 0) {
383d26
+        acb = blk_aio_preadv(blk, 0, &qiov, 0, test_iothread_aio_cb, &aio_ret);
383d26
+    } else {
383d26
+        acb = blk_aio_preadv(blk, 0, &qiov, 0, aio_ret_cb, &aio_ret);
383d26
+    }
383d26
+    g_assert(acb != NULL);
383d26
+    g_assert_cmpint(aio_ret, ==, -EINPROGRESS);
383d26
+
383d26
+    aio_context_release(ctx_a);
383d26
+
383d26
+    data = (struct test_iothread_data) {
383d26
+        .bs         = bs,
383d26
+        .drain_type = drain_type,
383d26
+        .aio_ret    = &aio_ret,
383d26
+    };
383d26
+
383d26
+    switch (drain_thread) {
383d26
+    case 0:
383d26
+        if (drain_type != BDRV_DRAIN_ALL) {
383d26
+            aio_context_acquire(ctx_a);
383d26
+        }
383d26
+
383d26
+        /* The request is running on the IOThread a. Draining its block device
383d26
+         * will make sure that it has completed as far as the BDS is concerned,
383d26
+         * but the drain in this thread can continue immediately after
383d26
+         * bdrv_dec_in_flight() and aio_ret might be assigned only slightly
383d26
+         * later. */
383d26
+        qemu_event_reset(&done_event);
383d26
+        do_drain_begin(drain_type, bs);
383d26
+        g_assert_cmpint(bs->in_flight, ==, 0);
383d26
+
383d26
+        if (drain_type != BDRV_DRAIN_ALL) {
383d26
+            aio_context_release(ctx_a);
383d26
+        }
383d26
+        qemu_event_wait(&done_event);
383d26
+        if (drain_type != BDRV_DRAIN_ALL) {
383d26
+            aio_context_acquire(ctx_a);
383d26
+        }
383d26
+
383d26
+        g_assert_cmpint(aio_ret, ==, 0);
383d26
+        do_drain_end(drain_type, bs);
383d26
+
383d26
+        if (drain_type != BDRV_DRAIN_ALL) {
383d26
+            aio_context_release(ctx_a);
383d26
+        }
383d26
+        break;
383d26
+    case 1:
383d26
+        qemu_event_reset(&done_event);
383d26
+        aio_bh_schedule_oneshot(ctx_a, test_iothread_drain_entry, &data);
383d26
+        qemu_event_wait(&done_event);
383d26
+        break;
383d26
+    default:
383d26
+        g_assert_not_reached();
383d26
+    }
383d26
+
383d26
+    aio_context_acquire(ctx_a);
383d26
+    blk_set_aio_context(blk, qemu_get_aio_context());
383d26
+    aio_context_release(ctx_a);
383d26
+
383d26
+    bdrv_unref(bs);
383d26
+    blk_unref(blk);
383d26
+
383d26
+out:
383d26
+    iothread_join(a);
383d26
+    iothread_join(b);
383d26
+}
383d26
+
383d26
+static void test_iothread_drain_all(void)
383d26
+{
383d26
+    test_iothread_common(BDRV_DRAIN_ALL, 0);
383d26
+    test_iothread_common(BDRV_DRAIN_ALL, 1);
383d26
+}
383d26
+
383d26
+static void test_iothread_drain(void)
383d26
+{
383d26
+    test_iothread_common(BDRV_DRAIN, 0);
383d26
+    test_iothread_common(BDRV_DRAIN, 1);
383d26
+}
383d26
+
383d26
+static void test_iothread_drain_subtree(void)
383d26
+{
383d26
+    test_iothread_common(BDRV_SUBTREE_DRAIN, 0);
383d26
+    test_iothread_common(BDRV_SUBTREE_DRAIN, 1);
383d26
+}
383d26
+
383d26
 
383d26
 typedef struct TestBlockJob {
383d26
     BlockJob common;
383d26
@@ -613,10 +788,13 @@ static void test_blockjob_drain_subtree(void)
383d26
 
383d26
 int main(int argc, char **argv)
383d26
 {
383d26
+    int ret;
383d26
+
383d26
     bdrv_init();
383d26
     qemu_init_main_loop(&error_abort);
383d26
 
383d26
     g_test_init(&argc, &argv, NULL);
383d26
+    qemu_event_init(&done_event, false);
383d26
 
383d26
     g_test_add_func("/bdrv-drain/driver-cb/drain_all", test_drv_cb_drain_all);
383d26
     g_test_add_func("/bdrv-drain/driver-cb/drain", test_drv_cb_drain);
383d26
@@ -643,10 +821,17 @@ int main(int argc, char **argv)
383d26
     g_test_add_func("/bdrv-drain/multiparent", test_multiparent);
383d26
     g_test_add_func("/bdrv-drain/graph-change", test_graph_change);
383d26
 
383d26
+    g_test_add_func("/bdrv-drain/iothread/drain_all", test_iothread_drain_all);
383d26
+    g_test_add_func("/bdrv-drain/iothread/drain", test_iothread_drain);
383d26
+    g_test_add_func("/bdrv-drain/iothread/drain_subtree",
383d26
+                    test_iothread_drain_subtree);
383d26
+
383d26
     g_test_add_func("/bdrv-drain/blockjob/drain_all", test_blockjob_drain_all);
383d26
     g_test_add_func("/bdrv-drain/blockjob/drain", test_blockjob_drain);
383d26
     g_test_add_func("/bdrv-drain/blockjob/drain_subtree",
383d26
                     test_blockjob_drain_subtree);
383d26
 
383d26
-    return g_test_run();
383d26
+    ret = g_test_run();
383d26
+    qemu_event_destroy(&done_event);
383d26
+    return ret;
383d26
 }
383d26
-- 
383d26
1.8.3.1
383d26