[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 33/36] linux-user/s390x: Implement setup_sigtramp
From: |
Richard Henderson |
Subject: |
[PATCH v2 33/36] linux-user/s390x: Implement setup_sigtramp |
Date: |
Tue, 6 Jul 2021 16:49:29 -0700 |
Create and record the two signal trampolines.
Use them when the guest does not use SA_RESTORER.
Cc: qemu-s390x@nongnu.org
Tested-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/s390x/target_signal.h | 2 ++
linux-user/s390x/signal.c | 24 ++++++++++++++++--------
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/linux-user/s390x/target_signal.h b/linux-user/s390x/target_signal.h
index bbfc464d44..64f5f42201 100644
--- a/linux-user/s390x/target_signal.h
+++ b/linux-user/s390x/target_signal.h
@@ -19,4 +19,6 @@ typedef struct target_sigaltstack {
#include "../generic/signal.h"
#define TARGET_ARCH_HAS_SETUP_FRAME
+#define TARGET_ARCH_HAS_SIGTRAMP_PAGE 1
+
#endif /* S390X_TARGET_SIGNAL_H */
diff --git a/linux-user/s390x/signal.c b/linux-user/s390x/signal.c
index bf8a8fbfe9..18b1997f1e 100644
--- a/linux-user/s390x/signal.c
+++ b/linux-user/s390x/signal.c
@@ -67,7 +67,6 @@ typedef struct {
target_sigregs sregs;
int signo;
target_sigregs_ext sregs_ext;
- uint16_t retcode;
} sigframe;
#define TARGET_UC_VXRS 2
@@ -84,7 +83,6 @@ struct target_ucontext {
typedef struct {
uint8_t callee_used_stack[__SIGNAL_FRAMESIZE];
- uint16_t retcode;
struct target_siginfo info;
struct target_ucontext uc;
} rt_sigframe;
@@ -208,9 +206,7 @@ void setup_frame(int sig, struct target_sigaction *ka,
if (ka->sa_flags & TARGET_SA_RESTORER) {
restorer = ka->sa_restorer;
} else {
- restorer = frame_addr + offsetof(sigframe, retcode);
- __put_user(S390_SYSCALL_OPCODE | TARGET_NR_sigreturn,
- &frame->retcode);
+ restorer = default_sigreturn;
}
/* Set up registers for signal handler */
@@ -261,9 +257,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
if (ka->sa_flags & TARGET_SA_RESTORER) {
restorer = ka->sa_restorer;
} else {
- restorer = frame_addr + offsetof(typeof(*frame), retcode);
- __put_user(S390_SYSCALL_OPCODE | TARGET_NR_rt_sigreturn,
- &frame->retcode);
+ restorer = default_rt_sigreturn;
}
/* Create siginfo on the signal stack. */
@@ -404,3 +398,17 @@ long do_rt_sigreturn(CPUS390XState *env)
unlock_user_struct(frame, frame_addr, 0);
return -TARGET_QEMU_ESIGRETURN;
}
+
+void setup_sigtramp(abi_ulong sigtramp_page)
+{
+ uint16_t *tramp = lock_user(VERIFY_WRITE, sigtramp_page, 2 + 2, 0);
+ assert(tramp != NULL);
+
+ default_sigreturn = sigtramp_page;
+ __put_user(S390_SYSCALL_OPCODE | TARGET_NR_sigreturn, &tramp[0]);
+
+ default_rt_sigreturn = sigtramp_page + 2;
+ __put_user(S390_SYSCALL_OPCODE | TARGET_NR_rt_sigreturn, &tramp[1]);
+
+ unlock_user(tramp, sigtramp_page, 2 + 2);
+}
--
2.25.1
- [PATCH v2 22/36] linux-user/i386: Add vdso and use it for sigreturn, (continued)
- [PATCH v2 22/36] linux-user/i386: Add vdso and use it for sigreturn, Richard Henderson, 2021/07/06
- [PATCH v2 28/36] linux-user/nios2: Document non-use of setup_sigtramp, Richard Henderson, 2021/07/06
- [PATCH v2 25/36] linux-user/microblaze: Implement setup_sigtramp, Richard Henderson, 2021/07/06
- [PATCH v2 29/36] linux-user/openrisc: Implement setup_sigtramp, Richard Henderson, 2021/07/06
- [PATCH v2 27/36] linux-user/mips: Implement setup_sigtramp, Richard Henderson, 2021/07/06
- [PATCH v2 26/36] linux-user/mips: Tidy install_sigtramp, Richard Henderson, 2021/07/06
- [PATCH v2 24/36] linux-user/m68k: Implement setup_sigtramp, Richard Henderson, 2021/07/06
- [PATCH v2 30/36] target/ppc: Simplify encode_trampoline, Richard Henderson, 2021/07/06
- [PATCH v2 31/36] linux-user/ppc: Implement setup_sigtramp, Richard Henderson, 2021/07/06
- [PATCH v2 33/36] linux-user/s390x: Implement setup_sigtramp,
Richard Henderson <=
- [PATCH v2 32/36] linux-user/riscv: Add vdso and use it for sigreturn, Richard Henderson, 2021/07/06
- [PATCH v2 34/36] linux-user/sh4: Implement setup_sigtramp, Richard Henderson, 2021/07/06
- [PATCH v2 35/36] linux-user/sparc: Implement setup_sigtramp, Richard Henderson, 2021/07/06
- [PATCH v2 36/36] linux-user/xtensa: Implement setup_sigtramp, Richard Henderson, 2021/07/06
- Re: [PATCH v2 00/36] linux-user: Signal trampolines and vdsos, Philippe Mathieu-Daudé, 2021/07/08