Skip to content

Commit 34a477e

Browse files
jpoimboeKAGA-KOKO
authored andcommitted
ftrace/x86: Fix triple fault with graph tracing and suspend-to-ram
On x86-32, with CONFIG_FIRMWARE and multiple CPUs, if you enable function graph tracing and then suspend to RAM, it will triple fault and reboot when it resumes. The first fault happens when booting a secondary CPU: startup_32_smp() load_ucode_ap() prepare_ftrace_return() ftrace_graph_is_dead() (accesses 'kill_ftrace_graph') The early head_32.S code calls into load_ucode_ap(), which has an an ftrace hook, so it calls prepare_ftrace_return(), which calls ftrace_graph_is_dead(), which tries to access the global 'kill_ftrace_graph' variable with a virtual address, causing a fault because the CPU is still in real mode. The fix is to add a check in prepare_ftrace_return() to make sure it's running in protected mode before continuing. The check makes sure the stack pointer is a virtual kernel address. It's a bit of a hack, but it's not very intrusive and it works well enough. For reference, here are a few other (more difficult) ways this could have potentially been fixed: - Move startup_32_smp()'s call to load_ucode_ap() down to *after* paging is enabled. (No idea what that would break.) - Track down load_ucode_ap()'s entire callee tree and mark all the functions 'notrace'. (Probably not realistic.) - Pause graph tracing in ftrace_suspend_notifier_call() or bringup_cpu() or __cpu_up(), and ensure that the pause facility can be queried from real mode. Reported-by: Paul Menzel <[email protected]> Signed-off-by: Josh Poimboeuf <[email protected]> Tested-by: Paul Menzel <[email protected]> Reviewed-by: Steven Rostedt (VMware) <[email protected]> Cc: "Rafael J . Wysocki" <[email protected]> Cc: [email protected] Cc: Borislav Petkov <[email protected]> Cc: [email protected] Cc: Len Brown <[email protected]> Link: http://lkml.kernel.org/r/5c1272269a580660703ed2eccf44308e790c7a98.1492123841.git.jpoimboe@redhat.com Signed-off-by: Thomas Gleixner <[email protected]>
1 parent 7f00f38 commit 34a477e

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

arch/x86/kernel/ftrace.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -989,6 +989,18 @@ void prepare_ftrace_return(unsigned long self_addr, unsigned long *parent,
989989
unsigned long return_hooker = (unsigned long)
990990
&return_to_handler;
991991

992+
/*
993+
* When resuming from suspend-to-ram, this function can be indirectly
994+
* called from early CPU startup code while the CPU is in real mode,
995+
* which would fail miserably. Make sure the stack pointer is a
996+
* virtual address.
997+
*
998+
* This check isn't as accurate as virt_addr_valid(), but it should be
999+
* good enough for this purpose, and it's fast.
1000+
*/
1001+
if (unlikely((long)__builtin_frame_address(0) >= 0))
1002+
return;
1003+
9921004
if (unlikely(ftrace_graph_is_dead()))
9931005
return;
9941006

0 commit comments

Comments
 (0)