public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Alexei Starovoitov <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: hpa@zytor.com, masami.hiramatsu.pt@hitachi.com,
	torvalds@linux-foundation.org, linux-kernel@vger.kernel.org,
	daniel@iogearbox.net, a.p.zijlstra@chello.nl,
	namhyung@kernel.org, mingo@kernel.org, acme@infradead.org,
	ast@plumgrid.com, davem@davemloft.net, jolsa@redhat.com,
	tglx@linutronix.de, akpm@linux-foundation.org,
	peterz@infradead.org, acme@redhat.com, rostedt@goodmis.org
Subject: [tip:perf/core] tracing: Add kprobe flag
Date: Thu, 2 Apr 2015 05:34:48 -0700	[thread overview]
Message-ID: <tip-72cbbc8994242b5b43753738c01bf07bf29cb70d@git.kernel.org> (raw)
In-Reply-To: <1427312966-8434-3-git-send-email-ast@plumgrid.com>

Commit-ID:  72cbbc8994242b5b43753738c01bf07bf29cb70d
Gitweb:     http://git.kernel.org/tip/72cbbc8994242b5b43753738c01bf07bf29cb70d
Author:     Alexei Starovoitov <ast@plumgrid.com>
AuthorDate: Wed, 25 Mar 2015 12:49:19 -0700
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Thu, 2 Apr 2015 13:25:49 +0200

tracing: Add kprobe flag

add TRACE_EVENT_FL_KPROBE flag to differentiate kprobe type of
tracepoints, since bpf programs can only be attached to kprobe
type of PERF_TYPE_TRACEPOINT perf events.

Signed-off-by: Alexei Starovoitov <ast@plumgrid.com>
Reviewed-by: Steven Rostedt <rostedt@goodmis.org>
Reviewed-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: David S. Miller <davem@davemloft.net>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1427312966-8434-3-git-send-email-ast@plumgrid.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 include/linux/ftrace_event.h | 3 +++
 kernel/trace/trace_kprobe.c  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index c674ee8..77325e1 100644
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -252,6 +252,7 @@ enum {
 	TRACE_EVENT_FL_WAS_ENABLED_BIT,
 	TRACE_EVENT_FL_USE_CALL_FILTER_BIT,
 	TRACE_EVENT_FL_TRACEPOINT_BIT,
+	TRACE_EVENT_FL_KPROBE_BIT,
 };
 
 /*
@@ -265,6 +266,7 @@ enum {
  *                     it is best to clear the buffers that used it).
  *  USE_CALL_FILTER - For ftrace internal events, don't use file filter
  *  TRACEPOINT    - Event is a tracepoint
+ *  KPROBE        - Event is a kprobe
  */
 enum {
 	TRACE_EVENT_FL_FILTERED		= (1 << TRACE_EVENT_FL_FILTERED_BIT),
@@ -274,6 +276,7 @@ enum {
 	TRACE_EVENT_FL_WAS_ENABLED	= (1 << TRACE_EVENT_FL_WAS_ENABLED_BIT),
 	TRACE_EVENT_FL_USE_CALL_FILTER	= (1 << TRACE_EVENT_FL_USE_CALL_FILTER_BIT),
 	TRACE_EVENT_FL_TRACEPOINT	= (1 << TRACE_EVENT_FL_TRACEPOINT_BIT),
+	TRACE_EVENT_FL_KPROBE		= (1 << TRACE_EVENT_FL_KPROBE_BIT),
 };
 
 struct ftrace_event_call {
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index d73f565..8fa549f 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -1286,7 +1286,7 @@ static int register_kprobe_event(struct trace_kprobe *tk)
 		kfree(call->print_fmt);
 		return -ENODEV;
 	}
-	call->flags = 0;
+	call->flags = TRACE_EVENT_FL_KPROBE;
 	call->class->reg = kprobe_register;
 	call->data = tk;
 	ret = trace_add_event_call(call);

  reply	other threads:[~2015-04-02 12:36 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-25 19:49 [PATCH v11 tip 0/9] tracing: attach eBPF programs to kprobes Alexei Starovoitov
2015-03-25 19:49 ` [PATCH v11 tip 1/9] bpf: make internal bpf API independent of CONFIG_BPF_SYSCALL ifdefs Alexei Starovoitov
2015-04-02 12:34   ` [tip:perf/core] bpf: Make internal bpf API independent of CONFIG_BPF_SYSCALL #ifdefs tip-bot for Daniel Borkmann
2015-03-25 19:49 ` [PATCH v11 tip 2/9] tracing: add kprobe flag Alexei Starovoitov
2015-04-02 12:34   ` tip-bot for Alexei Starovoitov [this message]
2015-03-25 19:49 ` [PATCH v11 tip 3/9] tracing: attach BPF programs to kprobes Alexei Starovoitov
2015-04-02 12:35   ` [tip:perf/core] tracing, perf: Implement BPF programs attached " tip-bot for Alexei Starovoitov
2015-03-25 19:49 ` [PATCH v11 tip 4/9] tracing: allow BPF programs to call bpf_ktime_get_ns() Alexei Starovoitov
2015-04-02 12:35   ` [tip:perf/core] tracing: Allow " tip-bot for Alexei Starovoitov
2015-03-25 19:49 ` [PATCH v11 tip 5/9] tracing: allow BPF programs to call bpf_trace_printk() Alexei Starovoitov
2015-04-02 12:35   ` [tip:perf/core] tracing: Allow " tip-bot for Alexei Starovoitov
2015-03-25 19:49 ` [PATCH v11 tip 6/9] samples: bpf: simple non-portable kprobe filter example Alexei Starovoitov
2015-03-30  0:34   ` Jovi Zhangwei
2015-03-30  0:59     ` Alexei Starovoitov
2015-04-02 12:36   ` [tip:perf/core] samples/bpf: Add " tip-bot for Alexei Starovoitov
2015-03-25 19:49 ` [PATCH v11 tip 7/9] samples: bpf: counting example for kfree_skb and write syscall Alexei Starovoitov
2015-04-02 12:36   ` [tip:perf/core] samples/bpf: Add counting example for kfree_skb() function calls and the write() syscall tip-bot for Alexei Starovoitov
2015-03-25 19:49 ` [PATCH v11 tip 8/9] samples: bpf: IO latency analysis (iosnoop/heatmap) Alexei Starovoitov
2015-04-02 12:36   ` [tip:perf/core] samples/bpf: Add IO latency analysis (iosnoop/ heatmap) tool tip-bot for Alexei Starovoitov
2015-03-25 19:49 ` [PATCH v11 tip 9/9] samples: bpf: kmem_alloc/free tracker Alexei Starovoitov
2015-04-02 12:36   ` [tip:perf/core] samples/bpf: Add kmem_alloc()/free() tracker tool tip-bot for Alexei Starovoitov

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-72cbbc8994242b5b43753738c01bf07bf29cb70d@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@infradead.org \
    --cc=acme@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=ast@plumgrid.com \
    --cc=daniel@iogearbox.net \
    --cc=davem@davemloft.net \
    --cc=hpa@zytor.com \
    --cc=jolsa@redhat.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=namhyung@kernel.org \
    --cc=peterz@infradead.org \
    --cc=rostedt@goodmis.org \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.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