From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756515AbcCaJ0v (ORCPT ); Thu, 31 Mar 2016 05:26:51 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38152 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756129AbcCaJ0r (ORCPT ); Thu, 31 Mar 2016 05:26:47 -0400 Date: Thu, 31 Mar 2016 02:25:42 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: jolsa@redhat.com, eranian@google.com, linux-kernel@vger.kernel.org, hpa@zytor.com, tglx@linutronix.de, alexander.shishkin@linux.intel.com, jolsa@kernel.org, torvalds@linux-foundation.org, rostedt@goodmis.org, peterz@infradead.org, acme@redhat.com, vincent.weaver@maine.edu, acme@kernel.org, namhyung@kernel.org, mingo@kernel.org Reply-To: jolsa@redhat.com, hpa@zytor.com, tglx@linutronix.de, alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org, eranian@google.com, torvalds@linux-foundation.org, jolsa@kernel.org, rostedt@goodmis.org, acme@redhat.com, acme@kernel.org, vincent.weaver@maine.edu, peterz@infradead.org, mingo@kernel.org, namhyung@kernel.org In-Reply-To: <1458138873-1553-2-git-send-email-jolsa@kernel.org> References: <1458138873-1553-2-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] ftrace/perf: Check sample types only for sampling events Git-Commit-ID: 0a74c5b3d20d2a8693848b6ae4f1a97624f5b781 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: 0a74c5b3d20d2a8693848b6ae4f1a97624f5b781 Gitweb: http://git.kernel.org/tip/0a74c5b3d20d2a8693848b6ae4f1a97624f5b781 Author: Jiri Olsa AuthorDate: Wed, 16 Mar 2016 15:34:29 +0100 Committer: Ingo Molnar CommitDate: Thu, 31 Mar 2016 10:30:45 +0200 ftrace/perf: Check sample types only for sampling events Currently we check sample type for ftrace:function events even if it's not created as a sampling event. That prevents creating ftrace_function event in counting mode. Make sure we check sample types only for sampling events. Before: $ sudo perf stat -e ftrace:function ls ... Performance counter stats for 'ls': ftrace:function 0.001983662 seconds time elapsed After: $ sudo perf stat -e ftrace:function ls ... Performance counter stats for 'ls': 44,498 ftrace:function 0.037534722 seconds time elapsed Suggested-by: Namhyung Kim Signed-off-by: Jiri Olsa Signed-off-by: Peter Zijlstra (Intel) Acked-by: Steven Rostedt Cc: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver Link: http://lkml.kernel.org/r/1458138873-1553-2-git-send-email-jolsa@kernel.org Signed-off-by: Ingo Molnar --- kernel/trace/trace_event_perf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c index 00df25f..e11108f 100644 --- a/kernel/trace/trace_event_perf.c +++ b/kernel/trace/trace_event_perf.c @@ -47,6 +47,9 @@ static int perf_trace_event_perm(struct trace_event_call *tp_event, if (perf_paranoid_tracepoint_raw() && !capable(CAP_SYS_ADMIN)) return -EPERM; + if (!is_sampling_event(p_event)) + return 0; + /* * We don't allow user space callchains for function trace * event, due to issues with page faults while tracing page