From: Masami Hiramatsu <mhiramat@redhat.com>
To: Ingo Molnar<mingo@elte.hu>, Steven Rostedt <rostedt@goodmis.org>,
lkml<linux-kernel@vger.kernel.org>
Cc: systemtap<systemtap@sources.redhat.com>, kvm<kvm@vger.kernel.org>,
Masami Hiramatsu <mhiramat@redhat.com>,
Harvey Harrison <harvey.harrison@gmail.com>,
Ingo Molnar <mingo@elte.hu>,
Thomas Gleixner <tglx@linutronix.de>,
Jan Blunck <jblunck@suse.de>
Subject: [PATCH -tip v5 5/7] x86: fix kernel_trap_sp()
Date: Sat, 09 May 2009 01:16:00 -0000 [thread overview]
Message-ID: <20090509004904.5505.59034.stgit@localhost.localdomain> (raw)
In-Reply-To: <20090509004829.5505.38720.stgit@localhost.localdomain>
Use ®s->sp instead of regs for getting the top of stack in kernel mode.
(on x86-64, regs->sp always points the top of stack)
[ impact: Oprofile decodes only stack for backtracing on i386 ]
Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jan Blunck <jblunck@suse.de>
---
arch/x86/include/asm/ptrace.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
index 5cdd19f..90b76b3 100644
--- a/arch/x86/include/asm/ptrace.h
+++ b/arch/x86/include/asm/ptrace.h
@@ -187,14 +187,14 @@ static inline int v8086_mode(struct pt_regs *regs)
/*
* X86_32 CPUs don't save ss and esp if the CPU is already in kernel mode
- * when it traps. So regs will be the current sp.
+ * when it traps. So ®s->sp will be the current sp.
*
* This is valid only for kernel mode traps.
*/
static inline unsigned long kernel_trap_sp(struct pt_regs *regs)
{
#ifdef CONFIG_X86_32
- return (unsigned long)regs;
+ return (unsigned long)®s->sp;
#else
return regs->sp;
#endif
--
Masami Hiramatsu
Software Engineer
Hitachi Computer Products (America) Inc.
Software Solutions Division
e-mail: mhiramat@redhat.com
next prev parent reply other threads:[~2009-05-09 1:16 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-09 0:46 [PATCH -tip v5 0/7] tracing: kprobe-based event tracer and x86 instruction decoder Masami Hiramatsu
2009-05-09 0:46 ` [PATCH -tip v5 1/7] x86: instruction decorder API Masami Hiramatsu
2009-05-11 9:27 ` Christoph Hellwig
2009-05-11 14:35 ` Masami Hiramatsu
2009-05-13 8:23 ` Gleb Natapov
2009-05-13 9:35 ` Przemysław Pawełczyk
2009-05-13 9:43 ` Gleb Natapov
2009-05-13 14:34 ` Masami Hiramatsu
2009-05-13 15:20 ` Gleb Natapov
2009-05-09 0:47 ` [PATCH -tip v5 2/7] kprobes: checks probe address is instruction boudary on x86 Masami Hiramatsu
2009-05-11 14:20 ` Steven Rostedt
2009-05-11 14:59 ` Masami Hiramatsu
2009-05-11 15:12 ` Masami Hiramatsu
2009-05-11 15:22 ` Steven Rostedt
2009-05-11 18:19 ` Masami Hiramatsu
2009-05-09 0:47 ` [PATCH -tip v5 3/7] kprobes: cleanup fix_riprel() using insn decoder " Masami Hiramatsu
2009-05-09 1:16 ` [PATCH -tip v5 6/7] x86: add pt_regs register and stack access APIs Masami Hiramatsu
2009-05-09 1:16 ` Masami Hiramatsu [this message]
2009-05-11 9:28 ` [PATCH -tip v5 5/7] x86: fix kernel_trap_sp() Christoph Hellwig
2009-05-11 13:47 ` Masami Hiramatsu
2009-05-09 1:16 ` [PATCH -tip v5 4/7] tracing: add kprobe-based event tracer Masami Hiramatsu
2009-05-09 16:36 ` Frédéric Weisbecker
2009-05-09 17:33 ` Masami Hiramatsu
2009-05-11 21:26 ` Frederic Weisbecker
2009-05-11 9:32 ` Christoph Hellwig
2009-05-11 10:54 ` Ingo Molnar
2009-05-11 15:29 ` Frank Ch. Eigler
2009-05-09 1:16 ` [PATCH -tip v5 7/7] tracing: add arguments support on " Masami Hiramatsu
2009-05-11 14:35 ` Steven Rostedt
2009-05-09 4:43 ` [PATCH -tip v5 0/7] tracing: kprobe-based event tracer and x86 instruction decoder Ingo Molnar
2009-05-11 15:44 ` Masami Hiramatsu
2009-05-11 14:56 ` Steven Rostedt
2009-05-11 20:04 ` Masami Hiramatsu
2009-05-11 21:47 ` Ingo Molnar
2009-05-12 22:01 ` Masami Hiramatsu
2009-05-13 13:22 ` Ingo Molnar
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=20090509004904.5505.59034.stgit@localhost.localdomain \
--to=mhiramat@redhat.com \
--cc=harvey.harrison@gmail.com \
--cc=jblunck@suse.de \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=rostedt@goodmis.org \
--cc=systemtap@sources.redhat.com \
--cc=tglx@linutronix.de \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).