From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: alex.bennee@linaro.org, laurent@vivier.eu,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PATCH v5 15/26] linux-user/mips: Implement setup_sigtramp
Date: Wed, 29 Sep 2021 09:05:42 -0400 [thread overview]
Message-ID: <20210929130553.121567-16-richard.henderson@linaro.org> (raw)
In-Reply-To: <20210929130553.121567-1-richard.henderson@linaro.org>
Create and record the two signal trampolines.
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/mips/target_signal.h | 1 +
linux-user/mips64/target_signal.h | 2 ++
linux-user/mips/signal.c | 34 ++++++++++++++++++++++---------
3 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/linux-user/mips/target_signal.h b/linux-user/mips/target_signal.h
index d521765f6b..780a4ddf29 100644
--- a/linux-user/mips/target_signal.h
+++ b/linux-user/mips/target_signal.h
@@ -73,6 +73,7 @@ typedef struct target_sigaltstack {
/* compare linux/arch/mips/kernel/signal.c:setup_frame() */
#define TARGET_ARCH_HAS_SETUP_FRAME
#endif
+#define TARGET_ARCH_HAS_SIGTRAMP_PAGE 1
/* bit-flags */
#define TARGET_SS_AUTODISARM (1U << 31) /* disable sas during sighandling */
diff --git a/linux-user/mips64/target_signal.h b/linux-user/mips64/target_signal.h
index d857c55e4c..275e9b7f9a 100644
--- a/linux-user/mips64/target_signal.h
+++ b/linux-user/mips64/target_signal.h
@@ -76,4 +76,6 @@ typedef struct target_sigaltstack {
/* compare linux/arch/mips/kernel/signal.c:setup_frame() */
#define TARGET_ARCH_HAS_SETUP_FRAME
#endif
+#define TARGET_ARCH_HAS_SIGTRAMP_PAGE 1
+
#endif /* MIPS64_TARGET_SIGNAL_H */
diff --git a/linux-user/mips/signal.c b/linux-user/mips/signal.c
index 64072779b9..8f79e405ec 100644
--- a/linux-user/mips/signal.c
+++ b/linux-user/mips/signal.c
@@ -209,8 +209,6 @@ void setup_frame(int sig, struct target_sigaction * ka,
goto give_sigsegv;
}
- install_sigtramp(frame->sf_code, TARGET_NR_sigreturn);
-
setup_sigcontext(regs, &frame->sf_sc);
for(i = 0; i < TARGET_NSIG_WORDS; i++) {
@@ -231,7 +229,7 @@ void setup_frame(int sig, struct target_sigaction * ka,
regs->active_tc.gpr[ 5] = 0;
regs->active_tc.gpr[ 6] = frame_addr + offsetof(struct sigframe, sf_sc);
regs->active_tc.gpr[29] = frame_addr;
- regs->active_tc.gpr[31] = frame_addr + offsetof(struct sigframe, sf_code);
+ regs->active_tc.gpr[31] = default_sigreturn;
/* The original kernel code sets CP0_EPC to the handler
* since it returns to userland using eret
* we cannot do this here, and we must set PC directly */
@@ -305,8 +303,6 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
goto give_sigsegv;
}
- install_sigtramp(frame->rs_code, TARGET_NR_rt_sigreturn);
-
tswap_siginfo(&frame->rs_info, info);
__put_user(0, &frame->rs_uc.tuc_flags);
@@ -335,11 +331,13 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
env->active_tc.gpr[ 6] = frame_addr
+ offsetof(struct target_rt_sigframe, rs_uc);
env->active_tc.gpr[29] = frame_addr;
- env->active_tc.gpr[31] = frame_addr
- + offsetof(struct target_rt_sigframe, rs_code);
- /* The original kernel code sets CP0_EPC to the handler
- * since it returns to userland using eret
- * we cannot do this here, and we must set PC directly */
+ env->active_tc.gpr[31] = default_rt_sigreturn;
+
+ /*
+ * The original kernel code sets CP0_EPC to the handler
+ * since it returns to userland using eret
+ * we cannot do this here, and we must set PC directly
+ */
env->active_tc.PC = env->active_tc.gpr[25] = ka->_sa_handler;
mips_set_hflags_isa_mode_from_pc(env);
unlock_user_struct(frame, frame_addr, 1);
@@ -379,3 +377,19 @@ badframe:
force_sig(TARGET_SIGSEGV);
return -TARGET_QEMU_ESIGRETURN;
}
+
+void setup_sigtramp(abi_ulong sigtramp_page)
+{
+ uint32_t *tramp = lock_user(VERIFY_WRITE, sigtramp_page, 2 * 8, 0);
+ assert(tramp != NULL);
+
+#ifdef TARGET_ARCH_HAS_SETUP_FRAME
+ default_sigreturn = sigtramp_page;
+ install_sigtramp(tramp, TARGET_NR_sigreturn);
+#endif
+
+ default_rt_sigreturn = sigtramp_page + 8;
+ install_sigtramp(tramp + 2, TARGET_NR_rt_sigreturn);
+
+ unlock_user(tramp, sigtramp_page, 2 * 8);
+}
--
2.25.1
next prev parent reply other threads:[~2021-09-29 13:27 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-29 13:05 [PATCH v5 00/26] linux-user: Move signal trampolines to new page Richard Henderson
2021-09-29 13:05 ` [PATCH v5 01/26] linux-user: Add infrastructure for a signal trampoline page Richard Henderson
2021-09-29 13:05 ` [PATCH v5 02/26] linux-user/aarch64: Implement setup_sigtramp Richard Henderson
2021-09-29 13:05 ` [PATCH v5 03/26] linux-user/arm: Drop v1 signal frames Richard Henderson
2021-09-29 13:05 ` [PATCH v5 04/26] linux-user/arm: Drop "_v2" from symbols in signal.c Richard Henderson
2021-09-29 13:05 ` [PATCH v5 05/26] linux-user/arm: Implement setup_sigtramp Richard Henderson
2021-09-29 13:45 ` Peter Maydell
2021-09-29 13:05 ` [PATCH v5 06/26] linux-user/alpha: " Richard Henderson
2021-09-29 13:05 ` [PATCH v5 07/26] linux-user/cris: " Richard Henderson
2021-09-29 13:05 ` [PATCH v5 08/26] linux-user/hexagon: " Richard Henderson
2021-09-29 13:05 ` [PATCH v5 09/26] linux-user/hppa: Document non-use of setup_sigtramp Richard Henderson
2021-09-29 13:05 ` [PATCH v5 10/26] linux-user/i386: Implement setup_sigtramp Richard Henderson
2021-09-29 13:05 ` [PATCH v5 11/26] linux-user/x86_64: Raise SIGSEGV if SA_RESTORER not set Richard Henderson
2021-09-29 13:05 ` [PATCH v5 12/26] linux-user/m68k: Implement setup_sigtramp Richard Henderson
2021-09-29 13:05 ` [PATCH v5 13/26] linux-user/microblaze: " Richard Henderson
2021-09-29 13:05 ` [PATCH v5 14/26] linux-user/mips: Tidy install_sigtramp Richard Henderson
2021-09-29 13:05 ` Richard Henderson [this message]
2021-09-29 13:05 ` [PATCH v5 16/26] linux-user/nios2: Document non-use of setup_sigtramp Richard Henderson
2021-09-29 13:05 ` [PATCH v5 17/26] linux-user/openrisc: Implement setup_sigtramp Richard Henderson
2021-09-29 13:05 ` [PATCH v5 18/26] linux-user/ppc: Simplify encode_trampoline Richard Henderson
2021-09-29 13:05 ` [PATCH v5 19/26] linux-user/ppc: Implement setup_sigtramp Richard Henderson
2021-09-29 13:05 ` [PATCH v5 20/26] linux-user/riscv: " Richard Henderson
2021-09-29 13:05 ` [PATCH v5 21/26] linux-user/s390x: " Richard Henderson
2022-04-28 18:15 ` s390x regression - " Ulrich Weigand
2022-04-29 18:14 ` Richard Henderson
2021-09-29 13:05 ` [PATCH v5 22/26] linux-user/sh4: " Richard Henderson
2021-09-29 13:05 ` [PATCH v5 23/26] linux-user/sparc: " Richard Henderson
2021-09-29 13:05 ` [PATCH v5 24/26] linux-user/xtensa: " Richard Henderson
2021-09-29 13:05 ` [PATCH v5 25/26] linux-user: Remove default for TARGET_ARCH_HAS_SIGTRAMP_PAGE Richard Henderson
2021-09-29 13:05 ` [PATCH v5 26/26] tests/tcg/multiarch: Re-enable signals test for most guests Richard Henderson
2021-09-29 13:45 ` Philippe Mathieu-Daudé
2021-10-01 10:04 ` [PATCH v5 00/26] linux-user: Move signal trampolines to new page Laurent Vivier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210929130553.121567-16-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=f4bug@amsat.org \
--cc=laurent@vivier.eu \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).