From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751863AbbK2H4M (ORCPT ); Sun, 29 Nov 2015 02:56:12 -0500 Received: from terminus.zytor.com ([198.137.202.10]:39852 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751599AbbK2Hzy (ORCPT ); Sun, 29 Nov 2015 02:55:54 -0500 Date: Sat, 28 Nov 2015 23:55:28 -0800 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: mingo@kernel.org, jolsa@redhat.com, adrian.hunter@intel.com, namhyung@kernel.org, ast@kernel.org, hpa@zytor.com, wangnan0@huawei.com, tglx@linutronix.de, dsahern@gmail.com, acme@redhat.com, linux-kernel@vger.kernel.org Reply-To: ast@kernel.org, namhyung@kernel.org, jolsa@redhat.com, mingo@kernel.org, adrian.hunter@intel.com, acme@redhat.com, dsahern@gmail.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, wangnan0@huawei.com, hpa@zytor.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf list: Add support for PERF_COUNT_SW_BPF_OUT Git-Commit-ID: bae9cc41105b9edd74d68a9636be2ba240e74b9e 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: bae9cc41105b9edd74d68a9636be2ba240e74b9e Gitweb: http://git.kernel.org/tip/bae9cc41105b9edd74d68a9636be2ba240e74b9e Author: Arnaldo Carvalho de Melo AuthorDate: Fri, 27 Nov 2015 15:54:33 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 27 Nov 2015 16:03:46 -0300 perf list: Add support for PERF_COUNT_SW_BPF_OUT When PERF_COUNT_SW_BPF_OUTPUT was added to the kernel we should've added it to tools/perf, where it is used just to list events. This ended up causing a segfault in commands like "perf list stall". Fix it by adding that new software counter. A patch to robustify perf to not segfault when the next counter gets added in the kernel will follow this one. Reported-by: Ingo Molnar Cc: Adrian Hunter Cc: Alexei Starovoitov Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-uya354upi3eprsey6mi5962d@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/parse-events.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index e48d9da..40ae92a 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -124,6 +124,10 @@ struct event_symbol event_symbols_sw[PERF_COUNT_SW_MAX] = { .symbol = "dummy", .alias = "", }, + [PERF_COUNT_SW_BPF_OUTPUT] = { + .symbol = "bpf-output", + .alias = "", + }, }; #define __PERF_EVENT_FIELD(config, name) \