[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/8] linux-user: call cpu_copy under clone_lock
From: |
Max Filippov |
Subject: |
[Qemu-devel] [PULL 3/8] linux-user: call cpu_copy under clone_lock |
Date: |
Mon, 2 Apr 2018 10:13:49 -0700 |
cpu_copy adds newly created CPU object to container/machine/unattached,
but does it w/o proper locking. As a result when multiple threads create
threads rapidly QEMU may abort with the following message:
GLib-CRITICAL **: g_hash_table_iter_next: assertion
'ri->version == ri->hash_table->version' failed
ERROR:qemu/qom/object.c:1663:object_get_canonical_path_component:
code should not be reached
E.g. this issue is observed when running glibc test nptl/tst-eintr1.
Move cpu_copy invocation under clone_lock to fix that.
Reviewed-by: Laurent Vivier <address@hidden>
Signed-off-by: Max Filippov <address@hidden>
---
linux-user/syscall.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 889abbda1e65..18ea79140f16 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -6346,6 +6346,10 @@ static int do_fork(CPUArchState *env, unsigned int
flags, abi_ulong newsp,
ts = g_new0(TaskState, 1);
init_task_state(ts);
+
+ /* Grab a mutex so that thread setup appears atomic. */
+ pthread_mutex_lock(&clone_lock);
+
/* we create a new CPU instance. */
new_env = cpu_copy(env);
/* Init regs that differ from the parent. */
@@ -6364,9 +6368,6 @@ static int do_fork(CPUArchState *env, unsigned int flags,
abi_ulong newsp,
cpu_set_tls (new_env, newtls);
}
- /* Grab a mutex so that thread setup appears atomic. */
- pthread_mutex_lock(&clone_lock);
-
memset(&info, 0, sizeof(info));
pthread_mutex_init(&info.mutex, NULL);
pthread_mutex_lock(&info.mutex);
--
2.11.0
- [Qemu-devel] [PULL 0/8] xtensa-specific and generic fixes for linux-user, Max Filippov, 2018/04/02
- [Qemu-devel] [PULL 1/8] target/xtensa: fix flush_window_regs, Max Filippov, 2018/04/02
- [Qemu-devel] [PULL 2/8] target/xtensa: linux-user: rewind pc for restarted syscall, Max Filippov, 2018/04/02
- [Qemu-devel] [PULL 3/8] linux-user: call cpu_copy under clone_lock,
Max Filippov <=
- [Qemu-devel] [PULL 4/8] linux-user: fix mq_getsetattr implementation, Max Filippov, 2018/04/02
- [Qemu-devel] [PULL 5/8] target/xtensa: linux-user: fix sysv IPC structures, Max Filippov, 2018/04/02
- [Qemu-devel] [PULL 6/8] linux-user: fix error propagation in clock_gettime, Max Filippov, 2018/04/02
- [Qemu-devel] [PULL 7/8] linux-user: implement clock_settime, Max Filippov, 2018/04/02
- [Qemu-devel] [PULL 8/8] target/xtensa: linux-user: fix fadvise64 call, Max Filippov, 2018/04/02
- Re: [Qemu-devel] [PULL 0/8] xtensa-specific and generic fixes for linux-user, Peter Maydell, 2018/04/03