From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753693AbbDBMgA (ORCPT ); Thu, 2 Apr 2015 08:36:00 -0400 Received: from terminus.zytor.com ([198.137.202.10]:60883 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752967AbbDBMfw (ORCPT ); Thu, 2 Apr 2015 08:35:52 -0400 Date: Thu, 2 Apr 2015 05:34:48 -0700 From: tip-bot for Alexei Starovoitov Message-ID: 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 Reply-To: namhyung@kernel.org, mingo@kernel.org, a.p.zijlstra@chello.nl, torvalds@linux-foundation.org, masami.hiramatsu.pt@hitachi.com, daniel@iogearbox.net, linux-kernel@vger.kernel.org, hpa@zytor.com, rostedt@goodmis.org, acme@redhat.com, davem@davemloft.net, ast@plumgrid.com, jolsa@redhat.com, tglx@linutronix.de, peterz@infradead.org, akpm@linux-foundation.org, acme@infradead.org In-Reply-To: <1427312966-8434-3-git-send-email-ast@plumgrid.com> References: <1427312966-8434-3-git-send-email-ast@plumgrid.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tracing: Add kprobe flag Git-Commit-ID: 72cbbc8994242b5b43753738c01bf07bf29cb70d X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 72cbbc8994242b5b43753738c01bf07bf29cb70d Gitweb: http://git.kernel.org/tip/72cbbc8994242b5b43753738c01bf07bf29cb70d Author: Alexei Starovoitov AuthorDate: Wed, 25 Mar 2015 12:49:19 -0700 Committer: Ingo Molnar 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 Reviewed-by: Steven Rostedt Reviewed-by: Masami Hiramatsu Cc: Andrew Morton Cc: Arnaldo Carvalho de Melo Cc: Arnaldo Carvalho de Melo Cc: Daniel Borkmann Cc: David S. Miller Cc: Jiri Olsa Cc: Linus Torvalds Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1427312966-8434-3-git-send-email-ast@plumgrid.com Signed-off-by: Ingo Molnar --- 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);