From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47554) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFmSO-0003tG-Bm for qemu-devel@nongnu.org; Thu, 16 Jul 2015 12:56:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZFmSJ-0008Od-Sq for qemu-devel@nongnu.org; Thu, 16 Jul 2015 12:56:24 -0400 Received: from mail-wg0-x22a.google.com ([2a00:1450:400c:c00::22a]:35034) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFmSJ-0008OJ-MR for qemu-devel@nongnu.org; Thu, 16 Jul 2015 12:56:19 -0400 Received: by wgjx7 with SMTP id x7so63243732wgj.2 for ; Thu, 16 Jul 2015 09:56:19 -0700 (PDT) Received: from donizetti.localdomain (host231-210-dynamic.21-79-r.retail.telecomitalia.it. [79.21.210.231]) by smtp.gmail.com with ESMTPSA id lq9sm14006305wjb.35.2015.07.16.09.56.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Jul 2015 09:56:18 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 16 Jul 2015 18:55:54 +0200 Message-Id: <1437065758-4625-8-git-send-email-pbonzini@redhat.com> In-Reply-To: <1437065758-4625-1-git-send-email-pbonzini@redhat.com> References: <1437065758-4625-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 07/11] rcu: actually register threads that have RCU read-side critical sections List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Otherwise, grace periods are detected too early! Signed-off-by: Paolo Bonzini --- cpus.c | 6 ++++++ iothread.c | 3 +++ migration/migration.c | 3 +++ tests/test-rcu-list.c | 2 ++ util/rcu.c | 2 ++ 5 files changed, 16 insertions(+) diff --git a/cpus.c b/cpus.c index b00a423..a822ce3 100644 --- a/cpus.c +++ b/cpus.c @@ -954,6 +954,8 @@ static void *qemu_kvm_cpu_thread_fn(void *arg) CPUState *cpu = arg; int r; + rcu_register_thread(); + qemu_mutex_lock_iothread(); qemu_thread_get_self(cpu->thread); cpu->thread_id = qemu_get_thread_id(); @@ -995,6 +997,8 @@ static void *qemu_dummy_cpu_thread_fn(void *arg) sigset_t waitset; int r; + rcu_register_thread(); + qemu_mutex_lock_iothread(); qemu_thread_get_self(cpu->thread); cpu->thread_id = qemu_get_thread_id(); @@ -1034,6 +1038,8 @@ static void *qemu_tcg_cpu_thread_fn(void *arg) { CPUState *cpu = arg; + rcu_register_thread(); + qemu_mutex_lock_iothread(); qemu_tcg_init_cpu_signals(); qemu_thread_get_self(cpu->thread); diff --git a/iothread.c b/iothread.c index 6d2a33f..443d176 100644 --- a/iothread.c +++ b/iothread.c @@ -18,6 +18,7 @@ #include "sysemu/iothread.h" #include "qmp-commands.h" #include "qemu/error-report.h" +#include "qemu/rcu.h" typedef ObjectClass IOThreadClass; @@ -31,6 +32,8 @@ static void *iothread_run(void *opaque) IOThread *iothread = opaque; bool blocking; + rcu_register_thread(); + qemu_mutex_lock(&iothread->init_done_lock); iothread->thread_id = qemu_get_thread_id(); qemu_cond_signal(&iothread->init_done_cond); diff --git a/migration/migration.c b/migration/migration.c index 45719a0..7f1e05a 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -22,6 +22,7 @@ #include "block/block.h" #include "qapi/qmp/qerror.h" #include "qemu/sockets.h" +#include "qemu/rcu.h" #include "migration/block.h" #include "qemu/thread.h" #include "qmp-commands.h" @@ -911,6 +912,8 @@ static void *migration_thread(void *opaque) int64_t start_time = initial_time; bool old_vm_running = false; + rcu_register_thread(); + qemu_savevm_state_header(s->file); qemu_savevm_state_begin(s->file, &s->params); diff --git a/tests/test-rcu-list.c b/tests/test-rcu-list.c index 4c5f62e..af98bdb 100644 --- a/tests/test-rcu-list.c +++ b/tests/test-rcu-list.c @@ -108,6 +108,8 @@ static void *rcu_q_reader(void *arg) long long n_reads_local = 0; struct list_element *el; + rcu_register_thread(); + *(struct rcu_reader_data **)arg = &rcu_reader; atomic_inc(&nthreadsrunning); while (goflag == GOFLAG_INIT) { diff --git a/util/rcu.c b/util/rcu.c index 8830295..e21bb46 100644 --- a/util/rcu.c +++ b/util/rcu.c @@ -216,6 +216,8 @@ static void *call_rcu_thread(void *opaque) { struct rcu_head *node; + rcu_register_thread(); + for (;;) { int tries = 0; int n = atomic_read(&rcu_call_count); -- 2.4.3