From: Steven Rostedt <rostedt@goodmis.org>
To: Peter Zijlstra <peterz@infradead.org>
Cc: tglx@linutronix.de, bp@alien8.de, mingo@kernel.org,
luto@kernel.org, torvalds@linux-foundation.org, hpa@zytor.com,
dave.hansen@linux.intel.com, jgross@suse.com,
linux-kernel@vger.kernel.org, zhe.he@windriver.com,
joel@joelfernandes.org, devel@etsukata.com
Subject: Re: [PATCH v2 6/7] x86/entry/64: Remove TRACE_IRQS_*_DEBUG
Date: Wed, 10 Jul 2019 23:24:56 -0400 [thread overview]
Message-ID: <20190710232456.5f2de961@oasis.local.home> (raw)
In-Reply-To: <20190704200050.591915266@infradead.org>
On Thu, 04 Jul 2019 21:56:01 +0200
Peter Zijlstra <peterz@infradead.org> wrote:
> Since INT3/#BP no longer runs on an IST, this workaround is no longer
> required.
>
> Tested by running lockdep+ftrace as described in the initial commit:
>
> 5963e317b1e9 ("ftrace/x86: Do not change stacks in DEBUG when calling lockdep")
It looks like a clean revert, and it passed my ftrace smoke tests with
lockdep enabled (although I triggered a locked warning unrelated to
this, with the text_mutex and module_mutex, but I'm hoping my tree has
the fixes for that).
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Hmm, does this mean we can remove the IDT switching in the NMI handler
as well?
-- Steve
>
> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
> ---
> arch/x86/entry/entry_64.S | 46 ++--------------------------------------------
> 1 file changed, 2 insertions(+), 44 deletions(-)
>
> --- a/arch/x86/entry/entry_64.S
> +++ b/arch/x86/entry/entry_64.S
> @@ -68,44 +68,6 @@ END(native_usergs_sysret64)
> .endm
>
> /*
> - * When dynamic function tracer is enabled it will add a breakpoint
> - * to all locations that it is about to modify, sync CPUs, update
> - * all the code, sync CPUs, then remove the breakpoints. In this time
> - * if lockdep is enabled, it might jump back into the debug handler
> - * outside the updating of the IST protection. (TRACE_IRQS_ON/OFF).
> - *
> - * We need to change the IDT table before calling TRACE_IRQS_ON/OFF to
> - * make sure the stack pointer does not get reset back to the top
> - * of the debug stack, and instead just reuses the current stack.
> - */
> -#if defined(CONFIG_DYNAMIC_FTRACE) && defined(CONFIG_TRACE_IRQFLAGS)
> -
> -.macro TRACE_IRQS_OFF_DEBUG
> - call debug_stack_set_zero
> - TRACE_IRQS_OFF
> - call debug_stack_reset
> -.endm
> -
> -.macro TRACE_IRQS_ON_DEBUG
> - call debug_stack_set_zero
> - TRACE_IRQS_ON
> - call debug_stack_reset
> -.endm
> -
> -.macro TRACE_IRQS_IRETQ_DEBUG
> - btl $9, EFLAGS(%rsp) /* interrupts off? */
> - jnc 1f
> - TRACE_IRQS_ON_DEBUG
> -1:
> -.endm
> -
> -#else
> -# define TRACE_IRQS_OFF_DEBUG TRACE_IRQS_OFF
> -# define TRACE_IRQS_ON_DEBUG TRACE_IRQS_ON
> -# define TRACE_IRQS_IRETQ_DEBUG TRACE_IRQS_IRETQ
> -#endif
> -
> -/*
> * 64-bit SYSCALL instruction entry. Up to 6 arguments in registers.
> *
> * This is the only entry point used for 64-bit system calls. The
> @@ -879,11 +841,7 @@ apicinterrupt IRQ_WORK_VECTOR irq_work
> GET_CR2_INTO(%rdx); /* can clobber %rax */
> .endif
>
> - .if \shift_ist != -1
> - TRACE_IRQS_OFF_DEBUG /* reload IDT in case of recursion */
> - .else
> TRACE_IRQS_OFF
> - .endif
>
> .if \paranoid == 0
> testb $3, CS(%rsp)
> @@ -1292,7 +1250,7 @@ END(paranoid_entry)
> ENTRY(paranoid_exit)
> UNWIND_HINT_REGS
> DISABLE_INTERRUPTS(CLBR_ANY)
> - TRACE_IRQS_OFF_DEBUG
> + TRACE_IRQS_OFF
>
> /* Handle GS depending on FSGSBASE availability */
> ALTERNATIVE "jmp .Lparanoid_exit_checkgs", "nop",X86_FEATURE_FSGSBASE
> @@ -1312,7 +1270,7 @@ ENTRY(paranoid_exit)
> jmp .Lparanoid_exit_restore
>
> .Lparanoid_exit_no_swapgs:
> - TRACE_IRQS_IRETQ_DEBUG
> + TRACE_IRQS_IRETQ
> /* Always restore stashed CR3 value (see paranoid_entry) */
> RESTORE_CR3 scratch_reg=%rbx save_reg=%r14
>
>
next prev parent reply other threads:[~2019-07-11 3:25 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-04 19:55 [PATCH v2 0/7] Tracing vs CR2 (and cleanups) Peter Zijlstra
2019-07-04 19:55 ` [PATCH v2 1/7] x86/paravirt: Make read_cr2() CALLEE_SAVE Peter Zijlstra
2019-07-04 21:49 ` Andy Lutomirski
2019-07-10 19:53 ` Steven Rostedt
2019-07-04 19:55 ` [PATCH v2 2/7] x86/entry/32: Simplify common_exception Peter Zijlstra
2019-07-04 21:51 ` Andy Lutomirski
2019-07-10 20:11 ` Steven Rostedt
2019-07-10 20:14 ` Peter Zijlstra
2019-07-04 19:55 ` [PATCH v2 3/7] x86/entry/64: Simplify idtentry a little Peter Zijlstra
2019-07-04 21:54 ` Andy Lutomirski
2019-07-10 20:23 ` Steven Rostedt
2019-07-04 19:55 ` [PATCH v2 4/7] x86/entry/64: Update comments and sanity tests for create_gap Peter Zijlstra
2019-07-04 21:55 ` Andy Lutomirski
2019-07-10 20:24 ` Steven Rostedt
2019-07-04 19:56 ` [PATCH v2 5/7] x86/mm, tracing: Fix CR2 corruption Peter Zijlstra
2019-07-05 2:18 ` Linus Torvalds
2019-07-05 3:16 ` Andy Lutomirski
2019-07-05 3:27 ` Linus Torvalds
2019-07-05 13:49 ` Peter Zijlstra
2019-07-06 21:41 ` Linus Torvalds
2019-07-06 22:27 ` Steven Rostedt
2019-07-06 22:41 ` Linus Torvalds
2019-07-07 0:08 ` Linus Torvalds
2019-07-07 0:36 ` Andy Lutomirski
2019-07-06 23:50 ` Andy Lutomirski
2019-07-07 3:44 ` Eiichi Tsukata
2019-07-06 11:07 ` Eiichi Tsukata
2019-07-08 7:48 ` Peter Zijlstra
2019-07-08 8:58 ` Eiichi Tsukata
2019-07-08 9:42 ` Eiichi Tsukata
2019-07-09 5:17 ` Eiichi Tsukata
2019-07-07 15:10 ` Andy Lutomirski
2019-07-07 15:11 ` Andy Lutomirski
2019-07-07 18:17 ` Linus Torvalds
2019-07-10 20:27 ` Steven Rostedt
2019-07-11 6:45 ` Greg Kroah-Hartman
2019-07-11 12:12 ` Sasha Levin
2019-07-11 12:21 ` Peter Zijlstra
2019-07-04 19:56 ` [PATCH v2 6/7] x86/entry/64: Remove TRACE_IRQS_*_DEBUG Peter Zijlstra
2019-07-11 3:24 ` Steven Rostedt [this message]
2019-07-11 8:05 ` Peter Zijlstra
2019-07-04 19:56 ` [RFC][PATCH v2 7/7] x86/entry/64: Pull bits into C Peter Zijlstra
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=20190710232456.5f2de961@oasis.local.home \
--to=rostedt@goodmis.org \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=devel@etsukata.com \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=joel@joelfernandes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=zhe.he@windriver.com \
/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).