[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 04/60] accel/tcg: Fold cpu_exit_tb_from_sighandler into caller
From: |
Richard Henderson |
Subject: |
[PATCH v7 04/60] accel/tcg: Fold cpu_exit_tb_from_sighandler into caller |
Date: |
Mon, 1 Nov 2021 13:26:33 -0400 |
Remove the comment about siglongjmp. We do use sigsetjmp
in the main cpu loop, but we do not save the signal mask
as most exits from the cpu loop do not require them.
Reviewed-by: Warner Losh <imp@bsdimp.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/user-exec.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
index b83f8d12f4..b1183aa4b3 100644
--- a/accel/tcg/user-exec.c
+++ b/accel/tcg/user-exec.c
@@ -46,17 +46,6 @@ __thread uintptr_t helper_retaddr;
//#define DEBUG_SIGNAL
-/* exit the current TB from a signal handler. The host registers are
- restored in a state compatible with the CPU emulator
- */
-static void QEMU_NORETURN cpu_exit_tb_from_sighandler(CPUState *cpu,
- sigset_t *old_set)
-{
- /* XXX: use siglongjmp ? */
- sigprocmask(SIG_SETMASK, old_set, NULL);
- cpu_loop_exit_noexc(cpu);
-}
-
/*
* Adjust the pc to pass to cpu_restore_state; return the memop type.
*/
@@ -153,7 +142,8 @@ bool handle_sigsegv_accerr_write(CPUState *cpu, sigset_t
*old_set,
* Fault caused by protection of cached translation, and the
* currently executing TB was modified and must be exited immediately.
*/
- cpu_exit_tb_from_sighandler(cpu, old_set);
+ sigprocmask(SIG_SETMASK, old_set, NULL);
+ cpu_loop_exit_noexc(cpu);
/* NORETURN */
default:
g_assert_not_reached();
--
2.25.1
- [PATCH v7 00/60] user-only: Cleanup SIGSEGV and SIGBUS handling, Richard Henderson, 2021/11/01
- [PATCH v7 01/60] accel/tcg: Split out adjust_signal_pc, Richard Henderson, 2021/11/01
- [PATCH v7 04/60] accel/tcg: Fold cpu_exit_tb_from_sighandler into caller,
Richard Henderson <=
- [PATCH v7 12/60] linux-user/host/aarch64: Populate host_signal.h, Richard Henderson, 2021/11/01
- [PATCH v7 03/60] accel/tcg: Split out handle_sigsegv_accerr_write, Richard Henderson, 2021/11/01
- [PATCH v7 06/60] linux-user: Reorg handling for SIGSEGV, Richard Henderson, 2021/11/01
- [PATCH v7 05/60] configure: Merge riscv32 and riscv64 host architectures, Richard Henderson, 2021/11/01
- [PATCH v7 07/60] linux-user/host/x86: Populate host_signal.h, Richard Henderson, 2021/11/01
- [PATCH v7 02/60] accel/tcg: Move clear_helper_retaddr to cpu loop, Richard Henderson, 2021/11/01
- [PATCH v7 11/60] linux-user/host/arm: Populate host_signal.h, Richard Henderson, 2021/11/01
- [PATCH v7 10/60] linux-user/host/sparc: Populate host_signal.h, Richard Henderson, 2021/11/01
- [PATCH v7 14/60] linux-user/host/mips: Populate host_signal.h, Richard Henderson, 2021/11/01
- [PATCH v7 18/60] linux-user/signal: Drop HOST_SIGNAL_PLACEHOLDER, Richard Henderson, 2021/11/01