0cb0406172
On older versions of glib (anything prior to glib commit 0f056ebe from May 2019), the implementation of g_source_ref() and g_source_unref() is not threadsafe for a GSource which is not attached to a GMainContext. QEMU's real iothread.c implementation always attaches its iothread->ctx's GSource to a GMainContext created for that iothread, so it is OK, but the simple test framework implementation in tests/iothread.c was not doing this. This was causing intermittent assertion failures in the test-aio-multithread subtest "/aio/multi/mutex/contended" test on the BSD hosts. (It's unclear why only BSD seems to have been affected -- perhaps a combination of the specific glib version being used in the VMs and their happening to run on a host with a lot of CPUs). Borrow the iothread_init_gcontext() from the real iothread.c and add the corresponding cleanup code and the calls to g_main_context_push/pop_thread_default() so we actually use the GMainContext we create. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Peter Xu <peterx@redhat.com> Message-id: 20200106144552.7205-1-peter.maydell@linaro.org
128 lines
3.4 KiB
C
128 lines
3.4 KiB
C
/*
|
|
* Event loop thread implementation for unit tests
|
|
*
|
|
* Copyright Red Hat Inc., 2013, 2016
|
|
*
|
|
* Authors:
|
|
* Stefan Hajnoczi <stefanha@redhat.com>
|
|
* Paolo Bonzini <pbonzini@redhat.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "block/aio.h"
|
|
#include "qemu/main-loop.h"
|
|
#include "qemu/rcu.h"
|
|
#include "iothread.h"
|
|
|
|
struct IOThread {
|
|
AioContext *ctx;
|
|
GMainContext *worker_context;
|
|
GMainLoop *main_loop;
|
|
|
|
QemuThread thread;
|
|
QemuMutex init_done_lock;
|
|
QemuCond init_done_cond; /* is thread initialization done? */
|
|
bool stopping;
|
|
};
|
|
|
|
static __thread IOThread *my_iothread;
|
|
|
|
AioContext *qemu_get_current_aio_context(void)
|
|
{
|
|
return my_iothread ? my_iothread->ctx : qemu_get_aio_context();
|
|
}
|
|
|
|
static void iothread_init_gcontext(IOThread *iothread)
|
|
{
|
|
GSource *source;
|
|
|
|
iothread->worker_context = g_main_context_new();
|
|
source = aio_get_g_source(iothread_get_aio_context(iothread));
|
|
g_source_attach(source, iothread->worker_context);
|
|
g_source_unref(source);
|
|
iothread->main_loop = g_main_loop_new(iothread->worker_context, TRUE);
|
|
}
|
|
|
|
static void *iothread_run(void *opaque)
|
|
{
|
|
IOThread *iothread = opaque;
|
|
|
|
rcu_register_thread();
|
|
|
|
my_iothread = iothread;
|
|
qemu_mutex_lock(&iothread->init_done_lock);
|
|
iothread->ctx = aio_context_new(&error_abort);
|
|
|
|
/*
|
|
* We must connect the ctx to a GMainContext, because in older versions
|
|
* of glib the g_source_ref()/unref() functions are not threadsafe
|
|
* on sources without a context.
|
|
*/
|
|
iothread_init_gcontext(iothread);
|
|
|
|
/*
|
|
* g_main_context_push_thread_default() must be called before anything
|
|
* in this new thread uses glib.
|
|
*/
|
|
g_main_context_push_thread_default(iothread->worker_context);
|
|
|
|
qemu_cond_signal(&iothread->init_done_cond);
|
|
qemu_mutex_unlock(&iothread->init_done_lock);
|
|
|
|
while (!atomic_read(&iothread->stopping)) {
|
|
aio_poll(iothread->ctx, true);
|
|
}
|
|
|
|
g_main_context_pop_thread_default(iothread->worker_context);
|
|
rcu_unregister_thread();
|
|
return NULL;
|
|
}
|
|
|
|
static void iothread_stop_bh(void *opaque)
|
|
{
|
|
IOThread *iothread = opaque;
|
|
|
|
iothread->stopping = true;
|
|
}
|
|
|
|
void iothread_join(IOThread *iothread)
|
|
{
|
|
aio_bh_schedule_oneshot(iothread->ctx, iothread_stop_bh, iothread);
|
|
qemu_thread_join(&iothread->thread);
|
|
g_main_context_unref(iothread->worker_context);
|
|
g_main_loop_unref(iothread->main_loop);
|
|
qemu_cond_destroy(&iothread->init_done_cond);
|
|
qemu_mutex_destroy(&iothread->init_done_lock);
|
|
aio_context_unref(iothread->ctx);
|
|
g_free(iothread);
|
|
}
|
|
|
|
IOThread *iothread_new(void)
|
|
{
|
|
IOThread *iothread = g_new0(IOThread, 1);
|
|
|
|
qemu_mutex_init(&iothread->init_done_lock);
|
|
qemu_cond_init(&iothread->init_done_cond);
|
|
qemu_thread_create(&iothread->thread, NULL, iothread_run,
|
|
iothread, QEMU_THREAD_JOINABLE);
|
|
|
|
/* Wait for initialization to complete */
|
|
qemu_mutex_lock(&iothread->init_done_lock);
|
|
while (iothread->ctx == NULL) {
|
|
qemu_cond_wait(&iothread->init_done_cond,
|
|
&iothread->init_done_lock);
|
|
}
|
|
qemu_mutex_unlock(&iothread->init_done_lock);
|
|
return iothread;
|
|
}
|
|
|
|
AioContext *iothread_get_aio_context(IOThread *iothread)
|
|
{
|
|
return iothread->ctx;
|
|
}
|