All of lore.kernel.org
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: alex.bennee@linaro.org, laurent@vivier.eu
Subject: [PATCH 05/21] linux-user/alpha: Implement setup_sigtramp
Date: Tue, 15 Jun 2021 18:11:53 -0700	[thread overview]
Message-ID: <20210616011209.1446045-6-richard.henderson@linaro.org> (raw)
In-Reply-To: <20210616011209.1446045-1-richard.henderson@linaro.org>

Create and record the two signal trampolines.
Use them when the guest does not use ka_restorer.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 linux-user/alpha/target_signal.h |  1 +
 linux-user/alpha/signal.c        | 34 +++++++++++++++++++-------------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/linux-user/alpha/target_signal.h b/linux-user/alpha/target_signal.h
index 250642913e..0b6a39de65 100644
--- a/linux-user/alpha/target_signal.h
+++ b/linux-user/alpha/target_signal.h
@@ -93,6 +93,7 @@ typedef struct target_sigaltstack {
 
 #define TARGET_ARCH_HAS_SETUP_FRAME
 #define TARGET_ARCH_HAS_KA_RESTORER
+#define TARGET_ARCH_HAS_SIGTRAMP_PAGE 1
 
 /* bit-flags */
 #define TARGET_SS_AUTODISARM (1U << 31) /* disable sas during sighandling */
diff --git a/linux-user/alpha/signal.c b/linux-user/alpha/signal.c
index 1129ffeea1..e15f5438c3 100644
--- a/linux-user/alpha/signal.c
+++ b/linux-user/alpha/signal.c
@@ -54,13 +54,11 @@ struct target_ucontext {
 
 struct target_sigframe {
     struct target_sigcontext sc;
-    unsigned int retcode[3];
 };
 
 struct target_rt_sigframe {
     target_siginfo_t info;
     struct target_ucontext uc;
-    unsigned int retcode[3];
 };
 
 #define INSN_MOV_R30_R16        0x47fe0410
@@ -141,12 +139,7 @@ void setup_frame(int sig, struct target_sigaction *ka,
     if (ka->ka_restorer) {
         r26 = ka->ka_restorer;
     } else {
-        __put_user(INSN_MOV_R30_R16, &frame->retcode[0]);
-        __put_user(INSN_LDI_R0 + TARGET_NR_sigreturn,
-                   &frame->retcode[1]);
-        __put_user(INSN_CALLSYS, &frame->retcode[2]);
-        /* imb() */
-        r26 = frame_addr + offsetof(struct target_sigframe, retcode);
+        r26 = default_sigreturn;
     }
 
     unlock_user_struct(frame, frame_addr, 1);
@@ -195,12 +188,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
     if (ka->ka_restorer) {
         r26 = ka->ka_restorer;
     } else {
-        __put_user(INSN_MOV_R30_R16, &frame->retcode[0]);
-        __put_user(INSN_LDI_R0 + TARGET_NR_rt_sigreturn,
-                   &frame->retcode[1]);
-        __put_user(INSN_CALLSYS, &frame->retcode[2]);
-        /* imb(); */
-        r26 = frame_addr + offsetof(struct target_rt_sigframe, retcode);
+        r26 = default_rt_sigreturn;
     }
 
     if (err) {
@@ -268,3 +256,21 @@ 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, 6 * 4, 0);
+    assert(tramp != NULL);
+
+    default_sigreturn = sigtramp_page;
+    __put_user(INSN_MOV_R30_R16, &tramp[0]);
+    __put_user(INSN_LDI_R0 + TARGET_NR_sigreturn, &tramp[1]);
+    __put_user(INSN_CALLSYS, &tramp[2]);
+
+    default_rt_sigreturn = sigtramp_page + 3 * 4;
+    __put_user(INSN_MOV_R30_R16, &tramp[3]);
+    __put_user(INSN_LDI_R0 + TARGET_NR_rt_sigreturn, &tramp[4]);
+    __put_user(INSN_CALLSYS, &tramp[5]);
+
+    unlock_user(tramp, sigtramp_page, 6 * 4);
+}
-- 
2.25.1



  parent reply	other threads:[~2021-06-16  1:22 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 ` Richard Henderson [this message]
2021-06-16 16:56   ` [PATCH 05/21] linux-user/alpha: " 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 ` [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=20210616011209.1446045-6-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=alex.bennee@linaro.org \
    --cc=laurent@vivier.eu \
    --cc=qemu-devel@nongnu.org \
    --subject='Re: [PATCH 05/21] linux-user/alpha: 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.