summaryrefslogtreecommitdiffstats
path: root/tools/perf
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@kernel.org>2018-06-11 05:34:21 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2018-06-25 10:59:36 -0400
commit933ccf2002aaef1037cb676622a694f5390c3d59 (patch)
tree01b7a40d834419220e614d58bbb63aff13569527 /tools/perf
parent143c99f6ac6812d23254e80844d6e34be897d3e1 (diff)
perf tests: Add event parsing error handling to parse events test
Add missing error handling for parse_events calls in test_event function that led to following segfault on s390: running test 52 'intel_pt//u' perf: Segmentation fault ... /lib64/libc.so.6(vasprintf+0xe6) [0x3fffca3f106] /lib64/libc.so.6(asprintf+0x46) [0x3fffca1aa96] ./perf(parse_events_add_pmu+0xb8) [0x80132088] ./perf(parse_events_parse+0xc62) [0x8019529a] ./perf(parse_events+0x98) [0x801341c0] ./perf(test__parse_events+0x48) [0x800cd140] ./perf(cmd_test+0x26a) [0x800bd44a] test child interrupted Adding the struct parse_events_error argument to parse_events call. Also adding parse_events_print_error to get more details on the parsing failures, like: # perf test 6 -v running test 52 'intel_pt//u'failed to parse event 'intel_pt//u', err 1, str 'Cannot find PMU `intel_pt'. Missing kernel support?' event syntax error: 'intel_pt//u' \___ Cannot find PMU `intel_pt'. Missing kernel support? Committer note: Use named initializers in the struct parse_events_error variable to avoid breaking the build on centos5, 6 and others with a similar gcc: cc1: warnings being treated as errors tests/parse-events.c: In function 'test_event': tests/parse-events.c:1696: error: missing initializer tests/parse-events.c:1696: error: (near initialization for 'err.str') Reported-by: Kim Phillips <kim.phillips@arm.com> Signed-off-by: Jiri Olsa <jolsa@kernel.org> Tested-by: Kim Phillips <kim.phillips@arm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Hendrik Brueckner <brueckner@linux.vnet.ibm.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Richter <tmricht@linux.ibm.com> Link: http://lkml.kernel.org/r/20180611093422.1005-1-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
-rw-r--r--tools/perf/tests/parse-events.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
index 7d4077068454..9751e7563a45 100644
--- a/tools/perf/tests/parse-events.c
+++ b/tools/perf/tests/parse-events.c
@@ -1686,6 +1686,7 @@ static struct terms_test test__terms[] = {
1686 1686
1687static int test_event(struct evlist_test *e) 1687static int test_event(struct evlist_test *e)
1688{ 1688{
1689 struct parse_events_error err = { .idx = 0, };
1689 struct perf_evlist *evlist; 1690 struct perf_evlist *evlist;
1690 int ret; 1691 int ret;
1691 1692
@@ -1693,10 +1694,11 @@ static int test_event(struct evlist_test *e)
1693 if (evlist == NULL) 1694 if (evlist == NULL)
1694 return -ENOMEM; 1695 return -ENOMEM;
1695 1696
1696 ret = parse_events(evlist, e->name, NULL); 1697 ret = parse_events(evlist, e->name, &err);
1697 if (ret) { 1698 if (ret) {
1698 pr_debug("failed to parse event '%s', err %d\n", 1699 pr_debug("failed to parse event '%s', err %d, str '%s'\n",
1699 e->name, ret); 1700 e->name, ret, err.str);
1701 parse_events_print_error(&err, e->name);
1700 } else { 1702 } else {
1701 ret = e->check(evlist); 1703 ret = e->check(evlist);
1702 } 1704 }