From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: Max Filippov <jcmvbkbc@gmail.com>,
alex.bennee@linaro.org, laurent@vivier.eu
Subject: [PATCH 20/21] linux-user/xtensa: Implement setup_sigtramp
Date: Tue, 15 Jun 2021 18:12:08 -0700 [thread overview]
Message-ID: <20210616011209.1446045-21-richard.henderson@linaro.org> (raw)
In-Reply-To: <20210616011209.1446045-1-richard.henderson@linaro.org>
Create and record the rt signal trampoline.
Use it when the guest does not use SA_RESTORER.
Cc: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/xtensa/target_signal.h | 2 ++
linux-user/xtensa/signal.c | 50 ++++++++++++++++++-------------
2 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/linux-user/xtensa/target_signal.h b/linux-user/xtensa/target_signal.h
index c60bf656f6..1c7ee73154 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
diff --git a/linux-user/xtensa/signal.c b/linux-user/xtensa/signal.c
index 72771e1294..fd57481bf5 100644
--- a/linux-user/xtensa/signal.c
+++ b/linux-user/xtensa/signal.c
@@ -163,26 +163,7 @@ 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
+ ra = default_rt_sigreturn;
}
memset(env->regs, 0, sizeof(env->regs));
env->pc = ka->_sa_handler;
@@ -263,3 +244,32 @@ 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);
+
+#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
+
+ default_rt_sigreturn = sigtramp_page;
+ unlock_user(tramp, sigtramp_page, 6);
+}
--
2.25.1
next prev parent reply other threads:[~2021-06-16 1:33 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-16 1:11 [PATCH 00/21] linux-user: Move signal trampolines to new page Richard Henderson
2021-06-16 1:11 ` [PATCH 01/21] linux-user: Add infrastructure for a signal trampoline page Richard Henderson
2021-06-16 13:36 ` Max Filippov
2021-06-16 1:11 ` [PATCH 02/21] linux-user/aarch64: Implement setup_sigtramp Richard Henderson
2021-06-16 17:00 ` Philippe Mathieu-Daudé
2021-06-16 1:11 ` [PATCH 03/21] linux-user/arm: Force v2 frames for fdpic Richard Henderson
2021-06-16 17:01 ` Philippe Mathieu-Daudé
2021-06-16 1:11 ` [PATCH 04/21] linux-user/arm: Implement setup_sigtramp Richard Henderson
2021-06-16 13:46 ` Alex Bennée
2021-06-16 13:49 ` Alex Bennée
2021-06-16 17:40 ` Richard Henderson
2021-06-16 1:11 ` [PATCH 05/21] linux-user/alpha: " Richard Henderson
2021-06-16 16:56 ` Philippe Mathieu-Daudé
2021-06-16 1:11 ` [PATCH 06/21] linux-user/cris: " Richard Henderson
2021-06-16 16:37 ` Philippe Mathieu-Daudé
2021-06-16 1:11 ` [PATCH 07/21] linux-user/hexagon: " Richard Henderson
2021-06-16 8:07 ` Taylor Simpson
2021-06-16 15:05 ` Richard Henderson
2021-06-16 15:50 ` Richard Henderson
2021-06-16 21:37 ` Taylor Simpson
2021-06-16 23:15 ` Richard Henderson
2021-06-16 1:11 ` [PATCH 08/21] linux-user/hppa: Document non-use of setup_sigtramp Richard Henderson
2021-06-16 10:46 ` Philippe Mathieu-Daudé
2021-06-16 21:16 ` Alex Bennée
2021-06-16 1:11 ` [PATCH 09/21] linux-user/i386: Implement setup_sigtramp Richard Henderson
2021-06-16 1:11 ` [PATCH 10/21] linux-user/m68k: " Richard Henderson
2021-06-16 16:42 ` Philippe Mathieu-Daudé
2021-06-16 1:11 ` [PATCH 11/21] linux-user/microblaze: " Richard Henderson
2021-06-16 16:43 ` Philippe Mathieu-Daudé
2021-06-16 1:12 ` [PATCH 12/21] linux-user/mips: " Richard Henderson
2021-06-16 16:48 ` Philippe Mathieu-Daudé
2021-06-16 1:12 ` [PATCH 13/21] linux-user/nios2: Document non-use of setup_sigtramp Richard Henderson
2021-06-16 1:12 ` [PATCH 14/21] linux-user/openrisc: Implement setup_sigtramp Richard Henderson
2021-06-16 16:49 ` Philippe Mathieu-Daudé
2021-06-17 0:24 ` Stafford Horne
2021-06-16 1:12 ` [PATCH 15/21] linux-user/ppc: " Richard Henderson
2021-06-16 1:12 ` [PATCH 16/21] linux-user/riscv: " Richard Henderson
2021-06-16 16:50 ` Philippe Mathieu-Daudé
2021-06-18 1:29 ` Alistair Francis
2021-06-16 1:12 ` [PATCH 17/21] linux-user/s390x: " Richard Henderson
2021-06-16 16:52 ` Philippe Mathieu-Daudé
2021-06-16 1:12 ` [PATCH 18/21] linux-user/sh4: " Richard Henderson
2021-06-16 16:53 ` Philippe Mathieu-Daudé
2021-06-16 1:12 ` [PATCH 19/21] linux-user/sparc: " Richard Henderson
2021-06-16 1:12 ` Richard Henderson [this message]
2021-06-16 13:35 ` [PATCH 20/21] linux-user/xtensa: " Max Filippov
2021-06-16 1:12 ` [PATCH 21/21] linux-user: Remove default for TARGET_ARCH_HAS_SIGTRAMP_PAGE Richard Henderson
2021-06-16 16:54 ` Philippe Mathieu-Daudé
2021-06-16 15:05 ` [PATCH 00/21] linux-user: Move signal trampolines to new page Alex Bennée
2021-06-16 15:09 ` Richard Henderson
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=20210616011209.1446045-21-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=jcmvbkbc@gmail.com \
--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).