diff options
| author | Fam Zheng <famz@redhat.com> | 2016-02-02 10:12:24 +0800 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2016-02-09 13:52:26 +0000 |
| commit | 794f01414f9f4c4d0c6f1961154674961941c197 (patch) | |
| tree | a2fb49a44557ac1899e2c37c591a4a5e763edea4 /include/block | |
| parent | ad523bca56a7202d2498c550a41be5c986c4d33c (diff) | |
| download | qemu-794f01414f9f4c4d0c6f1961154674961941c197.zip | |
blockjob: Fix hang in block_job_finish_sync
With a mirror job running on a virtio-blk dataplane disk, sending "q" to
HMP will cause a dead loop in block_job_finish_sync.
This is because the aio_poll() only processes the AIO context of bs
which has no more work to do, while the main loop BH that is scheduled
for setting the job->completed flag is never processed.
Fix this by adding a flag in BlockJob structure, to track which context
to poll for the block job to make progress. Its value is set to true
when block_job_coroutine_complete() is called, and is checked in
block_job_finish_sync to determine which context to poll.
Suggested-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
Message-id: 1454379144-29807-1-git-send-email-famz@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'include/block')
| -rw-r--r-- | include/block/blockjob.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/block/blockjob.h b/include/block/blockjob.h index d84ccd8d2c..8bedc4936c 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -130,6 +130,11 @@ struct BlockJob { */ bool ready; + /** + * Set to true when the job has deferred work to the main loop. + */ + bool deferred_to_main_loop; + /** Status that is published by the query-block-jobs QMP API */ BlockDeviceIoStatus iostatus; |