|
 |
f66865 |
From 4b4fb1cccb8e0307658cee3bc90c77e5f1dde60a Mon Sep 17 00:00:00 2001
|
|
|
f66865 |
From: Thomas Huth <thuth@redhat.com>
|
|
|
f66865 |
Date: Fri, 9 Oct 2020 10:08:49 -0400
|
|
|
f66865 |
Subject: [PATCH 13/14] aio-posix: completely stop polling when disabled
|
|
|
f66865 |
|
|
|
f66865 |
RH-Author: Thomas Huth <thuth@redhat.com>
|
|
|
f66865 |
Message-id: <20201009100849.264994-10-thuth@redhat.com>
|
|
|
f66865 |
Patchwork-id: 98603
|
|
|
f66865 |
O-Subject: [RHEL-8.4.0 qemu-kvm PATCH 9/9] aio-posix: completely stop polling when disabled
|
|
|
f66865 |
Bugzilla: 1846975
|
|
|
f66865 |
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
|
|
|
f66865 |
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
|
f66865 |
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
f66865 |
|
|
|
f66865 |
From: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
f66865 |
|
|
|
f66865 |
One iteration of polling is always performed even when polling is
|
|
|
f66865 |
disabled. This is done because:
|
|
|
f66865 |
1. Userspace polling is cheaper than making a syscall. We might get
|
|
|
f66865 |
lucky.
|
|
|
f66865 |
2. We must poll once more after polling has stopped in case an event
|
|
|
f66865 |
occurred while stopping polling.
|
|
|
f66865 |
|
|
|
f66865 |
However, there are downsides:
|
|
|
f66865 |
1. Polling becomes a bottleneck when the number of event sources is very
|
|
|
f66865 |
high. It's more efficient to monitor fds in that case.
|
|
|
f66865 |
2. A high-frequency polling event source can starve non-polling event
|
|
|
f66865 |
sources because ppoll(2)/epoll(7) is never invoked.
|
|
|
f66865 |
|
|
|
f66865 |
This patch removes the forced polling iteration so that poll_ns=0 really
|
|
|
f66865 |
means no polling.
|
|
|
f66865 |
|
|
|
f66865 |
IOPS increases from 10k to 60k when the guest has 100
|
|
|
f66865 |
virtio-blk-pci,num-queues=32 devices and 1 virtio-blk-pci,num-queues=1
|
|
|
f66865 |
device because the large number of event sources being polled slows down
|
|
|
f66865 |
the event loop.
|
|
|
f66865 |
|
|
|
f66865 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
f66865 |
Link: https://lore.kernel.org/r/20200305170806.1313245-2-stefanha@redhat.com
|
|
|
f66865 |
Message-Id: <20200305170806.1313245-2-stefanha@redhat.com>
|
|
|
f66865 |
(cherry picked from commit e4346192f1c2e1683a807b46efac47ef0cf9b545)
|
|
|
f66865 |
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
|
f66865 |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
f66865 |
---
|
|
|
f66865 |
util/aio-posix.c | 22 +++++++++++++++-------
|
|
|
f66865 |
1 file changed, 15 insertions(+), 7 deletions(-)
|
|
|
f66865 |
|
|
|
f66865 |
diff --git a/util/aio-posix.c b/util/aio-posix.c
|
|
|
f66865 |
index a4977f538e..abc396d030 100644
|
|
|
f66865 |
--- a/util/aio-posix.c
|
|
|
f66865 |
+++ b/util/aio-posix.c
|
|
|
f66865 |
@@ -340,12 +340,13 @@ void aio_set_event_notifier_poll(AioContext *ctx,
|
|
|
f66865 |
(IOHandler *)io_poll_end);
|
|
|
f66865 |
}
|
|
|
f66865 |
|
|
|
f66865 |
-static void poll_set_started(AioContext *ctx, bool started)
|
|
|
f66865 |
+static bool poll_set_started(AioContext *ctx, bool started)
|
|
|
f66865 |
{
|
|
|
f66865 |
AioHandler *node;
|
|
|
f66865 |
+ bool progress = false;
|
|
|
f66865 |
|
|
|
f66865 |
if (started == ctx->poll_started) {
|
|
|
f66865 |
- return;
|
|
|
f66865 |
+ return false;
|
|
|
f66865 |
}
|
|
|
f66865 |
|
|
|
f66865 |
ctx->poll_started = started;
|
|
|
f66865 |
@@ -367,8 +368,15 @@ static void poll_set_started(AioContext *ctx, bool started)
|
|
|
f66865 |
if (fn) {
|
|
|
f66865 |
fn(node->opaque);
|
|
|
f66865 |
}
|
|
|
f66865 |
+
|
|
|
f66865 |
+ /* Poll one last time in case ->io_poll_end() raced with the event */
|
|
|
f66865 |
+ if (!started) {
|
|
|
f66865 |
+ progress = node->io_poll(node->opaque) || progress;
|
|
|
f66865 |
+ }
|
|
|
f66865 |
}
|
|
|
f66865 |
qemu_lockcnt_dec(&ctx->list_lock);
|
|
|
f66865 |
+
|
|
|
f66865 |
+ return progress;
|
|
|
f66865 |
}
|
|
|
f66865 |
|
|
|
f66865 |
|
|
|
f66865 |
@@ -599,12 +607,12 @@ static bool try_poll_mode(AioContext *ctx, int64_t *timeout)
|
|
|
f66865 |
}
|
|
|
f66865 |
}
|
|
|
f66865 |
|
|
|
f66865 |
- poll_set_started(ctx, false);
|
|
|
f66865 |
+ if (poll_set_started(ctx, false)) {
|
|
|
f66865 |
+ *timeout = 0;
|
|
|
f66865 |
+ return true;
|
|
|
f66865 |
+ }
|
|
|
f66865 |
|
|
|
f66865 |
- /* Even if we don't run busy polling, try polling once in case it can make
|
|
|
f66865 |
- * progress and the caller will be able to avoid ppoll(2)/epoll_wait(2).
|
|
|
f66865 |
- */
|
|
|
f66865 |
- return run_poll_handlers_once(ctx, timeout);
|
|
|
f66865 |
+ return false;
|
|
|
f66865 |
}
|
|
|
f66865 |
|
|
|
f66865 |
bool aio_poll(AioContext *ctx, bool blocking)
|
|
|
f66865 |
--
|
|
|
f66865 |
2.27.0
|
|
|
f66865 |
|