50 lines
1.9 KiB
Diff
50 lines
1.9 KiB
Diff
From 286d9e4512a3b7ab6e2a1ce6b4a872e5defb0ffe Mon Sep 17 00:00:00 2001
|
|
From: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Date: Thu, 9 Jun 2022 17:47:12 +0100
|
|
Subject: [PATCH 2/2] linux-aio: explain why max batch is checked in
|
|
laio_io_unplug()
|
|
|
|
RH-Author: Stefan Hajnoczi <stefanha@redhat.com>
|
|
RH-MergeRequest: 209: linux-aio: fix unbalanced plugged counter in laio_io_unplug()
|
|
RH-Commit: [2/2] c6194a9929e7e3807c5402b5364ab9dc2edf420c
|
|
RH-Bugzilla: 2109570
|
|
RH-Acked-by: Hanna Reitz <hreitz@redhat.com>
|
|
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
|
|
|
|
It may not be obvious why laio_io_unplug() checks max batch. I discussed
|
|
this with Stefano and have added a comment summarizing the reason.
|
|
|
|
Cc: Stefano Garzarella <sgarzare@redhat.com>
|
|
Cc: Kevin Wolf <kwolf@redhat.com>
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
|
|
Message-id: 20220609164712.1539045-3-stefanha@redhat.com
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
(cherry picked from commit 99b969fbe105117f5af6060d3afef40ca39cc9c1)
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
---
|
|
block/linux-aio.c | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/block/linux-aio.c b/block/linux-aio.c
|
|
index 77f17ad596..85650c4222 100644
|
|
--- a/block/linux-aio.c
|
|
+++ b/block/linux-aio.c
|
|
@@ -362,6 +362,12 @@ void laio_io_unplug(BlockDriverState *bs, LinuxAioState *s,
|
|
assert(s->io_q.plugged);
|
|
s->io_q.plugged--;
|
|
|
|
+ /*
|
|
+ * Why max batch checking is performed here:
|
|
+ * Another BDS may have queued requests with a higher dev_max_batch and
|
|
+ * therefore in_queue could now exceed our dev_max_batch. Re-check the max
|
|
+ * batch so we can honor our device's dev_max_batch.
|
|
+ */
|
|
if (s->io_q.in_queue >= laio_max_batch(s, dev_max_batch) ||
|
|
(!s->io_q.plugged &&
|
|
!s->io_q.blocked && !QSIMPLEQ_EMPTY(&s->io_q.pending))) {
|
|
--
|
|
2.35.3
|
|
|