From 84935bf2482b06b983ccdb953b2cc90960d2ab16 Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Tue, 9 Oct 2018 08:16:47 +0100 Subject: [PATCH 03/17] aio-posix: Don't count ctx->notifier as progress when polling RH-Author: Fam Zheng Message-id: <20181009081651.15463-2-famz@redhat.com> Patchwork-id: 82454 O-Subject: [RHEL8/rhel qemu-kvm PATCH 1/5] aio-posix: Don't count ctx->notifier as progress when polling Bugzilla: 1623085 RH-Acked-by: Thomas Huth RH-Acked-by: Stefan Hajnoczi RH-Acked-by: Danilo de Paula BZ: 1623085 The same logic exists in fd polling. This change is especially important to avoid busy loop once we limit aio_notify_accept() to blocking aio_poll(). Cc: qemu-stable@nongnu.org Signed-off-by: Fam Zheng Message-Id: <20180809132259.18402-2-famz@redhat.com> Signed-off-by: Fam Zheng (cherry picked from commit 70232b5253a3c4e03ed1ac47ef9246a8ac66c6fa) Signed-off-by: Fam Zheng Signed-off-by: Danilo C. L. de Paula --- util/aio-posix.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/util/aio-posix.c b/util/aio-posix.c index d8f0cb4..f650c7c 100644 --- a/util/aio-posix.c +++ b/util/aio-posix.c @@ -494,7 +494,8 @@ static bool run_poll_handlers_once(AioContext *ctx) QLIST_FOREACH_RCU(node, &ctx->aio_handlers, node) { if (!node->deleted && node->io_poll && aio_node_check(ctx, node->is_external) && - node->io_poll(node->opaque)) { + node->io_poll(node->opaque) && + node->opaque != &ctx->notifier) { progress = true; } -- 1.8.3.1