yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-test-bdrv-drain-Test-nested-poll-in-bdrv_drain_poll_.patch

26ba25
From ad9c7d63179e24afa5357ada56fccaeab10545c7 Mon Sep 17 00:00:00 2001
26ba25
From: Kevin Wolf <kwolf@redhat.com>
26ba25
Date: Wed, 10 Oct 2018 20:22:08 +0100
26ba25
Subject: [PATCH 42/49] test-bdrv-drain: Test nested poll in
26ba25
 bdrv_drain_poll_top_level()
26ba25
26ba25
RH-Author: Kevin Wolf <kwolf@redhat.com>
26ba25
Message-id: <20181010202213.7372-30-kwolf@redhat.com>
26ba25
Patchwork-id: 82618
26ba25
O-Subject: [RHEL-8 qemu-kvm PATCH 39/44] test-bdrv-drain: Test nested poll in bdrv_drain_poll_top_level()
26ba25
Bugzilla: 1637976
26ba25
RH-Acked-by: Max Reitz <mreitz@redhat.com>
26ba25
RH-Acked-by: John Snow <jsnow@redhat.com>
26ba25
RH-Acked-by: Thomas Huth <thuth@redhat.com>
26ba25
26ba25
This is a regression test for a deadlock that could occur in callbacks
26ba25
called from the aio_poll() in bdrv_drain_poll_top_level(). The
26ba25
AioContext lock wasn't released and therefore would be taken a second
26ba25
time in the callback. This would cause a possible AIO_WAIT_WHILE() in
26ba25
the callback to hang.
26ba25
26ba25
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
26ba25
Reviewed-by: Fam Zheng <famz@redhat.com>
26ba25
(cherry picked from commit ecc1a5c790cf2c7732cb9755ca388c2fe108d1a1)
26ba25
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
26ba25
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
26ba25
---
26ba25
 tests/test-bdrv-drain.c | 13 +++++++++++++
26ba25
 1 file changed, 13 insertions(+)
26ba25
26ba25
diff --git a/tests/test-bdrv-drain.c b/tests/test-bdrv-drain.c
26ba25
index 05f3b55..f4b57f7 100644
26ba25
--- a/tests/test-bdrv-drain.c
26ba25
+++ b/tests/test-bdrv-drain.c
26ba25
@@ -636,6 +636,17 @@ static void test_iothread_aio_cb(void *opaque, int ret)
26ba25
     qemu_event_set(&done_event);
26ba25
 }
26ba25
 
26ba25
+static void test_iothread_main_thread_bh(void *opaque)
26ba25
+{
26ba25
+    struct test_iothread_data *data = opaque;
26ba25
+
26ba25
+    /* Test that the AioContext is not yet locked in a random BH that is
26ba25
+     * executed during drain, otherwise this would deadlock. */
26ba25
+    aio_context_acquire(bdrv_get_aio_context(data->bs));
26ba25
+    bdrv_flush(data->bs);
26ba25
+    aio_context_release(bdrv_get_aio_context(data->bs));
26ba25
+}
26ba25
+
26ba25
 /*
26ba25
  * Starts an AIO request on a BDS that runs in the AioContext of iothread 1.
26ba25
  * The request involves a BH on iothread 2 before it can complete.
26ba25
@@ -705,6 +716,8 @@ static void test_iothread_common(enum drain_type drain_type, int drain_thread)
26ba25
             aio_context_acquire(ctx_a);
26ba25
         }
26ba25
 
26ba25
+        aio_bh_schedule_oneshot(ctx_a, test_iothread_main_thread_bh, &data);
26ba25
+
26ba25
         /* The request is running on the IOThread a. Draining its block device
26ba25
          * will make sure that it has completed as far as the BDS is concerned,
26ba25
          * but the drain in this thread can continue immediately after
26ba25
-- 
26ba25
1.8.3.1
26ba25