yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-virtio-blk-On-restart-process-queued-requests-in-the.patch

902636
From fdd1f3bf672ad8bb0a6db896ec8cbc797c31da1f Mon Sep 17 00:00:00 2001
902636
From: Sergio Lopez Pascual <slp@redhat.com>
902636
Date: Wed, 24 Jun 2020 13:24:53 -0400
902636
Subject: [PATCH 11/12] virtio-blk: On restart, process queued requests in the
902636
 proper context
902636
902636
RH-Author: Sergio Lopez Pascual <slp@redhat.com>
902636
Message-id: <20200624132453.111276-3-slp@redhat.com>
902636
Patchwork-id: 97798
902636
O-Subject: [RHEL-AV-8.2.1 qemu-kvm PATCH 2/2] virtio-blk: On restart, process queued requests in the proper context
902636
Bugzilla:
902636
RH-Acked-by: John Snow <jsnow@redhat.com>
902636
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
902636
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
902636
902636
On restart, we were scheduling a BH to process queued requests, which
902636
would run before starting up the data plane, leading to those requests
902636
being assigned and started on coroutines on the main context.
902636
902636
This could cause requests to be wrongly processed in parallel from
902636
different threads (the main thread and the iothread managing the data
902636
plane), potentially leading to multiple issues.
902636
902636
For example, stopping and resuming a VM multiple times while the guest
902636
is generating I/O on a virtio_blk device can trigger a crash with a
902636
stack tracing looking like this one:
902636
902636
<------>
902636
 Thread 2 (Thread 0x7ff736765700 (LWP 1062503)):
902636
 #0  0x00005567a13b99d6 in iov_memset
902636
     (iov=0x6563617073206f4e, iov_cnt=1717922848, offset=516096, fillc=0, bytes=7018105756081554803)
902636
     at util/iov.c:69
902636
 #1  0x00005567a13bab73 in qemu_iovec_memset
902636
     (qiov=0x7ff73ec99748, offset=516096, fillc=0, bytes=7018105756081554803) at util/iov.c:530
902636
 #2  0x00005567a12f411c in qemu_laio_process_completion (laiocb=0x7ff6512ee6c0) at block/linux-aio.c:86
902636
 #3  0x00005567a12f42ff in qemu_laio_process_completions (s=0x7ff7182e8420) at block/linux-aio.c:217
902636
 #4  0x00005567a12f480d in ioq_submit (s=0x7ff7182e8420) at block/linux-aio.c:323
902636
 #5  0x00005567a12f43d9 in qemu_laio_process_completions_and_submit (s=0x7ff7182e8420)
902636
     at block/linux-aio.c:236
902636
 #6  0x00005567a12f44c2 in qemu_laio_poll_cb (opaque=0x7ff7182e8430) at block/linux-aio.c:267
902636
 #7  0x00005567a13aed83 in run_poll_handlers_once (ctx=0x5567a2b58c70, timeout=0x7ff7367645f8)
902636
     at util/aio-posix.c:520
902636
 #8  0x00005567a13aee9f in run_poll_handlers (ctx=0x5567a2b58c70, max_ns=16000, timeout=0x7ff7367645f8)
902636
     at util/aio-posix.c:562
902636
 #9  0x00005567a13aefde in try_poll_mode (ctx=0x5567a2b58c70, timeout=0x7ff7367645f8)
902636
     at util/aio-posix.c:597
902636
 #10 0x00005567a13af115 in aio_poll (ctx=0x5567a2b58c70, blocking=true) at util/aio-posix.c:639
902636
 #11 0x00005567a109acca in iothread_run (opaque=0x5567a2b29760) at iothread.c:75
902636
 #12 0x00005567a13b2790 in qemu_thread_start (args=0x5567a2b694c0) at util/qemu-thread-posix.c:519
902636
 #13 0x00007ff73eedf2de in start_thread () at /lib64/libpthread.so.0
902636
 #14 0x00007ff73ec10e83 in clone () at /lib64/libc.so.6
902636
902636
 Thread 1 (Thread 0x7ff743986f00 (LWP 1062500)):
902636
 #0  0x00005567a13b99d6 in iov_memset
902636
     (iov=0x6563617073206f4e, iov_cnt=1717922848, offset=516096, fillc=0, bytes=7018105756081554803)
902636
     at util/iov.c:69
902636
 #1  0x00005567a13bab73 in qemu_iovec_memset
