[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 24/26] linux-user/xtensa: Implement setup_sigtramp
From: |
Laurent Vivier |
Subject: |
[PULL 24/26] linux-user/xtensa: Implement setup_sigtramp |
Date: |
Mon, 4 Oct 2021 09:44:19 +0200 |
From: Richard Henderson <richard.henderson@linaro.org>
Create and record the rt signal trampoline.
Use it when the guest does not use SA_RESTORER.
Reviewed-by: Max Filippov <jcmvbkbc@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210929130553.121567-25-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/xtensa/signal.c | 56 ++++++++++++++++++++-----------
linux-user/xtensa/target_signal.h | 2 ++
2 files changed, 38 insertions(+), 20 deletions(-)
diff --git a/linux-user/xtensa/signal.c b/linux-user/xtensa/signal.c
index 7a3bfb92cadc..81572a5fc7b3 100644
--- a/linux-user/xtensa/signal.c
+++ b/linux-user/xtensa/signal.c
@@ -128,6 +128,29 @@ static int setup_sigcontext(struct target_rt_sigframe
*frame,
return 1;
}
+static void install_sigtramp(uint8_t *tramp)
+{
+#ifdef TARGET_WORDS_BIGENDIAN
+ /* Generate instruction: MOVI a2, __NR_rt_sigreturn */
+ __put_user(0x22, &tramp[0]);
+ __put_user(0x0a, &tramp[1]);
+ __put_user(TARGET_NR_rt_sigreturn, &tramp[2]);
+ /* Generate instruction: SYSCALL */
+ __put_user(0x00, &tramp[3]);
+ __put_user(0x05, &tramp[4]);
+ __put_user(0x00, &tramp[5]);
+#else
+ /* Generate instruction: MOVI a2, __NR_rt_sigreturn */
+ __put_user(0x22, &tramp[0]);
+ __put_user(0xa0, &tramp[1]);
+ __put_user(TARGET_NR_rt_sigreturn, &tramp[2]);
+ /* Generate instruction: SYSCALL */
+ __put_user(0x00, &tramp[3]);
+ __put_user(0x50, &tramp[4]);
+ __put_user(0x00, &tramp[5]);
+#endif
+}
+
void setup_rt_frame(int sig, struct target_sigaction *ka,
target_siginfo_t *info,
target_sigset_t *set, CPUXtensaState *env)
@@ -164,26 +187,9 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
if (ka->sa_flags & TARGET_SA_RESTORER) {
ra = ka->sa_restorer;
} else {
- ra = frame_addr + offsetof(struct target_rt_sigframe, retcode);
-#ifdef TARGET_WORDS_BIGENDIAN
- /* Generate instruction: MOVI a2, __NR_rt_sigreturn */
- __put_user(0x22, &frame->retcode[0]);
- __put_user(0x0a, &frame->retcode[1]);
- __put_user(TARGET_NR_rt_sigreturn, &frame->retcode[2]);
- /* Generate instruction: SYSCALL */
- __put_user(0x00, &frame->retcode[3]);
- __put_user(0x05, &frame->retcode[4]);
- __put_user(0x00, &frame->retcode[5]);
-#else
- /* Generate instruction: MOVI a2, __NR_rt_sigreturn */
- __put_user(0x22, &frame->retcode[0]);
- __put_user(0xa0, &frame->retcode[1]);
- __put_user(TARGET_NR_rt_sigreturn, &frame->retcode[2]);
- /* Generate instruction: SYSCALL */
- __put_user(0x00, &frame->retcode[3]);
- __put_user(0x50, &frame->retcode[4]);
- __put_user(0x00, &frame->retcode[5]);
-#endif
+ /* Not used, but retain for ABI compatibility. */
+ install_sigtramp(frame->retcode);
+ ra = default_rt_sigreturn;
}
memset(env->regs, 0, sizeof(env->regs));
env->pc = ka->_sa_handler;
@@ -264,3 +270,13 @@ badframe:
force_sig(TARGET_SIGSEGV);
return -TARGET_QEMU_ESIGRETURN;
}
+
+void setup_sigtramp(abi_ulong sigtramp_page)
+{
+ uint8_t *tramp = lock_user(VERIFY_WRITE, sigtramp_page, 6, 0);
+ assert(tramp != NULL);
+
+ default_rt_sigreturn = sigtramp_page;
+ install_sigtramp(tramp);
+ unlock_user(tramp, sigtramp_page, 6);
+}
diff --git a/linux-user/xtensa/target_signal.h
b/linux-user/xtensa/target_signal.h
index c60bf656f6b6..1c7ee73154ac 100644
--- a/linux-user/xtensa/target_signal.h
+++ b/linux-user/xtensa/target_signal.h
@@ -20,4 +20,6 @@ typedef struct target_sigaltstack {
#include "../generic/signal.h"
+#define TARGET_ARCH_HAS_SIGTRAMP_PAGE 1
+
#endif
--
2.31.1
- [PULL 07/26] linux-user/cris: Implement setup_sigtramp, (continued)
- [PULL 07/26] linux-user/cris: Implement setup_sigtramp, Laurent Vivier, 2021/10/04
- [PULL 06/26] linux-user/alpha: Implement setup_sigtramp, Laurent Vivier, 2021/10/04
- [PULL 18/26] linux-user/ppc: Simplify encode_trampoline, Laurent Vivier, 2021/10/04
- [PULL 10/26] linux-user/i386: Implement setup_sigtramp, Laurent Vivier, 2021/10/04
- [PULL 20/26] linux-user/riscv: Implement setup_sigtramp, Laurent Vivier, 2021/10/04
- [PULL 13/26] linux-user/microblaze: Implement setup_sigtramp, Laurent Vivier, 2021/10/04
- [PULL 25/26] linux-user: Remove default for TARGET_ARCH_HAS_SIGTRAMP_PAGE, Laurent Vivier, 2021/10/04
- [PULL 12/26] linux-user/m68k: Implement setup_sigtramp, Laurent Vivier, 2021/10/04
- [PULL 23/26] linux-user/sparc: Implement setup_sigtramp, Laurent Vivier, 2021/10/04
- [PULL 17/26] linux-user/openrisc: Implement setup_sigtramp, Laurent Vivier, 2021/10/04
- [PULL 24/26] linux-user/xtensa: Implement setup_sigtramp,
Laurent Vivier <=
- [PULL 09/26] linux-user/hppa: Document non-use of setup_sigtramp, Laurent Vivier, 2021/10/04
- [PULL 21/26] linux-user/s390x: Implement setup_sigtramp, Laurent Vivier, 2021/10/04
- [PULL 26/26] tests/tcg/multiarch: Re-enable signals test for most guests, Laurent Vivier, 2021/10/04
- [PULL 22/26] linux-user/sh4: Implement setup_sigtramp, Laurent Vivier, 2021/10/04
- [PULL 08/26] linux-user/hexagon: Implement setup_sigtramp, Laurent Vivier, 2021/10/04
- Re: [PULL 00/26] Linux user for 6.2 patches, Richard Henderson, 2021/10/04