From: Namhyung Kim <namhyung@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>,
Ingo Molnar <mingo@kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Namhyung Kim <namhyung.kim@lge.com>,
Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
Oleg Nesterov <oleg@redhat.com>,
Srikar Dronamraju <srikar@linux.vnet.ibm.com>,
"zhangwei(Jovi)" <jovi.zhangwei@huawei.com>,
Tom Zanussi <tom.zanussi@linux.intel.com>
Subject: [PATCH 4/5] tracing/uprobes: Support event triggering
Date: Fri, 17 Jan 2014 17:08:39 +0900 [thread overview]
Message-ID: <1389946120-19610-5-git-send-email-namhyung@kernel.org> (raw)
In-Reply-To: <1389946120-19610-1-git-send-email-namhyung@kernel.org>
Add support for event triggering to uprobes. This is same as kprobes
support added by Tom (plus cleanup by Steven).
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: zhangwei(Jovi) <jovi.zhangwei@huawei.com>
Cc: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
kernel/trace/trace_uprobe.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index 349c6df9e332..01fcb0db75cb 100644
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -776,6 +776,9 @@ static void __uprobe_trace_func(struct trace_uprobe *tu,
if (WARN_ON_ONCE(tu->tp.size + dsize > PAGE_SIZE))
return;
+ if (ftrace_trigger_soft_disabled(ftrace_file))
+ return;
+
esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu));
size = esize + tu->tp.size + dsize;
event = trace_event_buffer_lock_reserve(&buffer, ftrace_file,
@@ -795,8 +798,7 @@ static void __uprobe_trace_func(struct trace_uprobe *tu,
memcpy(data, ucb->buf, tu->tp.size + dsize);
- if (!call_filter_check_discard(call, entry, buffer, event))
- trace_buffer_unlock_commit(buffer, event, 0, 0);
+ event_trigger_unlock_commit(ftrace_file, buffer, event, entry, 0, 0);
}
/* uprobe handler */
--
1.7.11.7
next prev parent reply other threads:[~2014-01-17 8:09 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-17 8:08 [PATCHSET 0/5] tracing/uprobes: Support multi buffer and event trigger Namhyung Kim
2014-01-17 8:08 ` [PATCH 1/5] tracing/uprobes: Rename uprobe_{trace,perf}_print() functions Namhyung Kim
2014-01-17 8:08 ` [PATCH 2/5] tracing/uprobes: Move argument fetching to uprobe_dispatcher() Namhyung Kim
2014-02-06 11:17 ` Masami Hiramatsu
2014-01-17 8:08 ` [PATCH 3/5] tracing/uprobes: Support ftrace_event_file base multibuffer Namhyung Kim
2014-01-17 8:08 ` Namhyung Kim [this message]
2014-01-17 8:08 ` [PATCH 5/5] tracing/uprobes: Support mix of ftrace and perf Namhyung Kim
2014-01-20 2:10 ` [PATCHSET 0/5] tracing/uprobes: Support multi buffer and event trigger zhangwei(Jovi)
2014-01-22 23:59 ` Namhyung Kim
2014-02-03 5:06 ` Namhyung Kim
2014-02-04 1:58 ` Steven Rostedt
2014-02-04 23:31 ` Namhyung Kim
2014-02-06 15:18 ` Steven Rostedt
2014-02-05 1:41 ` 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=1389946120-19610-5-git-send-email-namhyung@kernel.org \
--to=namhyung@kernel.org \
--cc=fweisbec@gmail.com \
--cc=jovi.zhangwei@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@kernel.org \
--cc=namhyung.kim@lge.com \
--cc=oleg@redhat.com \
--cc=rostedt@goodmis.org \
--cc=srikar@linux.vnet.ibm.com \
--cc=tom.zanussi@linux.intel.com \
/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