From nobody Tue Feb 10 01:32:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1525080990554426.0701408428879; Mon, 30 Apr 2018 02:36:30 -0700 (PDT) Received: from localhost ([::1]:58676 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fD5EO-0002RD-Mn for importer@patchew.org; Mon, 30 Apr 2018 05:36:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33295) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fD4qT-0006j8-Lf for qemu-devel@nongnu.org; Mon, 30 Apr 2018 05:11:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fD4qL-0006W5-E9 for qemu-devel@nongnu.org; Mon, 30 Apr 2018 05:11:41 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:54669) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fD4q9-0006KP-GF; Mon, 30 Apr 2018 05:11:21 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.183]) with ESMTPSA (Nemesis) id 0Lr2P5-1ehqkw0Ubb-00ecUp; Mon, 30 Apr 2018 11:11:01 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 30 Apr 2018 11:10:10 +0200 Message-Id: <20180430091037.13878-16-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180430091037.13878-1-laurent@vivier.eu> References: <20180430091037.13878-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:XTF6MqFbrbG56zg8Fhrinjm+pMJfdMyDu+vHc8ce0j0IOaNQlfk cN0XrxCXfd6M8ujSw5ANF3oTnWrbrgSeuhDe+BB1gKLpLcJ6JWWxWiKFuqYiTRXE0Ilftjh tXy8lWcmYGwZB3upXQUdwp+y8AHhx3S+ykNKaX2qqhUrhtVIt+7C+fjOvNv7l9Q2CQk3IFM MSD1DA8US1tDUEPa3PxVQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:NurzIn/iQu4=:d569/aCc+Z6HRm6KHtRxwU bbeG4eCIf9zeWfNSgVDfNnWsKHI6Zwod6O4hmXM3TbrYjKiM8FqzJUGMVr9Oi7bqE97UEK7ca g6hBZqWPirxoHPOnJeSaYPu2/snU6jACljG83oc+rd4k9i2K+I3cEenqaI28APeygfKleKT5+ 94ICJ7HmLwfEm/fuMMoUmGIwl+oOkCSKOdbNj4cUJtD4z58VNzUe6u3WAAOOyBApieZvCOz8r Xv+jMP9jtPWFfTIQlaX67XAVZWTdQm/6RDsHdNyyYTPlLRFhH+d0yeQ9gxcnUrIsMW2MmncdK lp+RFrOc7FgA98sEH0DNd3pKIVLsmjCAL5///HbHpIa9t0weTe8oRILmj6HvxYQA/3+eC0/jI 3rGuJ54kcOVeWzylJBwSICagRAKAhXVZBe9+HICmI8v5NMBVl9/ACNPzk6VHBZsoL3Va5SdxJ G3HLLsgjmnZNvQtV2hCefT2rhHBXMiDAEIdq9Nv73TYjRI6+N/t5sSWyl6Vpg/xgfS+F7hVZh mEHenGtWreTzaM+c3SyUuPShJoiFWZTOUgiuQf4iyj0qyM6eOzecdcSTxmp3oZzgnVhK9kIZ1 xk+mGL0ExQLnB1/FgUPXo5gueWm8PEApUqSefBwbUwfplnOCzF6EhKxJ9QBTw0HsYcUuupoJF fSMkTAv4mErBAPbQJXGp+V1hJtFtdKeLMu3bkUj7bqyZ0Z8kHSNfZUL7GhJwlpetoxmELoa0S eUeaI70MmL/VxKbI X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.75 Subject: [Qemu-devel] [PULL 15/42] linux-user: move riscv signal.c parts to riscv directory X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-s390x@nongnu.org, Riku Voipio , Laurent Vivier , Cornelia Huck Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 No code change, only move code from signal.c to riscv/signal.c, except adding includes and exporting setup_rt_frame(). Signed-off-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Message-Id: <20180424192635.6027-14-laurent@vivier.eu> --- linux-user/riscv/signal.c | 200 +++++++++++++++++++++++++++++++++++= ++++ linux-user/riscv/target_signal.h | 3 + linux-user/signal.c | 197 -----------------------------------= --- 3 files changed, 203 insertions(+), 197 deletions(-) diff --git a/linux-user/riscv/signal.c b/linux-user/riscv/signal.c index 02ca338b6c..718f3a5679 100644 --- a/linux-user/riscv/signal.c +++ b/linux-user/riscv/signal.c @@ -16,3 +16,203 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ +#include "qemu/osdep.h" +#include "qemu.h" +#include "target_signal.h" +#include "signal-common.h" +#include "linux-user/trace.h" + +/* Signal handler invocation must be transparent for the code being + interrupted. Complete CPU (hart) state is saved on entry and restored + before returning from the handler. Process sigmask is also saved to blo= ck + signals while the handler is running. The handler gets its own stack, + which also doubles as storage for the CPU state and sigmask. + + The code below is qemu re-implementation of arch/riscv/kernel/signal.c = */ + +struct target_sigcontext { + abi_long pc; + abi_long gpr[31]; /* x0 is not present, so all offsets must be -1 */ + uint64_t fpr[32]; + uint32_t fcsr; +}; /* cf. riscv-linux:arch/riscv/include/uapi/asm/ptrace.h */ + +struct target_ucontext { + unsigned long uc_flags; + struct target_ucontext *uc_link; + target_stack_t uc_stack; + struct target_sigcontext uc_mcontext; + target_sigset_t uc_sigmask; +}; + +struct target_rt_sigframe { + uint32_t tramp[2]; /* not in kernel, which uses VDSO instead */ + struct target_siginfo info; + struct target_ucontext uc; +}; + +static abi_ulong get_sigframe(struct target_sigaction *ka, + CPURISCVState *regs, size_t framesize) +{ + abi_ulong sp =3D regs->gpr[xSP]; + int onsigstack =3D on_sig_stack(sp); + + /* redzone */ + /* This is the X/Open sanctioned signal stack switching. */ + if ((ka->sa_flags & TARGET_SA_ONSTACK) !=3D 0 && !onsigstack) { + sp =3D target_sigaltstack_used.ss_sp + target_sigaltstack_used.ss_= size; + } + + sp -=3D framesize; + sp &=3D ~3UL; /* align sp on 4-byte boundary */ + + /* If we are on the alternate signal stack and would overflow it, don'= t. + Return an always-bogus address instead so we will die with SIGSEGV.= */ + if (onsigstack && !likely(on_sig_stack(sp))) { + return -1L; + } + + return sp; +} + +static void setup_sigcontext(struct target_sigcontext *sc, CPURISCVState *= env) +{ + int i; + + __put_user(env->pc, &sc->pc); + + for (i =3D 1; i < 32; i++) { + __put_user(env->gpr[i], &sc->gpr[i - 1]); + } + for (i =3D 0; i < 32; i++) { + __put_user(env->fpr[i], &sc->fpr[i]); + } + + uint32_t fcsr =3D csr_read_helper(env, CSR_FCSR); /*riscv_get_fcsr(env= );*/ + __put_user(fcsr, &sc->fcsr); +} + +static void setup_ucontext(struct target_ucontext *uc, + CPURISCVState *env, target_sigset_t *set) +{ + abi_ulong ss_sp =3D (target_ulong)target_sigaltstack_used.ss_sp; + abi_ulong ss_flags =3D sas_ss_flags(env->gpr[xSP]); + abi_ulong ss_size =3D target_sigaltstack_used.ss_size; + + __put_user(0, &(uc->uc_flags)); + __put_user(0, &(uc->uc_link)); + + __put_user(ss_sp, &(uc->uc_stack.ss_sp)); + __put_user(ss_flags, &(uc->uc_stack.ss_flags)); + __put_user(ss_size, &(uc->uc_stack.ss_size)); + + int i; + for (i =3D 0; i < TARGET_NSIG_WORDS; i++) { + __put_user(set->sig[i], &(uc->uc_sigmask.sig[i])); + } + + setup_sigcontext(&uc->uc_mcontext, env); +} + +static inline void install_sigtramp(uint32_t *tramp) +{ + __put_user(0x08b00893, tramp + 0); /* li a7, 139 =3D __NR_rt_sigretur= n */ + __put_user(0x00000073, tramp + 1); /* ecall */ +} + +void setup_rt_frame(int sig, struct target_sigaction *ka, + target_siginfo_t *info, + target_sigset_t *set, CPURISCVState *env) +{ + abi_ulong frame_addr; + struct target_rt_sigframe *frame; + + frame_addr =3D get_sigframe(ka, env, sizeof(*frame)); + trace_user_setup_rt_frame(env, frame_addr); + + if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) { + goto badframe; + } + + setup_ucontext(&frame->uc, env, set); + tswap_siginfo(&frame->info, info); + install_sigtramp(frame->tramp); + + env->pc =3D ka->_sa_handler; + env->gpr[xSP] =3D frame_addr; + env->gpr[xA0] =3D sig; + env->gpr[xA1] =3D frame_addr + offsetof(struct target_rt_sigframe, inf= o); + env->gpr[xA2] =3D frame_addr + offsetof(struct target_rt_sigframe, uc); + env->gpr[xRA] =3D frame_addr + offsetof(struct target_rt_sigframe, tra= mp); + + return; + +badframe: + unlock_user_struct(frame, frame_addr, 1); + if (sig =3D=3D TARGET_SIGSEGV) { + ka->_sa_handler =3D TARGET_SIG_DFL; + } + force_sig(TARGET_SIGSEGV); +} + +static void restore_sigcontext(CPURISCVState *env, struct target_sigcontex= t *sc) +{ + int i; + + __get_user(env->pc, &sc->pc); + + for (i =3D 1; i < 32; ++i) { + __get_user(env->gpr[i], &sc->gpr[i - 1]); + } + for (i =3D 0; i < 32; ++i) { + __get_user(env->fpr[i], &sc->fpr[i]); + } + + uint32_t fcsr; + __get_user(fcsr, &sc->fcsr); + csr_write_helper(env, fcsr, CSR_FCSR); +} + +static void restore_ucontext(CPURISCVState *env, struct target_ucontext *u= c) +{ + sigset_t blocked; + target_sigset_t target_set; + int i; + + target_sigemptyset(&target_set); + for (i =3D 0; i < TARGET_NSIG_WORDS; i++) { + __get_user(target_set.sig[i], &(uc->uc_sigmask.sig[i])); + } + + target_to_host_sigset_internal(&blocked, &target_set); + set_sigmask(&blocked); + + restore_sigcontext(env, &uc->uc_mcontext); +} + +long do_rt_sigreturn(CPURISCVState *env) +{ + struct target_rt_sigframe *frame; + abi_ulong frame_addr; + + frame_addr =3D env->gpr[xSP]; + trace_user_do_sigreturn(env, frame_addr); + if (!lock_user_struct(VERIFY_READ, frame, frame_addr, 1)) { + goto badframe; + } + + restore_ucontext(env, &frame->uc); + + if (do_sigaltstack(frame_addr + offsetof(struct target_rt_sigframe, + uc.uc_stack), 0, get_sp_from_cpustate(env)) =3D=3D -EFAULT) { + goto badframe; + } + + unlock_user_struct(frame, frame_addr, 0); + return -TARGET_QEMU_ESIGRETURN; + +badframe: + unlock_user_struct(frame, frame_addr, 0); + force_sig(TARGET_SIGSEGV); + return 0; +} diff --git a/linux-user/riscv/target_signal.h b/linux-user/riscv/target_sig= nal.h index ce77f752e3..6ac8a88de6 100644 --- a/linux-user/riscv/target_signal.h +++ b/linux-user/riscv/target_signal.h @@ -20,4 +20,7 @@ static inline abi_ulong get_sp_from_cpustate(CPURISCVStat= e *state) return state->gpr[xSP]; } =20 +void setup_rt_frame(int sig, struct target_sigaction *ka, + target_siginfo_t *info, + target_sigset_t *set, CPURISCVState *env); #endif /* TARGET_SIGNAL_H */ diff --git a/linux-user/signal.c b/linux-user/signal.c index 5a3e5bff5e..b42fe4ff93 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -3032,203 +3032,6 @@ sigsegv: return -TARGET_QEMU_ESIGRETURN; } =20 -#elif defined(TARGET_RISCV) - -/* Signal handler invocation must be transparent for the code being - interrupted. Complete CPU (hart) state is saved on entry and restored - before returning from the handler. Process sigmask is also saved to blo= ck - signals while the handler is running. The handler gets its own stack, - which also doubles as storage for the CPU state and sigmask. - - The code below is qemu re-implementation of arch/riscv/kernel/signal.c = */ - -struct target_sigcontext { - abi_long pc; - abi_long gpr[31]; /* x0 is not present, so all offsets must be -1 */ - uint64_t fpr[32]; - uint32_t fcsr; -}; /* cf. riscv-linux:arch/riscv/include/uapi/asm/ptrace.h */ - -struct target_ucontext { - unsigned long uc_flags; - struct target_ucontext *uc_link; - target_stack_t uc_stack; - struct target_sigcontext uc_mcontext; - target_sigset_t uc_sigmask; -}; - -struct target_rt_sigframe { - uint32_t tramp[2]; /* not in kernel, which uses VDSO instead */ - struct target_siginfo info; - struct target_ucontext uc; -}; - -static abi_ulong get_sigframe(struct target_sigaction *ka, - CPURISCVState *regs, size_t framesize) -{ - abi_ulong sp =3D regs->gpr[xSP]; - int onsigstack =3D on_sig_stack(sp); - - /* redzone */ - /* This is the X/Open sanctioned signal stack switching. */ - if ((ka->sa_flags & TARGET_SA_ONSTACK) !=3D 0 && !onsigstack) { - sp =3D target_sigaltstack_used.ss_sp + target_sigaltstack_used.ss_= size; - } - - sp -=3D framesize; - sp &=3D ~3UL; /* align sp on 4-byte boundary */ - - /* If we are on the alternate signal stack and would overflow it, don'= t. - Return an always-bogus address instead so we will die with SIGSEGV.= */ - if (onsigstack && !likely(on_sig_stack(sp))) { - return -1L; - } - - return sp; -} - -static void setup_sigcontext(struct target_sigcontext *sc, CPURISCVState *= env) -{ - int i; - - __put_user(env->pc, &sc->pc); - - for (i =3D 1; i < 32; i++) { - __put_user(env->gpr[i], &sc->gpr[i - 1]); - } - for (i =3D 0; i < 32; i++) { - __put_user(env->fpr[i], &sc->fpr[i]); - } - - uint32_t fcsr =3D csr_read_helper(env, CSR_FCSR); /*riscv_get_fcsr(env= );*/ - __put_user(fcsr, &sc->fcsr); -} - -static void setup_ucontext(struct target_ucontext *uc, - CPURISCVState *env, target_sigset_t *set) -{ - abi_ulong ss_sp =3D (target_ulong)target_sigaltstack_used.ss_sp; - abi_ulong ss_flags =3D sas_ss_flags(env->gpr[xSP]); - abi_ulong ss_size =3D target_sigaltstack_used.ss_size; - - __put_user(0, &(uc->uc_flags)); - __put_user(0, &(uc->uc_link)); - - __put_user(ss_sp, &(uc->uc_stack.ss_sp)); - __put_user(ss_flags, &(uc->uc_stack.ss_flags)); - __put_user(ss_size, &(uc->uc_stack.ss_size)); - - int i; - for (i =3D 0; i < TARGET_NSIG_WORDS; i++) { - __put_user(set->sig[i], &(uc->uc_sigmask.sig[i])); - } - - setup_sigcontext(&uc->uc_mcontext, env); -} - -static inline void install_sigtramp(uint32_t *tramp) -{ - __put_user(0x08b00893, tramp + 0); /* li a7, 139 =3D __NR_rt_sigretur= n */ - __put_user(0x00000073, tramp + 1); /* ecall */ -} - -static void setup_rt_frame(int sig, struct target_sigaction *ka, - target_siginfo_t *info, - target_sigset_t *set, CPURISCVState *env) -{ - abi_ulong frame_addr; - struct target_rt_sigframe *frame; - - frame_addr =3D get_sigframe(ka, env, sizeof(*frame)); - trace_user_setup_rt_frame(env, frame_addr); - - if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) { - goto badframe; - } - - setup_ucontext(&frame->uc, env, set); - tswap_siginfo(&frame->info, info); - install_sigtramp(frame->tramp); - - env->pc =3D ka->_sa_handler; - env->gpr[xSP] =3D frame_addr; - env->gpr[xA0] =3D sig; - env->gpr[xA1] =3D frame_addr + offsetof(struct target_rt_sigframe, inf= o); - env->gpr[xA2] =3D frame_addr + offsetof(struct target_rt_sigframe, uc); - env->gpr[xRA] =3D frame_addr + offsetof(struct target_rt_sigframe, tra= mp); - - return; - -badframe: - unlock_user_struct(frame, frame_addr, 1); - if (sig =3D=3D TARGET_SIGSEGV) { - ka->_sa_handler =3D TARGET_SIG_DFL; - } - force_sig(TARGET_SIGSEGV); -} - -static void restore_sigcontext(CPURISCVState *env, struct target_sigcontex= t *sc) -{ - int i; - - __get_user(env->pc, &sc->pc); - - for (i =3D 1; i < 32; ++i) { - __get_user(env->gpr[i], &sc->gpr[i - 1]); - } - for (i =3D 0; i < 32; ++i) { - __get_user(env->fpr[i], &sc->fpr[i]); - } - - uint32_t fcsr; - __get_user(fcsr, &sc->fcsr); - csr_write_helper(env, fcsr, CSR_FCSR); -} - -static void restore_ucontext(CPURISCVState *env, struct target_ucontext *u= c) -{ - sigset_t blocked; - target_sigset_t target_set; - int i; - - target_sigemptyset(&target_set); - for (i =3D 0; i < TARGET_NSIG_WORDS; i++) { - __get_user(target_set.sig[i], &(uc->uc_sigmask.sig[i])); - } - - target_to_host_sigset_internal(&blocked, &target_set); - set_sigmask(&blocked); - - restore_sigcontext(env, &uc->uc_mcontext); -} - -long do_rt_sigreturn(CPURISCVState *env) -{ - struct target_rt_sigframe *frame; - abi_ulong frame_addr; - - frame_addr =3D env->gpr[xSP]; - trace_user_do_sigreturn(env, frame_addr); - if (!lock_user_struct(VERIFY_READ, frame, frame_addr, 1)) { - goto badframe; - } - - restore_ucontext(env, &frame->uc); - - if (do_sigaltstack(frame_addr + offsetof(struct target_rt_sigframe, - uc.uc_stack), 0, get_sp_from_cpustate(env)) =3D=3D -EFAULT) { - goto badframe; - } - - unlock_user_struct(frame, frame_addr, 0); - return -TARGET_QEMU_ESIGRETURN; - -badframe: - unlock_user_struct(frame, frame_addr, 0); - force_sig(TARGET_SIGSEGV); - return 0; -} - #elif defined(TARGET_HPPA) =20 struct target_sigcontext { --=20 2.14.3