Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-14 11:43:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "linux-user: un-parent OBJECT(cpu) when closing thread"

Browse Source 
This reverts commit 52f0c16076.

This caused a regression in arm/aarch64.

We are hard-coding ARMCPRegInfo pointers into TranslationBlocks,
for calling into helper_{get,set}cp_reg{,64}.  So we have a race
condition between whichever cpu thread translates the code first
(encoding the pointer), and that cpu thread exiting, so that the
next execution of the TB references a freed data structure.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2022-08-18 18:03:52 -07:00
parent 4d65d4ba57
commit 976a55c0fe
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
linux-user/syscall.c
View File

@ -8594,13 +8594,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
if (CPU_NEXT(first_cpu)) { if (CPU_NEXT(first_cpu)) {
TaskState *ts = cpu->opaque; TaskState *ts = cpu->opaque;
if (ts->child_tidptr) { object_property_set_bool(OBJECT(cpu), "realized", false, NULL);
put_user_u32(0, ts->child_tidptr);
do_sys_futex(g2h(cpu, ts->child_tidptr),
FUTEX_WAKE, INT_MAX, NULL, NULL, 0);
}
object_unparent(OBJECT(cpu));
object_unref(OBJECT(cpu)); object_unref(OBJECT(cpu));
/* /*
* At this point the CPU should be unrealized and removed * At this point the CPU should be unrealized and removed
@ -8610,6 +8604,11 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
pthread_mutex_unlock(&clone_lock); pthread_mutex_unlock(&clone_lock);
if (ts->child_tidptr) {
put_user_u32(0, ts->child_tidptr);
do_sys_futex(g2h(cpu, ts->child_tidptr),
FUTEX_WAKE, INT_MAX, NULL, NULL, 0);
}
thread_cpu = NULL; thread_cpu = NULL;
g_free(ts); g_free(ts);
rcu_unregister_thread(); rcu_unregister_thread();