Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1609906

[PATCH] ftrace/x86: fix x86-32 triple fault with graph tracing and suspend-to-ram

Show all headers | View raw

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 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 <pmenzel@molgen.mpg.de>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
---
 arch/x86/kernel/ftrace.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index 8f3d9cf..1c5c4e2 100644
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -983,6 +983,17 @@ void prepare_ftrace_return(unsigned long self_addr, unsigned long *parent,
 	unsigned long return_hooker = (unsigned long)
 				&return_to_handler;
 
+	/*
+	 * When resuming from suspend-to-ram, this function can be indirectly
+	 * called from early CPU startup code while the CPU is in real mode,
+	 * which would fail miserably.  Make sure the stack pointer is a
+	 * virtual address.
+	 *
+	 * This check isn't as accurate as virt_addr_valid(), but it should be
+	 * good enough for this purpose, and it's fast.
+	 */
+	if (unlikely((long)__builtin_frame_address(0) >= 0)) return;
+
 	if (unlikely(ftrace_graph_is_dead()))
 		return;
 
-- 
2.7.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH] acpi: fix incompatibility with mcount-based function graph tracing Josh Poimboeuf <jpoimboe@redhat.com> - 2017-03-16 15:30 +0100
  Re: [PATCH] acpi: fix incompatibility with mcount-based function  graph tracing Steven Rostedt <rostedt@goodmis.org> - 2017-03-16 15:50 +0100
  Re: [PATCH] acpi: fix incompatibility with mcount-based function  graph tracing Paul Menzel <pmenzel@molgen.mpg.de> - 2017-03-21 21:50 +0100
    Re: [PATCH] acpi: fix incompatibility with mcount-based function  graph tracing Paul Menzel <pmenzel@molgen.mpg.de> - 2017-03-22 01:10 +0100
    Re: [PATCH] acpi: fix incompatibility with mcount-based function  graph tracing Josh Poimboeuf <jpoimboe@redhat.com> - 2017-03-24 19:20 +0100
      Re: [PATCH] acpi: fix incompatibility with mcount-based function  graph tracing Steven Rostedt <rostedt@goodmis.org> - 2017-03-24 19:50 +0100
        Re: [PATCH] acpi: fix incompatibility with mcount-based function graph tracing "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2017-03-25 14:30 +0100
          Re: [PATCH] acpi: fix incompatibility with mcount-based function  graph tracing Josh Poimboeuf <jpoimboe@redhat.com> - 2017-03-27 16:20 +0200
            [PATCH] ftrace/x86: fix x86-32 triple fault with graph tracing and  suspend-to-ram Josh Poimboeuf <jpoimboe@redhat.com> - 2017-03-27 17:00 +0200
              Re: [PATCH] ftrace/x86: fix x86-32 triple fault with graph tracing  and suspend-to-ram Paul Menzel <pmenzel@molgen.mpg.de> - 2017-03-27 17:10 +0200
                Re: [PATCH] ftrace/x86: fix x86-32 triple fault with graph tracing  and suspend-to-ram Steven Rostedt <rostedt@goodmis.org> - 2017-03-27 17:30 +0200
                [PATCH v2] ftrace/x86: fix x86-32 triple fault with graph tracing  and suspend-to-ram Josh Poimboeuf <jpoimboe@redhat.com> - 2017-03-27 17:30 +0200
                Re: [PATCH] ftrace/x86: fix x86-32 triple fault with graph tracing  and suspend-to-ram Paul Menzel <pmenzel@molgen.mpg.de> - 2017-03-28 12:00 +0200
                Re: [PATCH] ftrace/x86: fix x86-32 triple fault with graph tracing  and suspend-to-ram Steven Rostedt <rostedt@goodmis.org> - 2017-03-28 17:50 +0200
                Re: [PATCH] ftrace/x86: fix x86-32 triple fault with graph tracing  and suspend-to-ram Josh Poimboeuf <jpoimboe@redhat.com> - 2017-03-28 18:00 +0200
                Re: [PATCH] ftrace/x86: fix x86-32 triple fault with graph tracing and suspend-to-ram "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2017-03-28 23:20 +0200
                Re: [PATCH] ftrace/x86: fix x86-32 triple fault with graph tracing  and suspend-to-ram Josh Poimboeuf <jpoimboe@redhat.com> - 2017-03-28 23:50 +0200
                Re: [PATCH] ftrace/x86: fix x86-32 triple fault with graph tracing and suspend-to-ram "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2017-03-29 00:00 +0200
            Re: [PATCH] acpi: fix incompatibility with mcount-based function graph tracing "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2017-03-27 19:10 +0200

csiph-web