From: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
To: Ingo Molnar <mingo@kernel.org>
Cc: Fenghua Yu <fenghua.yu@intel.com>,
Seiji Aguchi <seiji.aguchi@hds.com>,
Ananth N Mavinakayanahalli <ananth@in.ibm.com>,
x86@kernel.org, lkml <linux-kernel@vger.kernel.org>,
"Steven Rostedt (Red Hat)" <rostedt@goodmis.org>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
Thomas Gleixner <tglx@linutronix.de>,
Borislav Petkov <bp@suse.de>
Subject: [PATCH -tip v2 2/3] [BUGFIX] kprobes/x86: Prohibit probing on debug_stack_*
Date: Fri, 01 Nov 2013 11:25:34 +0000 [thread overview]
Message-ID: <20131101112534.14657.22729.stgit@kbuild-fedora.novalocal> (raw)
In-Reply-To: <20131101112530.14657.87835.stgit@kbuild-fedora.novalocal>
Prohibit probing on debug_stack_reset and debug_stack_set_zero.
Since the both functions are called from TRACE_IRQS_ON/OFF_DEBUG
macros which run in int3 ist entry, probing it may cause a soft
lockup.
This happens when the kernel built with CONFIG_DYNAMIC_FTRACE=y
and CONFIG_TRACE_IRQFLAGS=y.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Seiji Aguchi <seiji.aguchi@hds.com>
---
arch/x86/kernel/cpu/common.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 1789b06..928a4fd 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1157,7 +1157,7 @@ DEFINE_PER_CPU(struct orig_ist, orig_ist);
static DEFINE_PER_CPU(unsigned long, debug_stack_addr);
DEFINE_PER_CPU(int, debug_stack_usage);
-int is_debug_stack(unsigned long addr)
+int nokprobe is_debug_stack(unsigned long addr)
{
return __get_cpu_var(debug_stack_usage) ||
(addr <= __get_cpu_var(debug_stack_addr) &&
@@ -1166,13 +1166,13 @@ int is_debug_stack(unsigned long addr)
DEFINE_PER_CPU(u32, debug_idt_ctr);
-void debug_stack_set_zero(void)
+void nokprobe debug_stack_set_zero(void)
{
this_cpu_inc(debug_idt_ctr);
load_current_idt();
}
-void debug_stack_reset(void)
+void nokprobe debug_stack_reset(void)
{
if (WARN_ON(!this_cpu_read(debug_idt_ctr)))
return;
next prev parent reply other threads:[~2013-11-01 11:25 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-01 11:25 [PATCH -tip v2 0/3] kprobes: introduce nokprobe and updating blacklist Masami Hiramatsu
2013-11-01 11:25 ` [PATCH -tip v2 1/3] kprobes: Introduce nokprobe annotation for non-probe-able functions Masami Hiramatsu
2013-11-01 13:55 ` Steven Rostedt
2013-11-05 1:45 ` Masami Hiramatsu
2013-11-01 11:25 ` Masami Hiramatsu [this message]
2013-11-01 13:56 ` [PATCH -tip v2 2/3] [BUGFIX] kprobes/x86: Prohibit probing on debug_stack_* Steven Rostedt
2013-11-01 11:25 ` [PATCH -tip v2 3/3] [BUGFIX] kprobes: Prohibit probing on func_ptr_is_kernel_text Masami Hiramatsu
2013-11-01 13:57 ` Steven Rostedt
2013-11-05 2:00 ` Steven Rostedt
2013-11-05 3:15 ` Masami Hiramatsu
2013-11-05 6:09 ` Ingo Molnar
2013-11-05 6:59 ` Masami Hiramatsu
2013-11-05 7:05 ` Ingo Molnar
2013-11-05 11:38 ` Masami Hiramatsu
2013-11-05 12:35 ` Masami Hiramatsu
2013-11-06 6:07 ` Ingo Molnar
2013-11-06 10:34 ` Masami Hiramatsu
2013-11-06 11:50 ` Ingo Molnar
2013-11-06 12:21 ` Steven Rostedt
2013-11-05 13:13 ` 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=20131101112534.14657.22729.stgit@kbuild-fedora.novalocal \
--to=masami.hiramatsu.pt@hitachi.com \
--cc=ananth@in.ibm.com \
--cc=bp@suse.de \
--cc=fenghua.yu@intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mingo@redhat.com \
--cc=rostedt@goodmis.org \
--cc=seiji.aguchi@hds.com \
--cc=tglx@linutronix.de \
--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
all inboxes | Powered by JetHome®