From: Steven Rostedt <rostedt@goodmis.org>
To: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Ingo Molnar <mingo@kernel.org>,
linux-kernel@vger.kernel.org, x86@kernel.org,
Len Brown <lenb@kernel.org>,
linux-acpi@vger.kernel.org, Borislav Petkov <bp@alien8.de>,
"Rafael J . Wysocki" <rjw@rjwysocki.net>,
stable@kernel.org
Subject: Re: [PATCH v3] ftrace/x86/32: fix triple fault with graph tracing and suspend-to-ram
Date: Thu, 13 Apr 2017 19:02:36 -0400 [thread overview]
Message-ID: <20170413190236.7a225767@grimm.local.home> (raw)
In-Reply-To: <5c1272269a580660703ed2eccf44308e790c7a98.1492123841.git.jpoimboe@redhat.com>
On Thu, 13 Apr 2017 17:53:55 -0500
Josh Poimboeuf <jpoimboe@redhat.com> wrote:
> 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 <pmenzel@molgen.mpg.de>
> Tested-by: Paul Menzel <pmenzel@molgen.mpg.de>
> Cc: stable@kernel.org
> Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
This is pretty much the same thing we were talking about before, right?
If so, then:
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
if not, I need to spend more time reviewing it ;-)
-- Steve
> ---
> v3: Added Tested-by: and Cc:stable tags
>
> arch/x86/kernel/ftrace.c | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
> index 9dd546b..a3adf1f 100644
> --- a/arch/x86/kernel/ftrace.c
> +++ b/arch/x86/kernel/ftrace.c
> @@ -995,6 +995,18 @@ 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;
>
next prev parent reply other threads:[~2017-04-13 23:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-13 22:53 [PATCH v3] ftrace/x86/32: fix triple fault with graph tracing and suspend-to-ram Josh Poimboeuf
2017-04-13 23:02 ` Steven Rostedt [this message]
2017-04-14 2:11 ` Josh Poimboeuf
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=20170413190236.7a225767@grimm.local.home \
--to=rostedt@goodmis.org \
--cc=bp@alien8.de \
--cc=jpoimboe@redhat.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=rjw@rjwysocki.net \
--cc=stable@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