902636
     (qiov=0x7ff73ec99748, offset=516096, fillc=0, bytes=7018105756081554803) at util/iov.c:530
902636
 #2  0x00005567a12f411c in qemu_laio_process_completion (laiocb=0x7ff6512ee6c0) at block/linux-aio.c:86
902636
 #3  0x00005567a12f42ff in qemu_laio_process_completions (s=0x7ff7182e8420) at block/linux-aio.c:217
902636
 #4  0x00005567a12f480d in ioq_submit (s=0x7ff7182e8420) at block/linux-aio.c:323
902636
 #5  0x00005567a12f4a2f in laio_do_submit (fd=19, laiocb=0x7ff5f4ff9ae0, offset=472363008, type=2)
902636
     at block/linux-aio.c:375
902636
 #6  0x00005567a12f4af2 in laio_co_submit
902636
     (bs=0x5567a2b8c460, s=0x7ff7182e8420, fd=19, offset=472363008, qiov=0x7ff5f4ff9ca0, type=2)
902636
     at block/linux-aio.c:394
902636
 #7  0x00005567a12f1803 in raw_co_prw
902636
     (bs=0x5567a2b8c460, offset=472363008, bytes=20480, qiov=0x7ff5f4ff9ca0, type=2)
902636
     at block/file-posix.c:1892
902636
 #8  0x00005567a12f1941 in raw_co_pwritev
902636
     (bs=0x5567a2b8c460, offset=472363008, bytes=20480, qiov=0x7ff5f4ff9ca0, flags=0)
902636
     at block/file-posix.c:1925
902636
 #9  0x00005567a12fe3e1 in bdrv_driver_pwritev
902636
     (bs=0x5567a2b8c460, offset=472363008, bytes=20480, qiov=0x7ff5f4ff9ca0, qiov_offset=0, flags=0)
902636
     at block/io.c:1183
902636
 #10 0x00005567a1300340 in bdrv_aligned_pwritev
902636
     (child=0x5567a2b5b070, req=0x7ff5f4ff9db0, offset=472363008, bytes=20480, align=512, qiov=0x7ff72c0425b8, qiov_offset=0, flags=0) at block/io.c:1980
902636
 #11 0x00005567a1300b29 in bdrv_co_pwritev_part
902636
     (child=0x5567a2b5b070, offset=472363008, bytes=20480, qiov=0x7ff72c0425b8, qiov_offset=0, flags=0)
902636
     at block/io.c:2137
902636
 #12 0x00005567a12baba1 in qcow2_co_pwritev_task
902636
     (bs=0x5567a2b92740, file_cluster_offset=472317952, offset=487305216, bytes=20480, qiov=0x7ff72c0425b8, qiov_offset=0, l2meta=0x0) at block/qcow2.c:2444
902636
 #13 0x00005567a12bacdb in qcow2_co_pwritev_task_entry (task=0x5567a2b48540) at block/qcow2.c:2475
902636
 #14 0x00005567a13167d8 in aio_task_co (opaque=0x5567a2b48540) at block/aio_task.c:45
902636
 #15 0x00005567a13cf00c in coroutine_trampoline (i0=738245600, i1=32759) at util/coroutine-ucontext.c:115
902636
 #16 0x00007ff73eb622e0 in __start_context () at /lib64/libc.so.6
902636
 #17 0x00007ff6626f1350 in  ()
902636
 #18 0x0000000000000000 in  ()
902636
<------>
902636
902636
This is also known to cause crashes with this message (assertion
902636
failed):
902636
902636
 aio_co_schedule: Co-routine was already scheduled in 'aio_co_schedule'
902636
902636
RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1812765
902636
Signed-off-by: Sergio Lopez <slp@redhat.com>
902636
Message-Id: <20200603093240.40489-3-slp@redhat.com>
902636
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
902636
(cherry picked from commit 49b44549ace7890fffdf027fd3695218ee7f1121)
902636
Signed-off-by: Sergio Lopez <slp@redhat.com>
902636
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
902636
---
902636
 hw/block/dataplane/virtio-blk.c |  8 ++++++++
902636
 hw/block/virtio-blk.c           | 18 ++++++++++++------
902636
 include/hw/virtio/virtio-blk.h  |  2 +-
902636
 3 files changed, 21 insertions(+), 7 deletions(-)
