From: tip-bot for Steven Rostedt <rostedt@goodmis.org>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
a.p.zijlstra@chello.nl, fweisbec@gmail.com,
masami.hiramatsu.pt@hitachi.com, rostedt@goodmis.org,
tglx@linutronix.de
Subject: [tip:perf/core] ftrace/x86-64: Allow to change RIP in handlers
Date: Fri, 14 Sep 2012 04:44:23 -0700 [thread overview]
Message-ID: <tip-47d5a5f88b9d25d6464c9b60c28f391e84e3ed65@git.kernel.org> (raw)
In-Reply-To: <20120905143118.10329.5078.stgit@localhost.localdomain>
Commit-ID: 47d5a5f88b9d25d6464c9b60c28f391e84e3ed65
Gitweb: http://git.kernel.org/tip/47d5a5f88b9d25d6464c9b60c28f391e84e3ed65
Author: Steven Rostedt <rostedt@goodmis.org>
AuthorDate: Wed, 5 Sep 2012 23:31:18 +0900
Committer: Steven Rostedt <rostedt@goodmis.org>
CommitDate: Thu, 13 Sep 2012 22:52:10 -0400
ftrace/x86-64: Allow to change RIP in handlers
Allow ftrace handlers to change RIP register (regs->ip)
in handlers. This will allow handlers to call another
function instead of original function.
Link: http://lkml.kernel.org/r/20120905143118.10329.5078.stgit@localhost.localdomain
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/x86/kernel/entry_64.S | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index ed767b7..e9cc2b3 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -165,6 +165,10 @@ GLOBAL(ftrace_regs_call)
movq EFLAGS(%rsp), %rax
movq %rax, SS(%rsp)
+ /* Handlers can change the RIP */
+ movq RIP(%rsp), %rax
+ movq %rax, SS+8(%rsp)
+
/* restore the rest of pt_regs */
movq R15(%rsp), %r15
movq R14(%rsp), %r14
next prev parent reply other threads:[~2012-09-14 11:44 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-05 14:30 [PATCH -tip 0/4][BUGFIX] Fix ftrace-based kprobes Masami Hiramatsu
2012-09-05 14:31 ` [PATCH -tip 1/4] [BUGFIX] ftrace/x86: Adjust x86 regs.ip as like as x86-64 Masami Hiramatsu
2012-09-14 11:42 ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2012-09-05 14:31 ` [PATCH -tip 2/4] [BUGFIX] kprobes/x86: Fix kprobes to collectly handle IP on ftrace Masami Hiramatsu
2012-09-14 11:43 ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2012-09-05 14:31 ` [PATCH -tip 3/4] ftrace/x86-64: Allow to change RIP in handlers Masami Hiramatsu
2012-09-14 11:44 ` tip-bot for Steven Rostedt [this message]
2012-09-05 14:31 ` [PATCH -tip 4/4] [BUGFIX] kprobes/x86: Fix to support jprobes on ftrace-based kprobe Masami Hiramatsu
2012-09-07 8:44 ` Masami Hiramatsu
2012-09-14 11:45 ` [tip:perf/core] " tip-bot for Masami Hiramatsu
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=tip-47d5a5f88b9d25d6464c9b60c28f391e84e3ed65@git.kernel.org \
--to=rostedt@goodmis.org \
--cc=a.p.zijlstra@chello.nl \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@kernel.org \
--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 NNTP newsgroup(s).