From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752346AbbKYPpm (ORCPT ); Wed, 25 Nov 2015 10:45:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47867 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751915AbbKYPpj (ORCPT ); Wed, 25 Nov 2015 10:45:39 -0500 From: Jiri Olsa To: Steven Rostedt Cc: lkml , David Ahern , Ingo Molnar , Namhyung Kim , Peter Zijlstra , Arnaldo Carvalho de Melo Subject: [PATCH 2/2] ftrace: Check sample types only for sampling events Date: Wed, 25 Nov 2015 16:45:33 +0100 Message-Id: <1448466333-28102-2-git-send-email-jolsa@kernel.org> In-Reply-To: <1448466333-28102-1-git-send-email-jolsa@kernel.org> References: <1448466333-28102-1-git-send-email-jolsa@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently we check sample type for ftrace:function event even if it's not created as sampling event. That prevents creating ftrace_function event in counting mode. Making 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 Signed-off-by: Jiri Olsa --- kernel/trace/trace_event_perf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c index fa1f12ef3ba3..8801b677e668 100644 --- a/kernel/trace/trace_event_perf.c +++ b/kernel/trace/trace_event_perf.c @@ -52,14 +52,14 @@ static int perf_trace_event_perm(struct trace_event_call *tp_event, * event, due to issues with page faults while tracing page * fault handler and its overall trickiness nature. */ - if (!p_event->attr.exclude_callchain_user) + if (is_sampling_event(p_event) && !p_event->attr.exclude_callchain_user) return -EINVAL; /* * Same reason to disable user stack dump as for user space * callchains above. */ - if (p_event->attr.sample_type & PERF_SAMPLE_STACK_USER) + if (is_sampling_event(p_event) && p_event->attr.sample_type & PERF_SAMPLE_STACK_USER) return -EINVAL; } -- 2.4.3