From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PATCH v2 23/25] linux-user/sparc: Implement sparc32 rt signals
Date: Sun, 25 Apr 2021 19:53:32 -0700 [thread overview]
Message-ID: <20210426025334.1168495-24-richard.henderson@linaro.org> (raw)
In-Reply-To: <20210426025334.1168495-1-richard.henderson@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/sparc/signal.c | 126 ++++++++++++++++++++++++++++++++++++--
1 file changed, 122 insertions(+), 4 deletions(-)
diff --git a/linux-user/sparc/signal.c b/linux-user/sparc/signal.c
index 41a8b33bac..362993da02 100644
--- a/linux-user/sparc/signal.c
+++ b/linux-user/sparc/signal.c
@@ -72,6 +72,18 @@ struct target_signal_frame {
abi_ulong rwin_save;
};
+struct target_rt_signal_frame {
+ struct target_stackf ss;
+ target_siginfo_t info;
+ struct target_pt_regs regs;
+ target_sigset_t mask;
+ abi_ulong fpu_save;
+ uint32_t insns[2];
+ target_stack_t stack;
+ abi_ulong extra_size; /* Should be 0 */
+ abi_ulong rwin_save;
+};
+
static abi_ulong get_sigframe(struct target_sigaction *sa,
CPUSPARCState *env,
size_t framesize)
@@ -284,7 +296,59 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
target_siginfo_t *info,
target_sigset_t *set, CPUSPARCState *env)
{
- qemu_log_mask(LOG_UNIMP, "setup_rt_frame: not implemented\n");
+ abi_ulong sf_addr;
+ struct target_rt_signal_frame *sf;
+ size_t sf_size = sizeof(*sf) + sizeof(struct target_siginfo_fpu);
+
+ sf_addr = get_sigframe(ka, env, sf_size);
+ trace_user_setup_rt_frame(env, sf_addr);
+
+ sf = lock_user(VERIFY_WRITE, sf_addr, sf_size, 0);
+ if (!sf) {
+ force_sigsegv(sig);
+ return;
+ }
+
+ /* 2. Save the current process state */
+ save_reg_win(&sf->ss.win, env);
+ save_pt_regs(&sf->regs, env);
+
+ save_fpu((struct target_siginfo_fpu *)(sf + 1), env);
+ __put_user(sf_addr + sizeof(*sf), &sf->fpu_save);
+
+ __put_user(0, &sf->rwin_save); /* TODO: save_rwin_state */
+
+ tswap_siginfo(&sf->info, info);
+ tswap_sigset(&sf->mask, set);
+ target_save_altstack(&sf->stack, env);
+
+ __put_user(0, &sf->extra_size);
+
+ /* 3. signal handler back-trampoline and parameters */
+ env->regwptr[WREG_SP] = sf_addr;
+ env->regwptr[WREG_O0] = sig;
+ env->regwptr[WREG_O1] =
+ sf_addr + offsetof(struct target_rt_signal_frame, info);
+ env->regwptr[WREG_O2] =
+ sf_addr + offsetof(struct target_rt_signal_frame, regs);
+
+ /* 4. signal handler */
+ env->pc = ka->_sa_handler;
+ env->npc = env->pc + 4;
+
+ /* 5. return to kernel instructions */
+ if (ka->ka_restorer) {
+ env->regwptr[WREG_O7] = ka->ka_restorer;
+ } else {
+ env->regwptr[WREG_O7] =
+ sf_addr + offsetof(struct target_rt_signal_frame, insns) - 2 * 4;
+
+ /* mov __NR_rt_sigreturn, %g1 */
+ __put_user(0x82102065u, &sf->insns[0]);
+ /* t 0x10 */
+ __put_user(0x91d02010u, &sf->insns[1]);
+ }
+ unlock_user(sf, sf_addr, sf_size);
}
long do_sigreturn(CPUSPARCState *env)
@@ -356,9 +420,63 @@ long do_sigreturn(CPUSPARCState *env)
long do_rt_sigreturn(CPUSPARCState *env)
{
- trace_user_do_rt_sigreturn(env, 0);
- qemu_log_mask(LOG_UNIMP, "do_rt_sigreturn: not implemented\n");
- return -TARGET_ENOSYS;
+ abi_ulong sf_addr, tpc, tnpc, ptr;
+ struct target_rt_signal_frame *sf = NULL;
+ sigset_t set;
+
+ sf_addr = get_sp_from_cpustate(env);
+ trace_user_do_rt_sigreturn(env, sf_addr);
+
+ /* 1. Make sure we are not getting garbage from the user */
+ if ((sf_addr & 15) || !lock_user_struct(VERIFY_READ, sf, sf_addr, 1)) {
+ goto segv_and_exit;
+ }
+
+ /* Validate SP alignment. */
+ __get_user(ptr, &sf->regs.u_regs[8 + WREG_SP]);
+ if ((ptr + TARGET_STACK_BIAS) & 7) {
+ goto segv_and_exit;
+ }
+
+ /* Validate PC and NPC alignment. */
+ __get_user(tpc, &sf->regs.pc);
+ __get_user(tnpc, &sf->regs.npc);
+ if ((tpc | tnpc) & 3) {
+ goto segv_and_exit;
+ }
+
+ /* 2. Restore the state */
+ restore_pt_regs(&sf->regs, env);
+
+ __get_user(ptr, &sf->fpu_save);
+ if (ptr) {
+ struct target_siginfo_fpu *fpu;
+ if ((ptr & 7) || !lock_user_struct(VERIFY_READ, fpu, ptr, 1)) {
+ goto segv_and_exit;
+ }
+ restore_fpu(fpu, env);
+ unlock_user_struct(fpu, ptr, 0);
+ }
+
+ __get_user(ptr, &sf->rwin_save);
+ if (ptr) {
+ goto segv_and_exit; /* TODO: restore_rwin_state */
+ }
+
+ target_restore_altstack(&sf->stack, env);
+ target_to_host_sigset(&set, &sf->mask);
+ set_sigmask(&set);
+
+ env->pc = tpc;
+ env->npc = tnpc;
+
+ unlock_user_struct(sf, sf_addr, 0);
+ return -TARGET_QEMU_ESIGRETURN;
+
+ segv_and_exit:
+ unlock_user_struct(sf, sf_addr, 0);
+ force_sig(TARGET_SIGSEGV);
+ return -TARGET_QEMU_ESIGRETURN;
}
#if defined(TARGET_SPARC64) && !defined(TARGET_ABI32)
--
2.25.1
next prev parent reply other threads:[~2021-04-26 3:10 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-26 2:53 [PATCH v2 00/25] linux-user/sparc: Implement rt signals Richard Henderson
2021-04-26 2:53 ` [PATCH v2 01/25] linux-user: Split out target_restore_altstack Richard Henderson
2021-04-26 2:53 ` [PATCH v2 02/25] linux-user: Use target_restore_altstack in all sigreturn Richard Henderson
2021-04-26 2:53 ` [PATCH v2 03/25] linux-user: Pass CPUArchState to do_sigaltstack Richard Henderson
2021-04-26 2:53 ` [PATCH v2 04/25] linux-user: Pass CPUArchState to target_restore_altstack Richard Henderson
2021-04-26 2:53 ` [PATCH v2 05/25] linux-user/sparc: Include TARGET_STACK_BIAS in get_sp_from_cpustate Richard Henderson
2021-04-26 2:53 ` [PATCH v2 06/25] linux-user/sparc: Clean up init_thread Richard Henderson
2021-04-26 2:53 ` [PATCH v2 07/25] linux-user/sparc: Merge sparc64 target_syscall.h Richard Henderson
2021-05-17 10:21 ` Laurent Vivier
2021-05-17 17:35 ` Richard Henderson
2021-04-26 2:53 ` [PATCH v2 08/25] linux-user/sparc: Merge sparc64 target_elf.h Richard Henderson
2021-04-26 2:53 ` [PATCH v2 09/25] linux-user/sparc: Merge sparc64 target_structs.h Richard Henderson
2021-04-26 2:53 ` [PATCH v2 10/25] linux-user/sparc: Merge sparc64 termbits.h Richard Henderson
2021-04-26 2:53 ` [PATCH v2 11/25] linux-user/sparc: Merge sparc64/ into sparc/ Richard Henderson
2021-04-26 2:53 ` [PATCH v2 12/25] linux-user/sparc: Remove target_sigcontext as unused Richard Henderson
2021-04-26 2:53 ` [PATCH v2 13/25] linux-user/sparc: Remove target_rt_signal_frame " Richard Henderson
2021-04-26 2:53 ` [PATCH v2 14/25] linux-user/sparc: Fix the stackframe structure Richard Henderson
2021-04-26 2:53 ` [PATCH v2 15/25] linux-user/sparc: Use target_pt_regs Richard Henderson
2021-04-26 2:53 ` [PATCH v2 16/25] linux-user/sparc: Split out save_reg_win Richard Henderson
2021-04-26 2:53 ` [PATCH v2 17/25] linux-user/sparc: Clean up get_sigframe Richard Henderson
2021-04-26 2:53 ` [PATCH v2 18/25] linux-user/sparc: Save and restore fpu in signal frame Richard Henderson
2021-04-26 2:53 ` [PATCH v2 19/25] linux-user/sparc: Add rwin_save to " Richard Henderson
2021-04-26 2:53 ` [PATCH v2 20/25] linux-user/sparc: Clean up setup_frame Richard Henderson
2021-04-26 2:53 ` [PATCH v2 21/25] linux-user/sparc: Minor corrections to do_sigreturn Richard Henderson
2021-04-26 2:53 ` [PATCH v2 22/25] linux-user/sparc: Add 64-bit support to fpu save/restore Richard Henderson
2021-04-26 2:53 ` Richard Henderson [this message]
2021-04-26 2:53 ` [PATCH v2 24/25] linux-user/sparc: Implement sparc64 rt signals Richard Henderson
2021-04-26 2:53 ` [PATCH v2 25/25] tests/tcg/sparc64: Re-enable linux-test Richard Henderson
2021-04-26 3:06 ` [PATCH v2 00/25] linux-user/sparc: Implement rt signals Richard Henderson
2021-04-26 11:41 ` Alex Bennée
2021-05-15 19:43 ` 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=20210426025334.1168495-24-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--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).