perf tests: Fix Track with sched_switch test for hybrid case
Adrian Hunter
reviewercover perf tests: Fix Track with sched_switch test for hybrid case
Hi
Here are a couple of fixes related to the Track with sched_switch test.
Adrian Hunter (2):
perf parse-events: Fix segfault when event parser gets an error perf tests: Fix Track with sched_switch test for hybrid case
tools/perf/tests/switch-tracking.c | 18 +++++++++++++----- tools/perf/util/parse-events.c | 14 +++++++++++--- 2 files changed, 24 insertions(+), 8 deletions(-)
Regards
Adrian
Adrian Hunter
reviewerPATCH 1/2 perf parse-events: Fix segfault when event parser gets an error
parse_events() is often called with parse_events_error set to NULL. Make parse_events_error__handle() not segfault in that case.
--- tools/perf/util/parse-events.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
tools/perf/util/parse-events.c +11 -3
@@ -2391,9 +2391,12 @@ void parse_events_error__exit(struct parse_events_error *err)void parse_events_error__handle (struct parse_events_error *err,int idx,char *str,char *help) { -if (WARN (!str,"WARNING: failed to provide error string\n" )) { -free (help); -return ; +if (WARN (!str,"WARNING: failed to provide error string\n" )) + goto out_free; +if (!err) { +/* Assume caller does not want message printed */ +pr_debug ("event syntax error: %s\n" , str); + goto out_free; }switch (err->num_errors) {case 0 :
@@ -2419,6 +2422,11 @@ void parse_events_error__handle(struct parse_events_error *err, int idx,break ; } err->num_errors++; +return ; + +out_free: +free (str); +free (help); }#define MAX_WIDTH 1000
Signature · 1 line
2.25.1
Adrian Hunter
reviewerPATCH 2/2 perf tests: Fix Track with sched_switch test for hybrid case
In reply to Adrian HunterIf cpu_core PMU event fails to parse, try also cpu_atom PMU event when parsing cycles event.
--- tools/perf/tests/switch-tracking.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
tools/perf/tests/switch-tracking.c +13 -5
@@ -324,6 +324,7 @@ static int process_events(struct evlist *evlist,static int test__switch_tracking (struct test_suite *test__maybe_unused ,int subtest__maybe_unused ) {const char *sched_switch ="sched:sched_switch" ; +const char *cycles ="cycles:u" ;struct switch_tracking switch_tracking = { .tids =NULL , };struct record_opts opts = { .mmap_pages =UINT_MAX ,
@@ -372,12 +373,19 @@ static int test__switch_tracking(struct test_suite *test __maybe_unused, int sub cpu_clocks_evsel =evlist__last (evlist);/* Second event */ -if (perf_pmu__has_hybrid ()) - err =parse_events (evlist,"cpu_core/cycles/u" ,NULL ); -else - err =parse_events (evlist,"cycles:u" ,NULL ); +if (perf_pmu__has_hybrid ()) { + cycles ="cpu_core/cycles/u" ; + err =parse_events (evlist, cycles,NULL ); +if (err) { + cycles ="cpu_atom/cycles/u" ; +pr_debug ("Trying %s\n" , cycles); + err =parse_events (evlist, cycles,NULL ); + } + }else { + err =parse_events (evlist, cycles,NULL ); + }if (err) { -pr_debug ("Failed to parse event cycles:u\n" ); +pr_debug ("Failed to parse event %s\n" , cycles); goto out_err; }
Signature · 1 line
2.25.1
Ian Rogers
reviewerRe: [PATCH 1/2] perf parse-events: Fix segfault when event parser gets an error
In reply to Adrian HunterQuoted 17 lines · Adrian Hunter
parse_events()is often called withparse_events_errorset to NULL. Makeparse_events_error__handle()not segfault in that case.Fixes 43eb05d06679 ("perf tests: Support 'Track with sched_switch' test for hybrid")Signed-off-by Adrian Hunter <[email protected]>--- tools/perf/util/parse-events.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)tools/perf/util/parse-events.c +0
-0@@ -2391,9 +2391,12 @@ void parse_events_error__exit(struct parse_events_error *err)void parse_events_error__handle (struct parse_events_error *err,int idx,char *str,char *help)
tools/perf/util/parse-events.c void parse_events_error__exit(struct parse_events_error *err) · line 2399
Quoted 10 lines
tools/perf/util/parse-events.c +6
-3{ -if (WARN (!str,"WARNING: failed to provide error string\n" )) { -free (help); -return ; +if (WARN (!str,"WARNING: failed to provide error string\n" )) + goto out_free; +if (!err) { +/* Assume caller does not want message printed */ +pr_debug ("event syntax error: %s\n" , str); + goto out_free;
It feels like a simpler invariant (as done elsewhere) to have the caller always pass err and then in the caller to call parse_events_error__exit. Any reason for behavior change?
Thanks,
Ian
Quoted 18 lines
tools/perf/util/parse-events.c +5
-1}switch (err->num_errors) {case 0 :@@ -2419,6 +2422,11 @@ void parse_events_error__handle(struct parse_events_error *err, int idx,break ; } err->num_errors++; +return ; + +out_free: +free (str); +free (help); }#define MAX_WIDTH 1000 --2.25.1
Adrian Hunter
reviewerRe: [PATCH 1/2] perf parse-events: Fix segfault when event parser gets an error
Quoted 25 lines · Ian Rogers
Quoted 24 lines · Adrian Hunter
parse_events()is often called withparse_events_errorset to NULL. Makeparse_events_error__handle()not segfault in that case.Fixes 43eb05d06679 ("perf tests: Support 'Track with sched_switch' test for hybrid")Signed-off-by Adrian Hunter <[email protected]>--- tools/perf/util/parse-events.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)tools/perf/util/parse-events.c +3
-3@@ -2391,9 +2391,12 @@ void parse_events_error__exit(struct parse_events_error *err)void parse_events_error__handle (struct parse_events_error *err,int idx,char *str,char *help) { -if (WARN (!str,"WARNING: failed to provide error string\n" )) { -free (help); -return ; +if (WARN (!str,"WARNING: failed to provide error string\n" )) + goto out_free; +if (!err) {
Quoted 8 lines
tools/perf/util/parse-events.c void parse_events_error__exit(struct parse_events_error *err) · line 2399
Quoted 3 lines
tools/perf/util/parse-events.c +3
-0+/* Assume caller does not want message printed */ +pr_debug ("event syntax error: %s\n" , str); + goto out_free;It feels like a simpler invariant (as done elsewhere) to have the caller always pass err and then in the caller to call
parse_events_error__exit. Any reason for behavior change?
This is a bug fix. More complicated changes can be done separately, if desired, but it is wrong to segfault here in any case.
Quoted 22 lines
Thanks,
IanQuoted 18 lines
tools/perf/util/parse-events.c +5
-1}switch (err->num_errors) {case 0 :@@ -2419,6 +2422,11 @@ void parse_events_error__handle(struct parse_events_error *err, int idx,break ; } err->num_errors++; +return ; + +out_free: +free (str); +free (help); }#define MAX_WIDTH 1000 --2.25.1