Blame SOURCES/kvm-linux-aio-explain-why-max-batch-is-checked-in-laio_i.patch

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