902636
902636
diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c
902636
index 119906a5fe..ac495fd72a 100644
902636
--- a/hw/block/dataplane/virtio-blk.c
902636
+++ b/hw/block/dataplane/virtio-blk.c
902636
@@ -220,6 +220,9 @@ int virtio_blk_data_plane_start(VirtIODevice *vdev)
902636
         goto fail_guest_notifiers;
902636
     }
902636
 
902636
+    /* Process queued requests before the ones in vring */
902636
+    virtio_blk_process_queued_requests(vblk, false);
902636
+
902636
     /* Kick right away to begin processing requests already in vring */
902636
     for (i = 0; i < nvqs; i++) {
902636
         VirtQueue *vq = virtio_get_queue(s->vdev, i);
902636
@@ -239,6 +242,11 @@ int virtio_blk_data_plane_start(VirtIODevice *vdev)
902636
     return 0;
902636
 
902636
   fail_guest_notifiers:
902636
+    /*
902636
+     * If we failed to set up the guest notifiers queued requests will be
902636
+     * processed on the main context.
902636
+     */
902636
+    virtio_blk_process_queued_requests(vblk, false);
902636
     vblk->dataplane_disabled = true;
902636
     s->starting = false;
902636
     vblk->dataplane_started = true;
902636
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
902636
index 6ff29a05d6..493a263fa6 100644
902636
--- a/hw/block/virtio-blk.c
902636
+++ b/hw/block/virtio-blk.c
902636
@@ -819,7 +819,7 @@ static void virtio_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq)
902636
     virtio_blk_handle_output_do(s, vq);
902636
 }
902636
 
902636
-void virtio_blk_process_queued_requests(VirtIOBlock *s)
902636
+void virtio_blk_process_queued_requests(VirtIOBlock *s, bool is_bh)
902636
 {
902636
     VirtIOBlockReq *req = s->rq;
902636
     MultiReqBuffer mrb = {};
902636
@@ -847,7 +847,9 @@ void virtio_blk_process_queued_requests(VirtIOBlock *s)
902636
     if (mrb.num_reqs) {
902636
         virtio_blk_submit_multireq(s->blk, &mrb);
902636
     }
902636
-    blk_dec_in_flight(s->conf.conf.blk);
902636
+    if (is_bh) {
902636
+        blk_dec_in_flight(s->conf.conf.blk);
902636
+    }
902636
     aio_context_release(blk_get_aio_context(s->conf.conf.blk));
902636
 }
902636
 
902636
@@ -858,21 +860,25 @@ static void virtio_blk_dma_restart_bh(void *opaque)
902636
     qemu_bh_delete(s->bh);
902636
     s->bh = NULL;
902636
 
902636
-    virtio_blk_process_queued_requests(s);
902636
+    virtio_blk_process_queued_requests(s, true);
902636
 }
902636
 
902636
 static void virtio_blk_dma_restart_cb(void *opaque, int running,
902636
                                       RunState state)
902636
 {
902636
     VirtIOBlock *s = opaque;
902636
+    BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(s)));
902636
+    VirtioBusState *bus = VIRTIO_BUS(qbus);
902636
 
902636
     if (!running) {
902636
         return;
902636
     }
902636
 
902636
-    if (!s->bh) {
902636
-        /* FIXME The data plane is not started yet, so these requests are
902636
-         * processed in the main thread. */
902636
+    /*
902636
+     * If ioeventfd is enabled, don't schedule the BH here as queued
902636
+     * requests will be processed while starting the data plane.
902636
+     */
902636
+    if (!s->bh && !virtio_bus_ioeventfd_enabled(bus)) {
902636
         s->bh = aio_bh_new(blk_get_aio_context(s->conf.conf.blk),
902636
                            virtio_blk_dma_restart_bh, s);
902636
         blk_inc_in_flight(s->conf.conf.blk);
902636
diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-blk.h
902636
index cf8eea2f58..e77f0db3b0 100644
902636
--- a/include/hw/virtio/virtio-blk.h
902636
+++ b/include/hw/virtio/virtio-blk.h
902636
@@ -84,6 +84,6 @@ typedef struct MultiReqBuffer {
902636
 } MultiReqBuffer;
902636
 
902636
 bool virtio_blk_handle_vq(VirtIOBlock *s, VirtQueue *vq);
902636
-void virtio_blk_process_queued_requests(VirtIOBlock *s);
902636
+void virtio_blk_process_queued_requests(VirtIOBlock *s, bool is_bh);
902636
 
902636
 #endif
902636
-- 
902636
2.27.0
902636