From ccb9dc10129954d0bcd7814298ed445e684d5a2a Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Fri, 28 Nov 2014 15:23:12 +0100 Subject: linux-aio: Cancel BH if not needed linux-aio uses a BH in order to make sure that the remaining completions are processed even in nested event loops of completion callbacks in order to avoid deadlocks. There is no need, however, to have the BH overhead for the first call into qemu_laio_completion_bh() or after all pending completions have already been processed. Therefore, this patch calls directly into qemu_laio_completion_bh() in qemu_laio_completion_cb() and cancels the BH after qemu_laio_completion_bh() has processed all pending completions. Signed-off-by: Kevin Wolf Reviewed-by: Paolo Bonzini --- block/linux-aio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'block/linux-aio.c') diff --git a/block/linux-aio.c b/block/linux-aio.c index fe7cece415..e468960146 100644 --- a/block/linux-aio.c +++ b/block/linux-aio.c @@ -149,6 +149,8 @@ static void qemu_laio_completion_bh(void *opaque) if (!s->io_q.plugged && !QSIMPLEQ_EMPTY(&s->io_q.pending)) { ioq_submit(s); } + + qemu_bh_cancel(s->completion_bh); } static void qemu_laio_completion_cb(EventNotifier *e) @@ -156,7 +158,7 @@ static void qemu_laio_completion_cb(EventNotifier *e) LinuxAioState *s = container_of(e, LinuxAioState, e); if (event_notifier_test_and_clear(&s->e)) { - qemu_bh_schedule(s->completion_bh); + qemu_laio_completion_bh(s); } } -- cgit v1.2.3