From: Stafford Horne <shorne@gmail.com>
To: Richard Henderson <richard.henderson@linaro.org>
Cc: alex.bennee@linaro.org, qemu-devel@nongnu.org, laurent@vivier.eu
Subject: Re: [PATCH 14/21] linux-user/openrisc: Implement setup_sigtramp
Date: Thu, 17 Jun 2021 09:24:51 +0900 [thread overview]
Message-ID: <YMqWU6IAgNUoXctT@antec> (raw)
In-Reply-To: <20210616011209.1446045-15-richard.henderson@linaro.org>
On Tue, Jun 15, 2021 at 06:12:02PM -0700, Richard Henderson wrote:
> Create and record the rt signal trampoline.
>
> Cc: Stafford Horne <shorne@gmail.com>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Stafford Horne <shorne@gmail.com>
> ---
> linux-user/openrisc/target_signal.h | 2 ++
> linux-user/openrisc/signal.c | 24 ++++++++++++++++--------
> 2 files changed, 18 insertions(+), 8 deletions(-)
>
> diff --git a/linux-user/openrisc/target_signal.h b/linux-user/openrisc/target_signal.h
> index 8283eaf544..077ec3d5e8 100644
> --- a/linux-user/openrisc/target_signal.h
> +++ b/linux-user/openrisc/target_signal.h
> @@ -26,4 +26,6 @@ typedef struct target_sigaltstack {
>
> #include "../generic/signal.h"
>
> +#define TARGET_ARCH_HAS_SIGTRAMP_PAGE 1
> +
> #endif /* OPENRISC_TARGET_SIGNAL_H */
> diff --git a/linux-user/openrisc/signal.c b/linux-user/openrisc/signal.c
> index 5c5640a284..b411b01864 100644
> --- a/linux-user/openrisc/signal.c
> +++ b/linux-user/openrisc/signal.c
> @@ -37,7 +37,6 @@ typedef struct target_ucontext {
> typedef struct target_rt_sigframe {
> struct target_siginfo info;
> target_ucontext uc;
> - uint32_t retcode[4]; /* trampoline code */
> } target_rt_sigframe;
>
> static void restore_sigcontext(CPUOpenRISCState *env, target_sigcontext *sc)
> @@ -115,14 +114,8 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
> __put_user(set->sig[i], &frame->uc.tuc_sigmask.sig[i]);
> }
>
> - /* This is l.ori r11,r0,__NR_sigreturn; l.sys 1; l.nop; l.nop */
> - __put_user(0xa9600000 | TARGET_NR_rt_sigreturn, frame->retcode + 0);
> - __put_user(0x20000001, frame->retcode + 1);
> - __put_user(0x15000000, frame->retcode + 2);
> - __put_user(0x15000000, frame->retcode + 3);
> -
> /* Set up registers for signal handler */
> - cpu_set_gpr(env, 9, frame_addr + offsetof(target_rt_sigframe, retcode));
> + cpu_set_gpr(env, 9, default_rt_sigreturn);
> cpu_set_gpr(env, 3, sig);
> cpu_set_gpr(env, 4, frame_addr + offsetof(target_rt_sigframe, info));
> cpu_set_gpr(env, 5, frame_addr + offsetof(target_rt_sigframe, uc));
> @@ -168,3 +161,18 @@ long do_rt_sigreturn(CPUOpenRISCState *env)
> force_sig(TARGET_SIGSEGV);
> return 0;
> }
> +
> +void setup_sigtramp(abi_ulong sigtramp_page)
> +{
> + uint32_t *tramp = lock_user(VERIFY_WRITE, sigtramp_page, 4 * 4, 0);
> + assert(tramp != NULL);
> +
> + /* This is l.ori r11,r0,__NR_sigreturn; l.sys 1; l.nop; l.nop */
> + __put_user(0xa9600000 | TARGET_NR_rt_sigreturn, tramp + 0);
> + __put_user(0x20000001, tramp + 1);
> + __put_user(0x15000000, tramp + 2);
> + __put_user(0x15000000, tramp + 3);
> +
> + default_rt_sigreturn = sigtramp_page;
> + unlock_user(tramp, sigtramp_page, 4 * 4);
> +}
> --
> 2.25.1
>
next prev parent reply other threads:[~2021-06-17 0:26 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 [this message]
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 ` [PATCH 20/21] linux-user/xtensa: " Richard Henderson
2021-06-16 13:35 ` 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=YMqWU6IAgNUoXctT@antec \
--to=shorne@gmail.com \
--cc=alex.bennee@linaro.org \
--cc=laurent@vivier.eu \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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).