From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: x86@kernel.org, Peter Zijlstra <peterz@infradead.org>,
Andy Lutomirski <luto@kernel.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Marc Zyngier <maz@kernel.org>,
Paolo Bonzini <pbonzini@redhat.com>,
kvm@vger.kernel.org, linux-arch@vger.kernel.org
Subject: [RFC patch 12/15] arm64/entry: Use generic exit to usermode
Date: Thu, 19 Sep 2019 17:03:26 +0200 [thread overview]
Message-ID: <20190919150809.652455369@linutronix.de> (raw)
In-Reply-To: 20190919150314.054351477@linutronix.de
Replace the exit to usermode code with the generic version.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/arm64/include/asm/entry-common.h | 29 +++++++++++++++++++++
arch/arm64/kernel/entry.S | 18 ++-----------
arch/arm64/kernel/signal.c | 45 ----------------------------------
3 files changed, 33 insertions(+), 59 deletions(-)
--- a/arch/arm64/include/asm/entry-common.h
+++ b/arch/arm64/include/asm/entry-common.h
@@ -5,6 +5,35 @@
#ifndef __ASM_ENTRY_COMMON_H
#define __ASM_ENTRY_COMMON_H
+#include <asm/daifflags.h>
+
+#define ARCH_EXIT_TO_USERMODE_WORK (_TIF_FOREIGN_FPSTATE)
+
+static inline void local_irq_enable_exit_to_user(unsigned long ti_work)
+{
+ if (ti_work & _TIF_NEED_RESCHED)
+ local_daif_restore(DAIF_PROCCTX_NOIRQ);
+ else
+ local_daif_restore(DAIF_PROCCTX);
+}
+#define local_irq_enable_exit_to_user local_irq_enable_exit_to_user
+
+static inline void local_irq_disable_exit_to_user(void)
+{
+ local_daif_mask();
+}
+#define local_irq_disable_exit_to_user local_irq_disable_exit_to_user
+
+static inline void arch_exit_to_usermode_work(struct pt_regs *regs,
+ unsigned long ti_work)
+{
+ /* Must this be inside the work loop ? */
+ if (ti_work & _TIF_FOREIGN_FPSTATE)
+ fpsimd_restore_current_state();
+
+}
+#define arch_exit_to_usermode_work arch_exit_to_usermode_work
+
enum ptrace_syscall_dir {
PTRACE_SYSCALL_ENTER = 0,
PTRACE_SYSCALL_EXIT,
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -971,26 +971,14 @@ ENDPROC(el1_error)
ENDPROC(el0_error)
/*
- * Ok, we need to do extra processing, enter the slow path.
- */
-work_pending:
- mov x0, sp // 'regs'
- bl do_notify_resume
-#ifdef CONFIG_TRACE_IRQFLAGS
- bl trace_hardirqs_on // enabled while in userspace
-#endif
- ldr x1, [tsk, #TSK_TI_FLAGS] // re-check for single-step
- b finish_ret_to_user
-/*
* "slow" syscall return path.
*/
ret_to_user:
disable_daif
gic_prio_kentry_setup tmp=x3
- ldr x1, [tsk, #TSK_TI_FLAGS]
- and x2, x1, #_TIF_WORK_MASK
- cbnz x2, work_pending
-finish_ret_to_user:
+ mov x0, sp // 'regs'
+ bl exit_to_usermode
+ ldr x1, [tsk, #TSK_TI_FLAGS] // re-check for single-step
enable_step_tsk x1, x2
#ifdef CONFIG_GCC_PLUGIN_STACKLEAK
bl stackleak_erase
--- a/arch/arm64/kernel/signal.c
+++ b/arch/arm64/kernel/signal.c
@@ -825,7 +825,7 @@ static void handle_signal(struct ksignal
* the kernel can handle, and then we build all the user-level signal handling
* stack-frames in one go after that.
*/
-static void do_signal(struct pt_regs *regs)
+void arch_do_signal(struct pt_regs *regs)
{
unsigned long continue_addr = 0, restart_addr = 0;
int retval = 0;
@@ -896,49 +896,6 @@ static void do_signal(struct pt_regs *re
restore_saved_sigmask();
}
-asmlinkage void do_notify_resume(struct pt_regs *regs,
- unsigned long thread_flags)
-{
- /*
- * The assembly code enters us with IRQs off, but it hasn't
- * informed the tracing code of that for efficiency reasons.
- * Update the trace code with the current status.
- */
- trace_hardirqs_off();
-
- do {
- /* Check valid user FS if needed */
- addr_limit_user_check();
-
- if (thread_flags & _TIF_NEED_RESCHED) {
- /* Unmask Debug and SError for the next task */
- local_daif_restore(DAIF_PROCCTX_NOIRQ);
-
- schedule();
- } else {
- local_daif_restore(DAIF_PROCCTX);
-
- if (thread_flags & _TIF_UPROBE)
- uprobe_notify_resume(regs);
-
- if (thread_flags & _TIF_SIGPENDING)
- do_signal(regs);
-
- if (thread_flags & _TIF_NOTIFY_RESUME) {
- clear_thread_flag(TIF_NOTIFY_RESUME);
- tracehook_notify_resume(regs);
- rseq_handle_notify_resume(NULL, regs);
- }
-
- if (thread_flags & _TIF_FOREIGN_FPSTATE)
- fpsimd_restore_current_state();
- }
-
- local_daif_mask();
- thread_flags = READ_ONCE(current_thread_info()->flags);
- } while (thread_flags & _TIF_WORK_MASK);
-}
-
unsigned long __ro_after_init signal_minsigstksz;
/*
next prev parent reply other threads:[~2019-09-19 15:10 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-19 15:03 [RFC patch 00/15] entry: Provide generic implementation for host and guest entry/exit work Thomas Gleixner
2019-09-19 15:03 ` [RFC patch 01/15] entry: Provide generic syscall entry functionality Thomas Gleixner
2019-09-20 23:38 ` Andy Lutomirski
2019-10-20 11:49 ` Thomas Gleixner
2019-09-23 9:05 ` Mike Rapoport
2019-09-19 15:03 ` [RFC patch 02/15] x86/entry: Remove _TIF_NOHZ from _TIF_WORK_SYSCALL_ENTRY Thomas Gleixner
2019-09-20 23:39 ` Andy Lutomirski
2019-09-23 20:43 ` Thomas Gleixner
2019-09-19 15:03 ` [RFC patch 03/15] x86/entry: Use generic syscall entry function Thomas Gleixner
2019-09-20 23:41 ` Andy Lutomirski
2019-09-23 8:31 ` Peter Zijlstra
2019-09-23 8:40 ` Thomas Gleixner
2019-09-19 15:03 ` [RFC patch 04/15] arm64/entry: " Thomas Gleixner
2019-09-20 12:21 ` Catalin Marinas
2019-09-19 15:03 ` [RFC patch 05/15] entry: Provide generic syscall exit function Thomas Gleixner
2019-09-19 15:03 ` [RFC patch 06/15] x86/entry: Use generic syscall exit functionality Thomas Gleixner
2019-09-19 15:03 ` [RFC patch 07/15] arm64/syscall: Remove obscure flag check Thomas Gleixner
2019-09-20 14:29 ` Catalin Marinas
2019-09-19 15:03 ` [RFC patch 08/15] arm64/syscall: Use generic syscall exit functionality Thomas Gleixner
2019-09-19 15:03 ` [RFC patch 09/15] entry: Provide generic exit to usermode functionality Thomas Gleixner
2019-09-23 8:30 ` Peter Zijlstra
2019-09-19 15:03 ` [RFC patch 10/15] x86/entry: Move irq tracing to C code Thomas Gleixner
2019-09-23 8:47 ` Peter Zijlstra
2019-09-23 10:27 ` Thomas Gleixner
2019-09-23 11:49 ` Peter Zijlstra
2019-09-23 11:55 ` Peter Zijlstra
2019-09-23 12:10 ` Peter Zijlstra
2019-09-23 17:24 ` Andy Lutomirski
2019-09-26 2:59 ` Josh Poimboeuf
2019-09-19 15:03 ` [RFC patch 11/15] x86/entry: Use generic exit to usermode Thomas Gleixner
2019-09-19 15:03 ` Thomas Gleixner [this message]
2019-09-19 15:03 ` [RFC patch 13/15] arm64/entry: Move FPU restore out of exit_to_usermode() loop Thomas Gleixner
2019-09-19 15:03 ` [RFC patch 14/15] workpending: Provide infrastructure for work before entering a guest Thomas Gleixner
2019-09-19 15:40 ` Paolo Bonzini
2019-09-20 11:48 ` Thomas Gleixner
2019-09-23 18:17 ` Andy Lutomirski
2019-09-26 11:35 ` Miroslav Benes
2019-09-19 15:03 ` [RFC patch 15/15] x86/kvm: Use GENERIC_EXIT_WORKPENDING Thomas Gleixner
2019-09-19 15:40 ` Paolo Bonzini
2019-09-20 15:12 ` [RFC patch 00/15] entry: Provide generic implementation for host and guest entry/exit work Mark Rutland
2019-09-23 20:50 ` Thomas Gleixner
2019-09-23 18:18 ` Andy Lutomirski
2019-09-24 6:50 ` Christian Borntraeger
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=20190919150809.652455369@linutronix.de \
--to=tglx@linutronix.de \
--cc=catalin.marinas@arm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mark.rutland@arm.com \
--cc=maz@kernel.org \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=will@kernel.org \
--cc=x86@kernel.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).