|
 |
1bdc94 |
From c6dae9ed2996e40bfdcf6c680bd481c43182fb3d Mon Sep 17 00:00:00 2001
|
|
|
1bdc94 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
Date: Fri, 14 Sep 2018 10:55:30 +0200
|
|
|
1bdc94 |
Subject: [PATCH 39/49] test-bdrv-drain: Test AIO_WAIT_WHILE() in completion
|
|
|
1bdc94 |
callback
|
|
|
1bdc94 |
|
|
|
1bdc94 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
Message-id: <20180914105540.18077-33-kwolf@redhat.com>
|
|
|
1bdc94 |
Patchwork-id: 82181
|
|
|
1bdc94 |
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH 32/42] test-bdrv-drain: Test AIO_WAIT_WHILE() in completion callback
|
|
|
1bdc94 |
Bugzilla: 1601212
|
|
|
1bdc94 |
RH-Acked-by: John Snow <jsnow@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
This is a regression test for a deadlock that occurred in block job
|
|
|
1bdc94 |
completion callbacks (via job_defer_to_main_loop) because the AioContext
|
|
|
1bdc94 |
lock was taken twice: once in job_finish_sync() and then again in
|
|
|
1bdc94 |
job_defer_to_main_loop_bh(). This would cause AIO_WAIT_WHILE() to hang.
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
Reviewed-by: Fam Zheng <famz@redhat.com>
|
|
|
1bdc94 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
1bdc94 |
---
|
|
|
1bdc94 |
tests/test-bdrv-drain.c | 10 ++++++++++
|
|
|
1bdc94 |
1 file changed, 10 insertions(+)
|
|
|
1bdc94 |
|
|
|
1bdc94 |
diff --git a/tests/test-bdrv-drain.c b/tests/test-bdrv-drain.c
|
|
|
1bdc94 |
index 3cf3ba3..05f3b55 100644
|
|
|
1bdc94 |
--- a/tests/test-bdrv-drain.c
|
|
|
1bdc94 |
+++ b/tests/test-bdrv-drain.c
|
|
|
1bdc94 |
@@ -774,6 +774,15 @@ typedef struct TestBlockJob {
|
|
|
1bdc94 |
bool should_complete;
|
|
|
1bdc94 |
} TestBlockJob;
|
|
|
1bdc94 |
|
|
|
1bdc94 |
+static int test_job_prepare(Job *job)
|
|
|
1bdc94 |
+{
|
|
|
1bdc94 |
+ TestBlockJob *s = container_of(job, TestBlockJob, common.job);
|
|
|
1bdc94 |
+
|
|
|
1bdc94 |
+ /* Provoke an AIO_WAIT_WHILE() call to verify there is no deadlock */
|
|
|
1bdc94 |
+ blk_flush(s->common.blk);
|
|
|
1bdc94 |
+ return 0;
|
|
|
1bdc94 |
+}
|
|
|
1bdc94 |
+
|
|
|
1bdc94 |
static int coroutine_fn test_job_run(Job *job, Error **errp)
|
|
|
1bdc94 |
{
|
|
|
1bdc94 |
TestBlockJob *s = container_of(job, TestBlockJob, common.job);
|
|
|
1bdc94 |
@@ -804,6 +813,7 @@ BlockJobDriver test_job_driver = {
|
|
|
1bdc94 |
.drain = block_job_drain,
|
|
|
1bdc94 |
.run = test_job_run,
|
|
|
1bdc94 |
.complete = test_job_complete,
|
|
|
1bdc94 |
+ .prepare = test_job_prepare,
|
|
|
1bdc94 |
},
|
|
|
1bdc94 |
};
|
|
|
1bdc94 |
|
|
|
1bdc94 |
--
|
|
|
1bdc94 |
1.8.3.1
|
|
|
1bdc94 |
|