From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Subject: [for-next][PATCH 4/5] kprobes: Add IPMODIFY flag to kprobe_ftrace_ops
Date: Tue, 25 Nov 2014 07:13:59 -0500 [thread overview]
Message-ID: <20141125121426.767863973@goodmis.org> (raw)
In-Reply-To: <20141125121355.225538266@goodmis.org>
[-- Attachment #1: 0004-kprobes-Add-IPMODIFY-flag-to-kprobe_ftrace_ops.patch --]
[-- Type: text/plain, Size: 921 bytes --]
From: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Add FTRACE_OPS_FL_IPMODIFY flag to kprobe_ftrace_ops
since kprobes can changes regs->ip.
Link: http://lkml.kernel.org/r/20141121102523.11844.21298.stgit@localhost.localdomain
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
kernel/kprobes.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 3995f546d0f3..831978cebf1d 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -915,7 +915,7 @@ static struct kprobe *alloc_aggr_kprobe(struct kprobe *p)
#ifdef CONFIG_KPROBES_ON_FTRACE
static struct ftrace_ops kprobe_ftrace_ops __read_mostly = {
.func = kprobe_ftrace_handler,
- .flags = FTRACE_OPS_FL_SAVE_REGS,
+ .flags = FTRACE_OPS_FL_SAVE_REGS | FTRACE_OPS_FL_IPMODIFY,
};
static int kprobe_ftrace_enabled;
--
2.1.1
next prev parent reply other threads:[~2014-11-25 12:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-25 12:13 [for-next][PATCH 0/5] ftrace: More stuff for 3.19 Steven Rostedt
2014-11-25 12:13 ` [for-next][PATCH 1/5] tracing/trivial: Fix typos and make an int into a bool Steven Rostedt
2014-11-25 12:13 ` [for-next][PATCH 2/5] kprobes/ftrace: Recover original IP if pre_handler doesnt change it Steven Rostedt
2014-11-25 12:13 ` [for-next][PATCH 3/5] ftrace, kprobes: Support IPMODIFY flag to find IP modify conflict Steven Rostedt
2014-11-25 12:13 ` Steven Rostedt [this message]
2014-11-25 12:14 ` [for-next][PATCH 5/5] ftrace/x86: Have static function tracing always test for function graph 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=20141125121426.767863973@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@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
Powered by JetHome