All of lore.kernel.org
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Edgar E . Iglesias" <edgar.iglesias@gmail.com>,
	alex.bennee@linaro.org, laurent@vivier.eu
Subject: [PATCH v2 07/23] linux-user/cris: Implement setup_sigtramp
Date: Fri, 18 Jun 2021 12:29:35 -0700	[thread overview]
Message-ID: <20210618192951.125651-8-richard.henderson@linaro.org> (raw)
In-Reply-To: <20210618192951.125651-1-richard.henderson@linaro.org>

Split out setup_sigreturn so that we can continue to
initialize the words on the stack, as documented.
However, use the off-stack trampoline.

Cc: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 linux-user/cris/target_signal.h |  2 ++
 linux-user/cris/signal.c        | 29 +++++++++++++++++++++--------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/linux-user/cris/target_signal.h b/linux-user/cris/target_signal.h
index 495a142896..83a5155507 100644
--- a/linux-user/cris/target_signal.h
+++ b/linux-user/cris/target_signal.h
@@ -22,4 +22,6 @@ typedef struct target_sigaltstack {
 #include "../generic/signal.h"
 
 #define TARGET_ARCH_HAS_SETUP_FRAME
+#define TARGET_ARCH_HAS_SIGTRAMP_PAGE 1
+
 #endif /* CRIS_TARGET_SIGNAL_H */
diff --git a/linux-user/cris/signal.c b/linux-user/cris/signal.c
index 1e02194377..9dad50f31f 100644
--- a/linux-user/cris/signal.c
+++ b/linux-user/cris/signal.c
@@ -96,6 +96,14 @@ static abi_ulong get_sigframe(CPUCRISState *env, int framesize)
     return sp - framesize;
 }
 
