From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: x86@kernel.org, Steven Rostedt <rostedt@goodmis.org>,
Brian Gerst <brgerst@gmail.com>, Juergen Gross <jgross@suse.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Arnd Bergmann <arnd@arndb.de>
Subject: [patch 8/8] x86/entry: Move irqflags tracing to do_int80_syscall_32()
Date: Tue, 25 Feb 2020 23:08:09 +0100 [thread overview]
Message-ID: <20200225221306.026841950@linutronix.de> (raw)
In-Reply-To: 20200225220801.571835584@linutronix.de
which cleans up the ASM maze.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/x86/entry/common.c | 8 +++++++-
arch/x86/entry/entry_32.S | 9 ++-------
arch/x86/entry/entry_64_compat.S | 14 +++++---------
3 files changed, 14 insertions(+), 17 deletions(-)
--- a/arch/x86/entry/common.c
+++ b/arch/x86/entry/common.c
@@ -333,6 +333,7 @@ void do_syscall_64_irqs_on(unsigned long
{
syscall_entry_fixups();
do_syscall_64_irqs_on(nr, regs);
+ trace_hardirqs_on();
}
NOKPROBE_SYMBOL(do_syscall_64);
#endif
@@ -389,6 +390,7 @@ static __always_inline void do_syscall_3
{
syscall_entry_fixups();
do_syscall_32_irqs_on(regs);
+ trace_hardirqs_on();
}
NOKPROBE_SYMBOL(do_int80_syscall_32);
@@ -468,8 +470,12 @@ static __always_inline long do_fast_sysc
/* Returns 0 to return using IRET or 1 to return using SYSEXIT/SYSRETL. */
__visible notrace long do_fast_syscall_32(struct pt_regs *regs)
{
+ long ret;
+
syscall_entry_fixups();
- return do_fast_syscall_32_irqs_on(regs);
+ ret = do_fast_syscall_32_irqs_on(regs);
+ trace_hardirqs_on();
+ return ret;
}
NOKPROBE_SYMBOL(do_fast_syscall_32);
--- a/arch/x86/entry/entry_32.S
+++ b/arch/x86/entry/entry_32.S
@@ -811,8 +811,7 @@ SYM_CODE_START(ret_from_fork)
/* When we fork, we trace the syscall return in the child, too. */
movl %esp, %eax
call syscall_return_slowpath
- STACKLEAK_ERASE
- jmp restore_all_switch_stack
+ jmp .Lsyscall_32_done
/* kernel thread */
1: movl %edi, %eax
@@ -968,8 +967,7 @@ SYM_FUNC_START(entry_SYSENTER_32)
STACKLEAK_ERASE
-/* Opportunistic SYSEXIT */
- TRACE_IRQS_ON /* User mode traces as IRQs on. */
+ /* Opportunistic SYSEXIT */
/*
* Setup entry stack - we keep the pointer in %eax and do the
@@ -1072,11 +1070,8 @@ SYM_FUNC_START(entry_INT80_32)
movl %esp, %eax
call do_int80_syscall_32
.Lsyscall_32_done:
-
STACKLEAK_ERASE
-restore_all:
- TRACE_IRQS_IRET
restore_all_switch_stack:
SWITCH_TO_ENTRY_STACK
CHECK_AND_APPLY_ESPFIX
--- a/arch/x86/entry/entry_64_compat.S
+++ b/arch/x86/entry/entry_64_compat.S
@@ -132,8 +132,8 @@ SYM_FUNC_START(entry_SYSENTER_compat)
movq %rsp, %rdi
call do_fast_syscall_32
/* XEN PV guests always use IRET path */
- ALTERNATIVE "testl %eax, %eax; jz .Lsyscall_32_done", \
- "jmp .Lsyscall_32_done", X86_FEATURE_XENPV
+ ALTERNATIVE "testl %eax, %eax; jz swapgs_restore_regs_and_return_to_usermode", \
+ "jmp swapgs_restore_regs_and_return_to_usermode", X86_FEATURE_XENPV
jmp sysret32_from_system_call
.Lsysenter_fix_flags:
@@ -244,8 +244,8 @@ SYM_INNER_LABEL(entry_SYSCALL_compat_aft
movq %rsp, %rdi
call do_fast_syscall_32
/* XEN PV guests always use IRET path */
- ALTERNATIVE "testl %eax, %eax; jz .Lsyscall_32_done", \
- "jmp .Lsyscall_32_done", X86_FEATURE_XENPV
+ ALTERNATIVE "testl %eax, %eax; jz swapgs_restore_regs_and_return_to_usermode", \
+ "jmp swapgs_restore_regs_and_return_to_usermode", X86_FEATURE_XENPV
/* Opportunistic SYSRET */
sysret32_from_system_call:
@@ -254,7 +254,7 @@ SYM_INNER_LABEL(entry_SYSCALL_compat_aft
* stack. So let's erase the thread stack right now.
*/
STACKLEAK_ERASE
- TRACE_IRQS_ON /* User mode traces as IRQs on. */
+
movq RBX(%rsp), %rbx /* pt_regs->rbx */
movq RBP(%rsp), %rbp /* pt_regs->rbp */
movq EFLAGS(%rsp), %r11 /* pt_regs->flags (in r11) */
@@ -393,9 +393,5 @@ SYM_CODE_START(entry_INT80_compat)
movq %rsp, %rdi
call do_int80_syscall_32
-.Lsyscall_32_done:
-
- /* Go back to user mode. */
- TRACE_IRQS_ON
jmp swapgs_restore_regs_and_return_to_usermode
SYM_CODE_END(entry_INT80_compat)
next prev parent reply other threads:[~2020-02-25 23:30 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-25 22:08 [patch 0/8] x86/entry: Consolidation - Part II Thomas Gleixner
2020-02-25 22:08 ` [patch 1/8] x86/entry/64: Trace irqflags unconditionally on when returing to user space Thomas Gleixner
2020-02-27 19:49 ` Borislav Petkov
2020-02-27 22:45 ` Frederic Weisbecker
2020-02-28 8:58 ` Alexandre Chartre
2020-02-25 22:08 ` [patch 2/8] x86/entry/common: Consolidate syscall entry code Thomas Gleixner
2020-02-27 19:57 ` Borislav Petkov
2020-02-27 22:52 ` Frederic Weisbecker
2020-02-28 8:59 ` Alexandre Chartre
2020-02-25 22:08 ` [patch 3/8] x86/entry/common: Mark syscall entry points notrace/nokprobe Thomas Gleixner
2020-02-27 23:15 ` Frederic Weisbecker
2020-02-28 8:59 ` Alexandre Chartre
2020-02-25 22:08 ` [patch 4/8] x86/entry: Move irq tracing on syscall entry to C-code Thomas Gleixner
2020-02-26 5:43 ` Andy Lutomirski
2020-02-26 8:17 ` Peter Zijlstra
2020-02-26 11:20 ` Andy Lutomirski
2020-02-26 19:51 ` Thomas Gleixner
2020-02-29 14:44 ` Thomas Gleixner
2020-02-29 19:25 ` Andy Lutomirski
2020-02-29 23:58 ` Steven Rostedt
2020-03-01 10:16 ` Thomas Gleixner
2020-03-01 14:37 ` Andy Lutomirski
2020-03-01 15:21 ` Thomas Gleixner
2020-03-01 16:00 ` Andy Lutomirski
2020-03-01 18:12 ` Thomas Gleixner
2020-03-01 18:26 ` Paul E. McKenney
2020-03-01 18:54 ` Andy Lutomirski
2020-03-01 19:30 ` Paul E. McKenney
2020-03-01 19:39 ` Andy Lutomirski
2020-03-01 20:18 ` Paul E. McKenney
2020-03-02 0:35 ` Steven Rostedt
2020-03-02 6:47 ` Masami Hiramatsu
2020-03-02 1:10 ` Joel Fernandes
2020-03-02 2:18 ` Andy Lutomirski
2020-03-02 2:36 ` Joel Fernandes
2020-03-02 5:40 ` Andy Lutomirski
2020-03-02 8:10 ` Thomas Gleixner
2020-03-01 18:23 ` Steven Rostedt
2020-03-01 18:20 ` Steven Rostedt
2020-02-27 23:11 ` Frederic Weisbecker
2020-02-28 9:00 ` Alexandre Chartre
2020-02-25 22:08 ` [patch 5/8] x86/entry/common: Provide trace/kprobe safe exit to user space functions Thomas Gleixner
2020-02-26 5:45 ` Andy Lutomirski
2020-02-26 8:15 ` Peter Zijlstra
2020-02-27 15:43 ` Alexandre Chartre
2020-02-27 15:53 ` Thomas Gleixner
2020-02-25 22:08 ` [patch 6/8] x86/entry: Move irq tracing to syscall_slow_exit_work Thomas Gleixner
2020-02-26 5:47 ` Andy Lutomirski
2020-02-27 16:12 ` Alexandre Chartre
2020-02-25 22:08 ` [patch 7/8] x86/entry: Move irq tracing to prepare_exit_to_user_mode() Thomas Gleixner
2020-02-26 5:50 ` Andy Lutomirski
2020-02-26 19:53 ` Thomas Gleixner
2020-02-26 20:07 ` Andy Lutomirski
2020-02-25 22:08 ` Thomas Gleixner [this message]
2020-02-27 16:46 ` [patch 8/8] x86/entry: Move irqflags tracing to do_int80_syscall_32() Alexandre Chartre
2020-02-28 13:49 ` Thomas Gleixner
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=20200225221306.026841950@linutronix.de \
--to=tglx@linutronix.de \
--cc=arnd@arndb.de \
--cc=brgerst@gmail.com \
--cc=jgross@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=rostedt@goodmis.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).