]> git.proxmox.com Git - mirror_qemu.git/commit
blockjob: avoid recursive AioContext locking
authorPaolo Bonzini <pbonzini@redhat.com>
Tue, 21 Mar 2017 17:48:10 +0000 (18:48 +0100)
committerJeff Cody <jcody@redhat.com>
Wed, 22 Mar 2017 17:26:27 +0000 (13:26 -0400)
commitd79df2a2ceb3cb0771146587e9a4bfb312577f46
tree49f7d6c7fed8b3f0526ee19cb3c523c897d92d48
parent55a19ad8b2d0797e3a8fe90ab99a9bb713824059
blockjob: avoid recursive AioContext locking

Streaming or any other block job hangs when performed on a block device
that has a non-default iothread.  This happens because the AioContext
is acquired twice by block_job_defer_to_main_loop_bh and then released
only once by BDRV_POLL_WHILE.  (Insert rants on recursive mutexes, which
unfortunately are a temporary but necessary evil for iothreads at the
moment).

Luckily, the reason for the double acquisition is simple; the function
acquires the AioContext for both the job iothread and the BDS iothread,
in case the BDS iothread was changed while the job was running.  It
is therefore enough to skip the second acquisition when the two
AioContexts are one and the same.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Message-id: 1490118490-5597-1-git-send-email-pbonzini@redhat.com
Signed-off-by: Jeff Cody <jcody@redhat.com>
blockjob.c