* [PATCH v4 1/4] linux-user: Always exit from exclusive state in fork_end()
2023-02-14 14:08 [PATCH v4 0/4] Fix deadlock when dying because of a signal Ilya Leoshkevich
@ 2023-02-14 14:08 ` Ilya Leoshkevich
2023-02-14 14:08 ` [PATCH v4 2/4] cpus: Make {start,end}_exclusive() recursive Ilya Leoshkevich
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Ilya Leoshkevich @ 2023-02-14 14:08 UTC (permalink / raw)
To: Richard Henderson, Paolo Bonzini, Eduardo Habkost,
Marcel Apfelbaum, Philippe Mathieu-Daudé, Yanan Wang,
Laurent Vivier, Alex Bennée
Cc: qemu-devel, Christian Borntraeger, Ilya Leoshkevich
fork()ed processes currently start with
current_cpu->in_exclusive_context set, which is, strictly speaking, not
correct, but does not cause problems (even assertion failures).
With one of the next patches, the code begins to rely on this value, so
fix it by always calling end_exclusive() in fork_end().
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
---
linux-user/main.c | 10 ++++++----
linux-user/syscall.c | 1 +
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/linux-user/main.c b/linux-user/main.c
index 4290651c3cf..4ff30ff9806 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -161,13 +161,15 @@ void fork_end(int child)
}
qemu_init_cpu_list();
gdbserver_fork(thread_cpu);
- /* qemu_init_cpu_list() takes care of reinitializing the
- * exclusive state, so we don't need to end_exclusive() here.
- */
} else {
cpu_list_unlock();
- end_exclusive();
}
+ /*
+ * qemu_init_cpu_list() reinitialized the child exclusive state, but we
+ * also need to keep current_cpu consistent, so call end_exclusive() for
+ * both child and parent.
+ */
+ end_exclusive();
}
__thread CPUState *thread_cpu;
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 1e868e9b0e2..a6c426d73cf 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -6752,6 +6752,7 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp,
cpu_clone_regs_parent(env, flags);
fork_end(0);
}
+ g_assert(!cpu_in_exclusive_context(cpu));
}
return ret;
}
--
2.39.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v4 2/4] cpus: Make {start,end}_exclusive() recursive
2023-02-14 14:08 [PATCH v4 0/4] Fix deadlock when dying because of a signal Ilya Leoshkevich
2023-02-14 14:08 ` [PATCH v4 1/4] linux-user: Always exit from exclusive state in fork_end() Ilya Leoshkevich
@ 2023-02-14 14:08 ` Ilya Leoshkevich
2023-02-14 14:08 ` [PATCH v4 3/4] linux-user/microblaze: Handle privileged exception Ilya Leoshkevich
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Ilya Leoshkevich @ 2023-02-14 14:08 UTC (permalink / raw)
To: Richard Henderson, Paolo Bonzini, Eduardo Habkost,
Marcel Apfelbaum, Philippe Mathieu-Daudé, Yanan Wang,
Laurent Vivier, Alex Bennée
Cc: qemu-devel, Christian Borntraeger, Ilya Leoshkevich
Currently dying to one of the core_dump_signal()s deadlocks, because
dump_core_and_abort() calls start_exclusive() two times: first via
stop_all_tasks(), and then via preexit_cleanup() ->
qemu_plugin_user_exit().
There are a number of ways to solve this: resume after dumping core;
check cpu_in_exclusive_context() in qemu_plugin_user_exit(); or make
{start,end}_exclusive() recursive. Pick the last option, since it's
the most straightforward one.
Fixes: da91c1920242 ("linux-user: Clean up when exiting due to a signal")
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
---
cpus-common.c | 12 ++++++++++--
include/hw/core/cpu.h | 4 ++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/cpus-common.c b/cpus-common.c
index 793364dc0ed..39f355de989 100644
--- a/cpus-common.c
+++ b/cpus-common.c
@@ -192,6 +192,11 @@ void start_exclusive(void)
CPUState *other_cpu;
int running_cpus;
+ if (current_cpu->exclusive_context_count) {
+ current_cpu->exclusive_context_count++;
+ return;
+ }
+
qemu_mutex_lock(&qemu_cpu_list_lock);
exclusive_idle();
@@ -219,13 +224,16 @@ void start_exclusive(void)
*/
qemu_mutex_unlock(&qemu_cpu_list_lock);
- current_cpu->in_exclusive_context = true;
+ current_cpu->exclusive_context_count = 1;
}
/* Finish an exclusive operation. */
void end_exclusive(void)
{
- current_cpu->in_exclusive_context = false;
+ current_cpu->exclusive_context_count--;
+ if (current_cpu->exclusive_context_count) {
+ return;
+ }
qemu_mutex_lock(&qemu_cpu_list_lock);
qatomic_set(&pending_cpus, 0);
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
index 2417597236b..671f041bec6 100644
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -349,7 +349,7 @@ struct CPUState {
bool unplug;
bool crash_occurred;
bool exit_request;
- bool in_exclusive_context;
+ int exclusive_context_count;
uint32_t cflags_next_tb;
/* updates protected by BQL */
uint32_t interrupt_request;
@@ -758,7 +758,7 @@ void async_safe_run_on_cpu(CPUState *cpu, run_on_cpu_func func, run_on_cpu_data
*/
static inline bool cpu_in_exclusive_context(const CPUState *cpu)
{
- return cpu->in_exclusive_context;
+ return cpu->exclusive_context_count;
}
/**
--
2.39.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v4 3/4] linux-user/microblaze: Handle privileged exception
2023-02-14 14:08 [PATCH v4 0/4] Fix deadlock when dying because of a signal Ilya Leoshkevich
2023-02-14 14:08 ` [PATCH v4 1/4] linux-user: Always exit from exclusive state in fork_end() Ilya Leoshkevich
2023-02-14 14:08 ` [PATCH v4 2/4] cpus: Make {start,end}_exclusive() recursive Ilya Leoshkevich
@ 2023-02-14 14:08 ` Ilya Leoshkevich
2023-02-14 14:08 ` [PATCH v4 4/4] tests/tcg/linux-test: Add linux-fork-trap test Ilya Leoshkevich
2023-02-16 6:09 ` [PATCH v4 0/4] Fix deadlock when dying because of a signal Richard Henderson
4 siblings, 0 replies; 6+ messages in thread
From: Ilya Leoshkevich @ 2023-02-14 14:08 UTC (permalink / raw)
To: Richard Henderson, Paolo Bonzini, Eduardo Habkost,
Marcel Apfelbaum, Philippe Mathieu-Daudé, Yanan Wang,
Laurent Vivier, Alex Bennée
Cc: qemu-devel, Christian Borntraeger, Ilya Leoshkevich
Follow what kernel's full_exception() is doing.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
---
linux-user/microblaze/cpu_loop.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/linux-user/microblaze/cpu_loop.c b/linux-user/microblaze/cpu_loop.c
index 5ccf9e942ea..212e62d0a62 100644
--- a/linux-user/microblaze/cpu_loop.c
+++ b/linux-user/microblaze/cpu_loop.c
@@ -25,8 +25,8 @@
void cpu_loop(CPUMBState *env)
{
+ int trapnr, ret, si_code, sig;
CPUState *cs = env_cpu(env);
- int trapnr, ret, si_code;
while (1) {
cpu_exec_start(cs);
@@ -76,6 +76,7 @@ void cpu_loop(CPUMBState *env)
env->iflags &= ~(IMM_FLAG | D_FLAG);
switch (env->esr & 31) {
case ESR_EC_DIVZERO:
+ sig = TARGET_SIGFPE;
si_code = TARGET_FPE_INTDIV;
break;
case ESR_EC_FPU:
@@ -84,6 +85,7 @@ void cpu_loop(CPUMBState *env)
* if there's no recognized bit set. Possibly this
* implies that si_code is 0, but follow the structure.
*/
+ sig = TARGET_SIGFPE;
si_code = env->fsr;
if (si_code & FSR_IO) {
si_code = TARGET_FPE_FLTINV;
@@ -97,13 +99,17 @@ void cpu_loop(CPUMBState *env)
si_code = TARGET_FPE_FLTRES;
}
break;
+ case ESR_EC_PRIVINSN:
+ sig = SIGILL;
+ si_code = ILL_PRVOPC;
+ break;
default:
fprintf(stderr, "Unhandled hw-exception: 0x%x\n",
env->esr & ESR_EC_MASK);
cpu_dump_state(cs, stderr, 0);
exit(EXIT_FAILURE);
}
- force_sig_fault(TARGET_SIGFPE, si_code, env->pc);
+ force_sig_fault(sig, si_code, env->pc);
break;
case EXCP_DEBUG:
--
2.39.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v4 4/4] tests/tcg/linux-test: Add linux-fork-trap test
2023-02-14 14:08 [PATCH v4 0/4] Fix deadlock when dying because of a signal Ilya Leoshkevich
` (2 preceding siblings ...)
2023-02-14 14:08 ` [PATCH v4 3/4] linux-user/microblaze: Handle privileged exception Ilya Leoshkevich
@ 2023-02-14 14:08 ` Ilya Leoshkevich
2023-02-16 6:09 ` [PATCH v4 0/4] Fix deadlock when dying because of a signal Richard Henderson
4 siblings, 0 replies; 6+ messages in thread
From: Ilya Leoshkevich @ 2023-02-14 14:08 UTC (permalink / raw)
To: Richard Henderson, Paolo Bonzini, Eduardo Habkost,
Marcel Apfelbaum, Philippe Mathieu-Daudé, Yanan Wang,
Laurent Vivier, Alex Bennée
Cc: qemu-devel, Christian Borntraeger, Ilya Leoshkevich
Check that dying due to a signal does not deadlock.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
---
tests/tcg/multiarch/linux/linux-fork-trap.c | 51 +++++++++++++++++++++
1 file changed, 51 insertions(+)
create mode 100644 tests/tcg/multiarch/linux/linux-fork-trap.c
diff --git a/tests/tcg/multiarch/linux/linux-fork-trap.c b/tests/tcg/multiarch/linux/linux-fork-trap.c
new file mode 100644
index 00000000000..2bfef800c3e
--- /dev/null
+++ b/tests/tcg/multiarch/linux/linux-fork-trap.c
@@ -0,0 +1,51 @@
+/*
+ * Test that a fork()ed process terminates after __builtin_trap().
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/resource.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+int main(void)
+{
+ struct rlimit nodump;
+ pid_t err, pid;
+ int wstatus;
+
+ pid = fork();
+ assert(pid != -1);
+ if (pid == 0) {
+ /* We are about to crash on purpose; disable core dumps. */
+ if (getrlimit(RLIMIT_CORE, &nodump)) {
+ return EXIT_FAILURE;
+ }
+ nodump.rlim_cur = 0;
+ if (setrlimit(RLIMIT_CORE, &nodump)) {
+ return EXIT_FAILURE;
+ }
+ /*
+ * An alternative would be to dereference a NULL pointer, but that
+ * would be an UB in C.
+ */
+ printf("about to trigger fault...\n");
+#if defined(__MICROBLAZE__)
+ /*
+ * gcc emits "bri 0", which is an endless loop.
+ * Take glibc's ABORT_INSTRUCTION.
+ */
+ asm volatile("brki r0,-1");
+#else
+ __builtin_trap();
+#endif
+ }
+ err = waitpid(pid, &wstatus, 0);
+ assert(err == pid);
+ assert(WIFSIGNALED(wstatus));
+ printf("faulting thread exited cleanly\n");
+
+ return EXIT_SUCCESS;
+}
--
2.39.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v4 0/4] Fix deadlock when dying because of a signal
2023-02-14 14:08 [PATCH v4 0/4] Fix deadlock when dying because of a signal Ilya Leoshkevich
` (3 preceding siblings ...)
2023-02-14 14:08 ` [PATCH v4 4/4] tests/tcg/linux-test: Add linux-fork-trap test Ilya Leoshkevich
@ 2023-02-16 6:09 ` Richard Henderson
4 siblings, 0 replies; 6+ messages in thread
From: Richard Henderson @ 2023-02-16 6:09 UTC (permalink / raw)
To: Ilya Leoshkevich, Paolo Bonzini, Eduardo Habkost,
Marcel Apfelbaum, Philippe Mathieu-Daudé, Yanan Wang,
Laurent Vivier, Alex Bennée
Cc: qemu-devel, Christian Borntraeger
On 2/14/23 04:08, Ilya Leoshkevich wrote:
> Based-on:<20230202005204.2055899-1-richard.henderson@linaro.org>
> ("[PATCH 00/14] linux-user/sparc: Handle missing traps")
>
> v3:https://lists.gnu.org/archive/html/qemu-devel/2023-02/msg03534.html
> v3 -> v4: Add printfs to the test in order to make the uncaught signals
> less scary:
>
> $ build/x86_64-linux-user/qemu-x86_64 build/tests/tcg/x86_64-linux-user/linux-fork-trap
> about to trigger fault...
> qemu: uncaught target signal 4 (Illegal instruction) - core dumped
> faulting thread exited cleanly
Queued to tcg-next, thanks.
r~
^ permalink raw reply [flat|nested] 6+ messages in thread