|
 |
9bac43 |
From 5ca7635b41a142a709364412fb367c23ac169a21 Mon Sep 17 00:00:00 2001
|
|
|
9bac43 |
From: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9bac43 |
Date: Fri, 22 Dec 2017 11:08:48 +0100
|
|
|
9bac43 |
Subject: [PATCH 30/42] aio: fix assert when remove poll during destroy
|
|
|
9bac43 |
|
|
|
9bac43 |
RH-Author: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9bac43 |
Message-id: <20171222110900.24813-9-stefanha@redhat.com>
|
|
|
9bac43 |
Patchwork-id: 78491
|
|
|
9bac43 |
O-Subject: [RHV7.5 qemu-kvm-rhev PATCH 08/20] aio: fix assert when remove poll during destroy
|
|
|
9bac43 |
Bugzilla: 1519721
|
|
|
9bac43 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
After iothread is enabled internally inside QEMU with GMainContext, we
|
|
|
9bac43 |
may encounter this warning when destroying the iothread:
|
|
|
9bac43 |
|
|
|
9bac43 |
(qemu-system-x86_64:19925): GLib-CRITICAL **: g_source_remove_poll:
|
|
|
9bac43 |
assertion '!SOURCE_DESTROYED (source)' failed
|
|
|
9bac43 |
|
|
|
9bac43 |
The problem is that g_source_remove_poll() does not allow to remove one
|
|
|
9bac43 |
source from array if the source is detached from its owner
|
|
|
9bac43 |
context. (peterx: which IMHO does not make much sense)
|
|
|
9bac43 |
|
|
|
9bac43 |
Fix it on QEMU side by avoid calling g_source_remove_poll() if we know
|
|
|
9bac43 |
the object is during destruction, and we won't leak anything after all
|
|
|
9bac43 |
since the array will be gone soon cleanly even with that fd.
|
|
|
9bac43 |
|
|
|
9bac43 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9bac43 |
Reviewed-by: Fam Zheng <famz@redhat.com>
|
|
|
9bac43 |
Signed-off-by: Peter Xu <peterx@redhat.com>
|
|
|
9bac43 |
Message-id: 20170928025958.1420-6-peterx@redhat.com
|
|
|
9bac43 |
[peterx: write the commit message]
|
|
|
9bac43 |
Signed-off-by: Peter Xu <peterx@redhat.com>
|
|
|
9bac43 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9bac43 |
(cherry picked from commit f708a5e71cba0d784e307334c07ade5f56f827ab)
|
|
|
9bac43 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
---
|
|
|
9bac43 |
util/aio-posix.c | 9 ++++++++-
|
|
|
9bac43 |
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
|
9bac43 |
|
|
|
9bac43 |
diff --git a/util/aio-posix.c b/util/aio-posix.c
|
|
|
9bac43 |
index 2d51239..5946ac0 100644
|
|
|
9bac43 |
--- a/util/aio-posix.c
|
|
|
9bac43 |
+++ b/util/aio-posix.c
|
|
|
9bac43 |
@@ -223,7 +223,14 @@ void aio_set_fd_handler(AioContext *ctx,
|
|
|
9bac43 |
return;
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
- g_source_remove_poll(&ctx->source, &node->pfd);
|
|
|
9bac43 |
+ /* If the GSource is in the process of being destroyed then
|
|
|
9bac43 |
+ * g_source_remove_poll() causes an assertion failure. Skip
|
|
|
9bac43 |
+ * removal in that case, because glib cleans up its state during
|
|
|
9bac43 |
+ * destruction anyway.
|
|
|
9bac43 |
+ */
|
|
|
9bac43 |
+ if (!g_source_is_destroyed(&ctx->source)) {
|
|
|
9bac43 |
+ g_source_remove_poll(&ctx->source, &node->pfd);
|
|
|
9bac43 |
+ }
|
|
|
9bac43 |
|
|
|
9bac43 |
/* If the lock is held, just mark the node as deleted */
|
|
|
9bac43 |
if (qemu_lockcnt_count(&ctx->list_lock)) {
|
|
|
9bac43 |
--
|
|
|
9bac43 |
1.8.3.1
|
|
|
9bac43 |
|