From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Andrew Morton <akpm@linux-foundation.org>,
Peter Zijlstra <peterz@infradead.org>,
"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
Dave Jones <davej@redhat.com>,
Jan Kiszka <jan.kiszka@siemens.com>,
"H. Peter Anvin" <hpa@linux.intel.com>
Subject: [for-next][PATCH 3/4] x86-32, ftrace: Fix static ftrace when early microcode is enabled
Date: Thu, 05 Sep 2013 21:48:19 -0400 [thread overview]
Message-ID: <20130906014915.433485667@goodmis.org> (raw)
In-Reply-To: 20130906014816.037690469@goodmis.org
[-- Attachment #1: 0003-x86-32-ftrace-Fix-static-ftrace-when-early-microcode.patch --]
[-- Type: text/plain, Size: 1160 bytes --]
From: "H. Peter Anvin" <hpa@linux.intel.com>
Early microcode loading runs C code before paging is enabled on 32
bits. Since ftrace puts a hook into every function, that hook needs
to be safe to execute in the pre-paging environment. This is
currently true for dynamic ftrace but not for static ftrace.
Static ftrace is obsolescent and assumed to not be
performance-critical, so we can simply test that the stack pointer
falls within the valid range of kernel addresses.
Reported-by: Jan Kiszka <jan.kiszka@siemens.com>
Tested-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/x86/kernel/entry_32.S | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index 2cfbc3a..f0dcb0c 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -1176,6 +1176,9 @@ ftrace_restore_flags:
#else /* ! CONFIG_DYNAMIC_FTRACE */
ENTRY(mcount)
+ cmpl $__PAGE_OFFSET, %esp
+ jb ftrace_stub /* Paging not enabled yet? */
+
cmpl $0, function_trace_stop
jne ftrace_stub
--
1.7.10.4
next prev parent reply other threads:[~2013-09-06 1:49 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-06 1:48 [for-next][PATCH 0/4] tracing: Updated changes for 3.12 Steven Rostedt
2013-09-06 1:48 ` [for-next][PATCH 1/4] tracing: Make tracing_cpumask available for all instances Steven Rostedt
2013-09-06 1:48 ` [for-next][PATCH 2/4] ftrace: Fix a slight race in modifying what function callback gets traced Steven Rostedt
2013-09-06 1:48 ` Steven Rostedt [this message]
2013-09-06 1:48 ` [for-next][PATCH 4/4] ftrace/rcu: Do not trace debug_lockdep_rcu_enabled() Steven Rostedt
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=20130906014915.433485667@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=davej@redhat.com \
--cc=fweisbec@gmail.com \
--cc=hpa@linux.intel.com \
--cc=jan.kiszka@siemens.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=peterz@infradead.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