[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL v3 30/35] test-bdrv-drain: Test behaviour in coroutin
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL v3 30/35] test-bdrv-drain: Test behaviour in coroutine context |
Date: |
Fri, 22 Dec 2017 16:18:41 +0100 |
If bdrv_do_drained_begin/end() are called in coroutine context, they
first use a BH to get out of the coroutine context. Call some existing
tests again from a coroutine to cover this code path.
Signed-off-by: Kevin Wolf <address@hidden>
---
tests/test-bdrv-drain.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 59 insertions(+)
diff --git a/tests/test-bdrv-drain.c b/tests/test-bdrv-drain.c
index f363d51b34..354c6151a0 100644
--- a/tests/test-bdrv-drain.c
+++ b/tests/test-bdrv-drain.c
@@ -82,6 +82,34 @@ static void aio_ret_cb(void *opaque, int ret)
*aio_ret = ret;
}
+typedef struct CallInCoroutineData {
+ void (*entry)(void);
+ bool done;
+} CallInCoroutineData;
+
+static coroutine_fn void call_in_coroutine_entry(void *opaque)
+{
+ CallInCoroutineData *data = opaque;
+
+ data->entry();
+ data->done = true;
+}
+
+static void call_in_coroutine(void (*entry)(void))
+{
+ Coroutine *co;
+ CallInCoroutineData data = {
+ .entry = entry,
+ .done = false,
+ };
+
+ co = qemu_coroutine_create(call_in_coroutine_entry, &data);
+ qemu_coroutine_enter(co);
+ while (!data.done) {
+ aio_poll(qemu_get_aio_context(), true);
+ }
+}
+
enum drain_type {
BDRV_DRAIN_ALL,
BDRV_DRAIN,
@@ -188,6 +216,16 @@ static void test_drv_cb_drain_subtree(void)
test_drv_cb_common(BDRV_SUBTREE_DRAIN, true);
}
+static void test_drv_cb_co_drain(void)
+{
+ call_in_coroutine(test_drv_cb_drain);
+}
+
+static void test_drv_cb_co_drain_subtree(void)
+{
+ call_in_coroutine(test_drv_cb_drain_subtree);
+}
+
static void test_quiesce_common(enum drain_type drain_type, bool recursive)
{
BlockBackend *blk;
@@ -235,6 +273,16 @@ static void test_quiesce_drain_subtree(void)
test_quiesce_common(BDRV_SUBTREE_DRAIN, true);
}
+static void test_quiesce_co_drain(void)
+{
+ call_in_coroutine(test_quiesce_drain);
+}
+
+static void test_quiesce_co_drain_subtree(void)
+{
+ call_in_coroutine(test_quiesce_drain_subtree);
+}
+
static void test_nested(void)
{
BlockBackend *blk;
@@ -422,11 +470,22 @@ int main(int argc, char **argv)
g_test_add_func("/bdrv-drain/driver-cb/drain_subtree",
test_drv_cb_drain_subtree);
+ // XXX bdrv_drain_all() doesn't work in coroutine context
+ g_test_add_func("/bdrv-drain/driver-cb/co/drain", test_drv_cb_co_drain);
+ g_test_add_func("/bdrv-drain/driver-cb/co/drain_subtree",
+ test_drv_cb_co_drain_subtree);
+
+
g_test_add_func("/bdrv-drain/quiesce/drain_all", test_quiesce_drain_all);
g_test_add_func("/bdrv-drain/quiesce/drain", test_quiesce_drain);
g_test_add_func("/bdrv-drain/quiesce/drain_subtree",
test_quiesce_drain_subtree);
+ // XXX bdrv_drain_all() doesn't work in coroutine context
+ g_test_add_func("/bdrv-drain/quiesce/co/drain", test_quiesce_co_drain);
+ g_test_add_func("/bdrv-drain/quiesce/co/drain_subtree",
+ test_quiesce_co_drain_subtree);
+
g_test_add_func("/bdrv-drain/nested", test_nested);
g_test_add_func("/bdrv-drain/blockjob/drain_all", test_blockjob_drain_all);
--
2.13.6
- [Qemu-block] [PULL v3 17/35] block: Remove unused bdrv_requests_pending, (continued)
- [Qemu-block] [PULL v3 17/35] block: Remove unused bdrv_requests_pending, Kevin Wolf, 2017/12/22
- [Qemu-block] [PULL v3 16/35] block: Mention -drive cyls/heads/secs/trans/serial/addr in deprecation chapter, Kevin Wolf, 2017/12/22
- [Qemu-block] [PULL v3 20/35] test-bdrv-drain: Test callback for bdrv_drain, Kevin Wolf, 2017/12/22
- [Qemu-block] [PULL v3 18/35] block: Assert drain_all is only called from main AioContext, Kevin Wolf, 2017/12/22
- [Qemu-block] [PULL v3 24/35] block: Don't block_job_pause_all() in bdrv_drain_all(), Kevin Wolf, 2017/12/22
- [Qemu-block] [PULL v3 25/35] block: Nested drain_end must still call callbacks, Kevin Wolf, 2017/12/22
- [Qemu-block] [PULL v3 21/35] test-bdrv-drain: Test bs->quiesce_counter, Kevin Wolf, 2017/12/22
- [Qemu-block] [PULL v3 22/35] blockjob: Pause job on draining any job BDS, Kevin Wolf, 2017/12/22
- [Qemu-block] [PULL v3 23/35] test-bdrv-drain: Test drain vs. block jobs, Kevin Wolf, 2017/12/22
- [Qemu-block] [PULL v3 27/35] block: Don't notify parents in drain call chain, Kevin Wolf, 2017/12/22
- [Qemu-block] [PULL v3 30/35] test-bdrv-drain: Test behaviour in coroutine context,
Kevin Wolf <=
- [Qemu-block] [PULL v3 26/35] test-bdrv-drain: Test nested drain sections, Kevin Wolf, 2017/12/22
- [Qemu-block] [PULL v3 28/35] block: Add bdrv_subtree_drained_begin/end(), Kevin Wolf, 2017/12/22
- [Qemu-block] [PULL v3 31/35] test-bdrv-drain: Recursive draining with multiple parents, Kevin Wolf, 2017/12/22
- [Qemu-block] [PULL v3 29/35] test-bdrv-drain: Tests for bdrv_subtree_drain, Kevin Wolf, 2017/12/22
- [Qemu-block] [PULL v3 33/35] test-bdrv-drain: Test graph changes in drained section, Kevin Wolf, 2017/12/22
- [Qemu-block] [PULL v3 35/35] block: Keep nodes drained between reopen_queue/multiple, Kevin Wolf, 2017/12/22
- [Qemu-block] [PULL v3 34/35] commit: Simplify reopen of base, Kevin Wolf, 2017/12/22
- [Qemu-block] [PULL v3 32/35] block: Allow graph changes in subtree drained section, Kevin Wolf, 2017/12/22
- Re: [Qemu-block] [Qemu-devel] [PULL v3 00/35] Block layer patches, no-reply, 2017/12/22