[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 08/23] linux-user/hexagon: Implement setup_sigtramp
From: |
Richard Henderson |
Subject: |
[PATCH v2 08/23] linux-user/hexagon: Implement setup_sigtramp |
Date: |
Fri, 18 Jun 2021 12:29:36 -0700 |
Continue to initialize the words on the stack, as documented.
However, use the off-stack trampoline.
Cc: Taylor Simpson <tsimpson@quicinc.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/hexagon/target_signal.h | 2 ++
linux-user/hexagon/signal.c | 19 +++++++++++++++++--
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/linux-user/hexagon/target_signal.h
b/linux-user/hexagon/target_signal.h
index 345cf1cbb8..9e0223d322 100644
--- a/linux-user/hexagon/target_signal.h
+++ b/linux-user/hexagon/target_signal.h
@@ -31,4 +31,6 @@ typedef struct target_sigaltstack {
#include "../generic/signal.h"
+#define TARGET_ARCH_HAS_SIGTRAMP_PAGE 1
+
#endif /* TARGET_SIGNAL_H */
diff --git a/linux-user/hexagon/signal.c b/linux-user/hexagon/signal.c
index 85eab5e943..bd0f9b1c85 100644
--- a/linux-user/hexagon/signal.c
+++ b/linux-user/hexagon/signal.c
@@ -161,6 +161,11 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
setup_ucontext(&frame->uc, env, set);
tswap_siginfo(&frame->info, info);
+ /*
+ * The on-stack signal trampoline is no longer executed;
+ * however, the libgcc signal frame unwinding code checks
+ * for the presence of these two numeric magic values.
+ */
install_sigtramp(frame->tramp);
env->gpr[HEX_REG_PC] = ka->_sa_handler;
@@ -170,8 +175,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
frame_addr + offsetof(struct target_rt_sigframe, info);
env->gpr[HEX_REG_R02] =
frame_addr + offsetof(struct target_rt_sigframe, uc);
- env->gpr[HEX_REG_LR] =
- frame_addr + offsetof(struct target_rt_sigframe, tramp);
+ env->gpr[HEX_REG_LR] = default_rt_sigreturn;
return;
@@ -270,3 +274,14 @@ badframe:
force_sig(TARGET_SIGSEGV);
return 0;
}
+
+void setup_sigtramp(abi_ulong sigtramp_page)
+{
+ uint32_t *tramp = lock_user(VERIFY_WRITE, sigtramp_page, 4 * 2, 0);
+ assert(tramp != NULL);
+
+ default_rt_sigreturn = sigtramp_page;
+ install_sigtramp(tramp);
+
+ unlock_user(tramp, sigtramp_page, 4 * 2);
+}
--
2.25.1
- [PATCH v2 01/23] linux-user: Add infrastructure for a signal trampoline page, (continued)
- [PATCH v2 01/23] linux-user: Add infrastructure for a signal trampoline page, Richard Henderson, 2021/06/18
- [PATCH v2 03/23] linux-user/arm: Split out v2_frame, Richard Henderson, 2021/06/18
- [PATCH v2 05/23] linux-user/arm: Implement setup_sigtramp, Richard Henderson, 2021/06/18
- [PATCH v2 02/23] linux-user/aarch64: Implement setup_sigtramp, Richard Henderson, 2021/06/18
- [PATCH v2 09/23] linux-user/hppa: Document non-use of setup_sigtramp, Richard Henderson, 2021/06/18
- [PATCH v2 06/23] linux-user/alpha: Implement setup_sigtramp, Richard Henderson, 2021/06/18
- [PATCH v2 04/23] linux-user/arm: Force v2 frames for fdpic, Richard Henderson, 2021/06/18
- [PATCH v2 13/23] linux-user/mips: Tidy install_sigtramp, Richard Henderson, 2021/06/18
- [PATCH v2 08/23] linux-user/hexagon: Implement setup_sigtramp,
Richard Henderson <=
- [PATCH v2 07/23] linux-user/cris: Implement setup_sigtramp, Richard Henderson, 2021/06/18
- [PATCH v2 12/23] linux-user/microblaze: Implement setup_sigtramp, Richard Henderson, 2021/06/18
- [PATCH v2 16/23] linux-user/openrisc: Implement setup_sigtramp, Richard Henderson, 2021/06/18
- [PATCH v2 20/23] linux-user/sh4: Implement setup_sigtramp, Richard Henderson, 2021/06/18
- [PATCH v2 14/23] linux-user/mips: Implement setup_sigtramp, Richard Henderson, 2021/06/18
- [PATCH v2 11/23] linux-user/m68k: Implement setup_sigtramp, Richard Henderson, 2021/06/18