2 leak fixes and lower 2 test fails to skips
Ian Rogers
reviewerv2 cover 2 leak fixes and lower 2 test fails to skips
Fix some memory leaks that show up testing as !root. Lower some test failures to skips for the !root case with a skip reason of permissions.
v2: Rebase that also cleans up on the bpf_counter__load error path, as
pointed out by Namhyung.
v1: https://lore.kernel.org/lkml/[email protected]/
Ian Rogers (4):
perf stat: Fix affinity memory leaks on error path
perf test: Fix memory leaks on event-times error paths perf test: Skip not fail tp fields test when insufficient permissions perf test: Skip not fail syscall tp fields test when insufficient
permissions
tools/perf/builtin-stat.c | 2 ++ tools/perf/tests/event-times.c | 5 +-- tools/perf/tests/evsel-tp-sched.c | 40 +++++++++++++-------- tools/perf/tests/openat-syscall-tp-fields.c | 19 +++++++--- 4 files changed, 45 insertions(+), 21 deletions(-)
Signature · 1 line
2.46.1.824.gd892dcdcdd-goog
Ian Rogers
reviewerPATCH v2 1/4 perf stat: Fix affinity memory leaks on error path
Missed cleanup when an error occurs.
--- tools/perf/builtin-stat.c | 2 ++ 1 file changed, 2 insertions(+)
tools/perf/builtin-stat.c +2 -0
@@ -827,6 +827,7 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx) } }affinity__cleanup (affinity); + affinity =NULL ;evlist__for_each_entry (evsel_list, counter) {if (!counter->supported) {
@@ -965,6 +966,7 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)if (forks)evlist__cancel_workload (evsel_list); +affinity__cleanup (affinity);return err; }
Signature · 1 line
2.46.1.824.gd892dcdcdd-goog
Namhyung Kim
maintainerRe: [PATCH v2 1/4] perf stat: Fix affinity memory leaks on error path
Quoted 21 lines · Ian Rogers
Missed cleanup when an error occurs.
Fixes 49de179577e7 ("perf stat: No need to setup affinities when starting a workload")Signed-off-by Ian Rogers <[email protected]>--- tools/perf/builtin-stat.c | 2 ++ 1 file changed, 2 insertions(+)tools/perf/builtin-stat.c +1
-0@@ -827,6 +827,7 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx) } }affinity__cleanup (affinity); + affinity =NULL ;evlist__for_each_entry (evsel_list, counter) {if (!counter->supported) {
tools/perf/builtin-stat.c static int __run_perf_stat(int argc, const char **argv, int run_idx) · line 970
Quoted 5 lines
tools/perf/builtin-stat.c +1
-0@@ -965,6 +966,7 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)if (forks)evlist__cancel_workload (evsel_list); +affinity__cleanup (affinity);return err;
Much better now, thanks!
Namhyung
Quoted 5 lines
tools/perf/builtin-stat.c +0
-0}Signature · 1 line
2.46.1.824.gd892dcdcdd-goog
Ian Rogers
reviewerPATCH v2 2/4 perf test: Fix memory leaks on event-times error paths
In reply to Ian RogersThese error paths occur without sufficient permissions. Fix the memory leaks to make leak sanitizer happier.
--- tools/perf/tests/event-times.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
tools/perf/tests/event-times.c +3 -2
@@ -126,6 +126,7 @@ static int attach__cpu_disabled(struct evlist *evlist) evsel->core.attr.disabled =1 ; err =evsel__open_per_cpu (evsel, cpus,-1 ); +perf_cpu_map__put (cpus);if (err) {if (err == -EACCES )return TEST_SKIP ;
@@ -134,7 +135,6 @@ static int attach__cpu_disabled(struct evlist *evlist)return err; } -perf_cpu_map__put (cpus);return evsel__enable (evsel); }
@@ -153,10 +153,10 @@ static int attach__cpu_enabled(struct evlist *evlist) } err =evsel__open_per_cpu (evsel, cpus,-1 ); +perf_cpu_map__put (cpus);if (err == -EACCES )return TEST_SKIP ; -perf_cpu_map__put (cpus);return err ?TEST_FAIL :TEST_OK ; }
@@ -188,6 +188,7 @@ static int test_times(int (attach)(struct evlist *), err =attach (evlist);if (err ==TEST_SKIP ) {pr_debug (" SKIP : not enough rights\n" ); +evlist__delete (evlist);return err; }
Signature · 1 line
2.46.1.824.gd892dcdcdd-goog
Ian Rogers
reviewerPATCH v2 3/4 perf test: Skip not fail tp fields test when insufficient permissions
In reply to Ian RogersClean up return value to be TEST_* rather than unspecific integer. Add test case skip reason. Skip test if EACCES comes back from evsel__newtp.
--- tools/perf/tests/evsel-tp-sched.c | 40 +++++++++++++++++++------------ 1 file changed, 25 insertions(+), 15 deletions(-)
tools/perf/tests/evsel-tp-sched.c +25 -15
@@ -36,33 +36,33 @@ static int test__perf_evsel__tp_sched_test(struct test_suite *test __maybe_unuse int subtest __maybe_unused) {struct evsel *evsel =evsel__newtp ("sched" ,"sched_switch" ); -int ret =0 ; +int ret =TEST_OK ;if (IS_ERR (evsel)) {pr_debug ("evsel__newtp failed with %ld\n" ,PTR_ERR (evsel)); -return -1 ; +return PTR_ERR (evsel) == -EACCES ?TEST_SKIP :TEST_FAIL ; }if (evsel__test_field (evsel,"prev_comm" ,16 , false)) - ret =-1 ; + ret =TEST_FAIL ;if (evsel__test_field (evsel,"prev_pid" ,4 , true)) - ret =-1 ; + ret =TEST_FAIL ;if (evsel__test_field (evsel,"prev_prio" ,4 , true)) - ret =-1 ; + ret =TEST_FAIL ;if (evsel__test_field (evsel,"prev_state" ,sizeof (long ), true)) - ret =-1 ; + ret =TEST_FAIL ;if (evsel__test_field (evsel,"next_comm" ,16 , false)) - ret =-1 ; + ret =TEST_FAIL ;if (evsel__test_field (evsel,"next_pid" ,4 , true)) - ret =-1 ; + ret =TEST_FAIL ;if (evsel__test_field (evsel,"next_prio" ,4 , true)) - ret =-1 ; + ret =TEST_FAIL ;evsel__delete (evsel);
@@ -70,23 +70,33 @@ static int test__perf_evsel__tp_sched_test(struct test_suite *test __maybe_unuseif (IS_ERR (evsel)) {pr_debug ("evsel__newtp failed with %ld\n" ,PTR_ERR (evsel)); -return -1 ; +return TEST_FAIL ; }if (evsel__test_field (evsel,"comm" ,16 , false)) - ret =-1 ; + ret =TEST_FAIL ;if (evsel__test_field (evsel,"pid" ,4 , true)) - ret =-1 ; + ret =TEST_FAIL ;if (evsel__test_field (evsel,"prio" ,4 , true)) - ret =-1 ; + ret =TEST_FAIL ;if (evsel__test_field (evsel,"target_cpu" ,4 , true)) - ret =-1 ; + ret =TEST_FAIL ;evsel__delete (evsel);return ret; } -DEFINE_SUITE ("Parse sched tracepoints fields" , perf_evsel__tp_sched_test); +static struct test_case tests__perf_evsel__tp_sched_test[] = { +TEST_CASE_REASON ("Parse sched tracepoints fields" , + perf_evsel__tp_sched_test, +"permissions" ), + { .name =NULL , } +}; + +struct test_suite suite__perf_evsel__tp_sched_test = { + .desc ="Parse sched tracepoints fields" , + .test_cases = tests__perf_evsel__tp_sched_test, +};
Signature · 1 line
2.46.1.824.gd892dcdcdd-goog
Ian Rogers
reviewerPATCH v2 4/4 perf test: Skip not fail syscall tp fields test when insufficient permissions
In reply to Ian RogersClean up return value to be TEST_* rather than unspecific integer. Add test case skip reason. Skip test if EACCES comes back from evsel__newtp.
--- tools/perf/tests/openat-syscall-tp-fields.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
tools/perf/tests/openat-syscall-tp-fields.c +15 -4
@@ -40,7 +40,7 @@ static int test__syscall_openat_tp_fields(struct test_suite *test __maybe_unusedint flags =O_RDONLY |O_DIRECTORY ;struct evlist *evlist =evlist__new ();struct evsel *evsel; -int err =-1 , i, nr_events =0 , nr_polls =0 ; +int ret =TEST_FAIL , err, i, nr_events =0 , nr_polls =0 ;char sbuf[STRERR_BUFSIZE ];if (evlist ==NULL ) {
@@ -51,6 +51,7 @@ static int test__syscall_openat_tp_fields(struct test_suite *test __maybe_unused evsel =evsel__newtp ("syscalls" ,"sys_enter_openat" );if (IS_ERR (evsel)) {pr_debug ("%s: evsel__newtp\n" , __func__); + ret =PTR_ERR (evsel) == -EACCES ?TEST_SKIP :TEST_FAIL ; goto out_delete_evlist; }
@@ -138,11 +139,21 @@ static int test__syscall_openat_tp_fields(struct test_suite *test __maybe_unused } } out_ok: - err =0 ; + ret =TEST_OK ; out_delete_evlist:evlist__delete (evlist); out: -return err; +return ret; } -DEFINE_SUITE ("syscalls:sys_enter_openat event fields" , syscall_openat_tp_fields); +static struct test_case tests__syscall_openat_tp_fields[] = { +TEST_CASE_REASON ("syscalls:sys_enter_openat event fields" , + syscall_openat_tp_fields, +"permissions" ), + { .name =NULL , } +}; + +struct test_suite suite__syscall_openat_tp_fields = { + .desc ="syscalls:sys_enter_openat event fields" , + .test_cases = tests__syscall_openat_tp_fields, +};
Signature · 1 line
2.46.1.824.gd892dcdcdd-goog
Quoted 9 lines · Ian Rogers
Fix some memory leaks that show up testing as !root. Lower some test failures to skips for the !root case with a skip reason of permissions.
v2: Rebase that also cleans up on the
bpf_counter__loaderror path, as
pointed out by Namhyung.
v1: https://lore.kernel.org/lkml/[email protected]/[...]
Applied to perf-tools-next, thanks!
Best regards,
Namhyung