test-bdrv-drain: Test AIO_WAIT_WHILE() in completion callback
This is a regression test for a deadlock that occurred in block job completion callbacks (via job_defer_to_main_loop) because the AioContext lock was taken twice: once in job_finish_sync() and then again in job_defer_to_main_loop_bh(). This would cause AIO_WAIT_WHILE() to hang. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Fam Zheng <famz@redhat.com>
This commit is contained in:
parent
de0fbe6480
commit
ae23dde9dd
|
@ -774,6 +774,15 @@ typedef struct TestBlockJob {
|
|||
bool should_complete;
|
||||
} TestBlockJob;
|
||||
|
||||
static int test_job_prepare(Job *job)
|
||||
{
|
||||
TestBlockJob *s = container_of(job, TestBlockJob, common.job);
|
||||
|
||||
/* Provoke an AIO_WAIT_WHILE() call to verify there is no deadlock */
|
||||
blk_flush(s->common.blk);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int coroutine_fn test_job_run(Job *job, Error **errp)
|
||||
{
|
||||
TestBlockJob *s = container_of(job, TestBlockJob, common.job);
|
||||
|
@ -804,6 +813,7 @@ BlockJobDriver test_job_driver = {
|
|||
.drain = block_job_drain,
|
||||
.run = test_job_run,
|
||||
.complete = test_job_complete,
|
||||
.prepare = test_job_prepare,
|
||||
},
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue