From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753297AbbCCGWk (ORCPT ); Tue, 3 Mar 2015 01:22:40 -0500 Received: from terminus.zytor.com ([198.137.202.10]:49191 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752569AbbCCGWj (ORCPT ); Tue, 3 Mar 2015 01:22:39 -0500 Date: Mon, 2 Mar 2015 22:22:15 -0800 From: "tip-bot for Suzuki K. Poulose" Message-ID: Cc: hpa@zytor.com, tglx@linutronix.de, suzuki.poulose@arm.com, jolsa@kernel.org, dsahern@gmail.com, acme@redhat.com, linux-kernel@vger.kernel.org, mingo@kernel.org Reply-To: jolsa@kernel.org, acme@redhat.com, dsahern@gmail.com, mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, tglx@linutronix.de, suzuki.poulose@arm.com In-Reply-To: <1423852858-8455-1-git-send-email-suzuki.poulose@arm.com> References: <1423852858-8455-1-git-send-email-suzuki.poulose@arm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf stat: Report unsupported events properly Git-Commit-ID: 3b4331d9a4f2d99603c38bfcac79943b7c6c5439 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: 3b4331d9a4f2d99603c38bfcac79943b7c6c5439 Gitweb: http://git.kernel.org/tip/3b4331d9a4f2d99603c38bfcac79943b7c6c5439 Author: Suzuki K. Poulose AuthorDate: Fri, 13 Feb 2015 18:40:58 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 2 Mar 2015 11:51:17 -0300 perf stat: Report unsupported events properly Commit 1971f59 (perf stat: Use read_counter in read_counter_aggr ) broke the perf stat output for unsupported counters. $ perf stat -v -a -C 0 -e CCI_400/config=24/ sleep 1 Warning: CCI_400/config=24/ event is not supported by the kernel. Performance counter stats for 'system wide': 0 CCI_400/config=24/ 1.080265400 seconds time elapsed Where it used to be : $ perf stat -v -a -C 0 -e CCI_400/config=24/ sleep 1 Warning: CCI_400/config=24/ event is not supported by the kernel. Performance counter stats for 'system wide': CCI_400/config=24/ 1.083840675 seconds time elapsed This patch fixes the issues by checking if the counter is supported, before reading and logging the counter value. Signed-off-by: Suzuki K. Poulose Acked-by: David Ahern Tested-by: David Ahern Cc: Jiri Olsa Link: http://lkml.kernel.org/r/1423852858-8455-1-git-send-email-suzuki.poulose@arm.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-stat.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index e598e4e..d28949d 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -510,6 +510,9 @@ static int read_counter(struct perf_evsel *counter) int ncpus = perf_evsel__nr_cpus(counter); int cpu, thread; + if (!counter->supported) + return -ENOENT; + if (counter->system_wide) nthreads = 1; @@ -1285,7 +1288,7 @@ static void print_counter_aggr(struct perf_evsel *counter, char *prefix) if (prefix) fprintf(output, "%s", prefix); - if (scaled == -1) { + if (scaled == -1 || !counter->supported) { fprintf(output, "%*s%s", csv_output ? 0 : 18, counter->supported ? CNTR_NOT_COUNTED : CNTR_NOT_SUPPORTED,