+static void setup_sigreturn(uint16_t *retcode)
+{
+    /* This is movu.w __NR_sigreturn, r9; break 13; */
+    __put_user(0x9c5f, retcode + 0);
+    __put_user(TARGET_NR_sigreturn, retcode + 1);
+    __put_user(0xe93d, retcode + 2);
+}
+
 void setup_frame(int sig, struct target_sigaction *ka,
                  target_sigset_t *set, CPUCRISState *env)
 {
@@ -111,14 +119,8 @@ void setup_frame(int sig, struct target_sigaction *ka,
     /*
      * The CRIS signal return trampoline. A real linux/CRIS kernel doesn't
      * use this trampoline anymore but it sets it up for GDB.
-     * In QEMU, using the trampoline simplifies things a bit so we use it.
-     *
-     * This is movu.w __NR_sigreturn, r9; break 13;
      */
-    __put_user(0x9c5f, frame->retcode+0);
-    __put_user(TARGET_NR_sigreturn,
-               frame->retcode + 1);
-    __put_user(0xe93d, frame->retcode + 2);
+    setup_sigreturn(frame->retcode);
 
     /* Save the mask.  */
     __put_user(set->sig[0], &frame->sc.oldmask);
@@ -134,7 +136,7 @@ void setup_frame(int sig, struct target_sigaction *ka,
     env->regs[10] = sig;
     env->pc = (unsigned long) ka->_sa_handler;
     /* Link SRP so the guest returns through the trampoline.  */
-    env->pregs[PR_SRP] = frame_addr + offsetof(typeof(*frame), retcode);
+    env->pregs[PR_SRP] = default_sigreturn;
 
     unlock_user_struct(frame, frame_addr, 1);
     return;
@@ -186,3 +188,14 @@ long do_rt_sigreturn(CPUCRISState *env)
     qemu_log_mask(LOG_UNIMP, "do_rt_sigreturn: not implemented\n");
     return -TARGET_ENOSYS;
 }
+
+void setup_sigtramp(abi_ulong sigtramp_page)
+{
+    uint16_t *tramp = lock_user(VERIFY_WRITE, sigtramp_page, 6, 0);
+    assert(tramp != NULL);
+
+    default_sigreturn = sigtramp_page;
+    setup_sigreturn(tramp);
+
+    unlock_user(tramp, sigtramp_page, 6);
+}
-- 
2.25.1



  parent reply	other threads:[~2021-06-18 19:38 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-18 19:29 [PATCH v2 00/23] linux-user: Move signal trampolines to new page Richard Henderson
2021-06-18 19:29 ` [PATCH v2 01/23] linux-user: Add infrastructure for a signal trampoline page Richard Henderson
2021-06-19  9:33   ` Philippe Mathieu-Daudé
2021-06-29 13:30   ` Peter Maydell
2021-06-18 19:29 ` [PATCH v2 02/23] linux-user/aarch64: Implement setup_sigtramp Richard Henderson
2021-06-29 13:36   ` Peter Maydell
2021-07-01 19:27     ` Richard Henderson
2021-06-18 19:29 ` [PATCH v2 03/23] linux-user/arm: Split out v2_frame Richard Henderson
2021-06-29 13:53   ` Peter Maydell
2021-06-29 14:30     ` Richard Henderson
2021-06-18 19:29 ` [PATCH v2 04/23] linux-user/arm: Force v2 frames for fdpic Richard Henderson
2021-06-29 13:54   ` Peter Maydell
2021-06-18 19:29 ` [PATCH v2 05/23] linux-user/arm: Implement setup_sigtramp Richard Henderson
2021-06-29 14:09   ` Peter Maydell
2021-06-29 18:32     ` Richard Henderson
2021-06-18 19:29 ` [PATCH v2 06/23] linux-user/alpha: " Richard Henderson
2021-06-18 19:29 ` Richard Henderson [this message]
2021-06-19  9:33   ` [PATCH v2 07/23] linux-user/cris: " Philippe Mathieu-Daudé
2021-06-19 12:55     ` Richard Henderson
2021-06-19 14:17       ` Philippe Mathieu-Daudé
2021-06-18 19:29 ` [PATCH v2 08/23] linux-user/hexagon: " Richard Henderson
2021-06-19  9:31   ` Philippe Mathieu-Daudé
2021-06-18 19:29 ` [PATCH v2 09/23] linux-user/hppa: Document non-use of setup_sigtramp Richard Henderson
2021-06-18 19:29 ` [PATCH v2 10/23] linux-user/i386: Implement setup_sigtramp Richard Henderson
2021-06-29 14:40   ` Peter Maydell
2021-06-29 18:30     ` Richard Henderson
2021-06-18 19:29 ` [PATCH v2 11/23] linux-user/m68k: " Richard Henderson
2021-06-18 19:29 ` [PATCH v2 12/23] linux-user/microblaze: " Richard Henderson
2021-06-18 19:29 ` [PATCH v2 13/23] linux-user/mips: Tidy install_sigtramp Richard Henderson
2021-06-19  9:29   ` Philippe Mathieu-Daudé
2021-06-18 19:29 ` [PATCH v2 14/23] linux-user/mips: Implement setup_sigtramp Richard Henderson
2021-06-18 19:29 ` [PATCH v2 15/23] linux-user/nios2: Document non-use of setup_sigtramp Richard Henderson
2021-06-19  9:35   ` Philippe Mathieu-Daudé
2021-06-18 19:29 ` [PATCH v2 16/23] linux-user/openrisc: Implement setup_sigtramp Richard Henderson
2021-06-18 19:29 ` [PATCH v2 17/23] linux-user/ppc: " Richard Henderson
2021-06-29 14:52   ` Peter Maydell
2021-06-18 19:29 ` [PATCH v2 18/23] linux-user/riscv: " Richard Henderson
2021-06-18 19:29 ` [PATCH v2 19/23] linux-user/s390x: " Richard Henderson
2021-06-18 19:29 ` [PATCH v2 20/23] linux-user/sh4: " Richard Henderson
2021-06-18 19:29 ` [PATCH v2 21/23] linux-user/sparc: " Richard Henderson
2021-07-02  9:05   ` Philippe Mathieu-Daudé
2021-06-18 19:29 ` [PATCH v2 22/23] linux-user/xtensa: " Richard Henderson
2021-06-18 19:29 ` [PATCH v2 23/23] linux-user: Remove default for TARGET_ARCH_HAS_SIGTRAMP_PAGE 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=20210618192951.125651-8-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=alex.bennee@linaro.org \
    --cc=edgar.iglesias@gmail.com \
    --cc=laurent@vivier.eu \
    --cc=qemu-devel@nongnu.org \
    --subject='Re: [PATCH v2 07/23] linux-user/cris: Implement setup_sigtramp' \
    /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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.