From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42676) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fe31H-0001b0-UM for qemu-devel@nongnu.org; Fri, 13 Jul 2018 14:42:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fe31D-000378-Vx for qemu-devel@nongnu.org; Fri, 13 Jul 2018 14:42:19 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:46734 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fe31D-00036N-QG for qemu-devel@nongnu.org; Fri, 13 Jul 2018 14:42:15 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 807B540073B7 for ; Fri, 13 Jul 2018 18:42:14 +0000 (UTC) From: Stefan Hajnoczi Date: Fri, 13 Jul 2018 19:41:24 +0100 Message-Id: <20180713184124.25029-1-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH] trace/simple: fix hang in child after fork(2) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Cornelia Huck , Paolo Bonzini The simple trace backend spawns a write-out thread which is used to asynchronously flush the in-memory ring buffer to disk. fork(2) does not clone all threads, only the thread that invoked fork(2). As a result there is no write-out thread in the child process! This causes a hang during shutdown when atexit(3) handler installed by the simple trace backend waits for the non-existent write-out thread. This patch uses pthread_atfork(3) to terminate the write-out thread before fork and restart it in both the parent and child after fork. This solves a hang in qemu-iotests 147 due to qemu-nbd --fork usage. Reported-by: Cornelia Huck Suggested-by: Paolo Bonzini Signed-off-by: Stefan Hajnoczi --- trace/simple.c | 67 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 58 insertions(+), 9 deletions(-) diff --git a/trace/simple.c b/trace/simple.c index 701dec639c..9f6ac9ef24 100644 --- a/trace/simple.c +++ b/trace/simple.c @@ -39,9 +39,11 @@ static GMutex trace_lock; static GCond trace_available_cond; static GCond trace_empty_cond; +static GThread *trace_writeout_thread; static bool trace_available; static bool trace_writeout_enabled; +static bool trace_writeout_running; enum { TRACE_BUF_LEN = 4096 * 64, @@ -142,15 +144,34 @@ static void flush_trace_file(bool wait) g_mutex_unlock(&trace_lock); } -static void wait_for_trace_records_available(void) +/** + * Wait to be kicked by flush_trace_file() + * + * Returns: true if the writeout thread should continue + * false if the writeout thread should terminate + */ +static bool wait_for_trace_records_available(void) { + bool running; + g_mutex_lock(&trace_lock); - while (!(trace_available && trace_writeout_enabled)) { + for (;;) { + running = trace_writeout_running; + if (!running) { + break; + } + + if (trace_available && trace_writeout_enabled) { + break; + } + g_cond_signal(&trace_empty_cond); g_cond_wait(&trace_available_cond, &trace_lock); } trace_available = false; g_mutex_unlock(&trace_lock); + + return running; } static gpointer writeout_thread(gpointer opaque) @@ -165,9 +186,7 @@ static gpointer writeout_thread(gpointer opaque) size_t unused __attribute__ ((unused)); uint64_t type = TRACE_RECORD_TYPE_EVENT; - for (;;) { - wait_for_trace_records_available(); - + while (wait_for_trace_records_available()) { if (g_atomic_int_get(&dropped_events)) { dropped.rec.event = DROPPED_EVENT_ID, dropped.rec.timestamp_ns = get_clock(); @@ -398,18 +417,48 @@ static GThread *trace_thread_create(GThreadFunc fn) return thread; } +#ifndef _WIN32 +static void stop_writeout_thread(void) +{ + g_mutex_lock(&trace_lock); + trace_writeout_running = false; + g_cond_signal(&trace_available_cond); + g_mutex_unlock(&trace_lock); + + g_thread_join(trace_writeout_thread); + trace_writeout_thread = NULL; +} + +static void restart_writeout_thread(void) +{ + trace_writeout_running = true; + trace_writeout_thread = trace_thread_create(writeout_thread); + if (!trace_writeout_thread) { + warn_report("unable to initialize simple trace backend"); + } +} +#endif /* !_WIN32 */ + bool st_init(void) { - GThread *thread; - trace_pid = getpid(); + trace_writeout_running = true; - thread = trace_thread_create(writeout_thread); - if (!thread) { + trace_writeout_thread = trace_thread_create(writeout_thread); + if (!trace_writeout_thread) { warn_report("unable to initialize simple trace backend"); return false; } +#ifndef _WIN32 + /* Terminate writeout thread across fork and restart it in parent and + * child afterwards. + */ + pthread_atfork(stop_writeout_thread, + restart_writeout_thread, + restart_writeout_thread); +#endif + atexit(st_flush_trace_buffer); return true; } -- 2.17.1