diff options
author | Tony Lindgren <tony@atomide.com> | 2021-07-27 11:25:08 +0300 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2021-07-27 11:25:08 +0300 |
commit | 353b7a55dcaf5fb8758e09ebe2ddf5f3adbac7c5 (patch) | |
tree | 081200957b3d8925cbe913020d45a4e3ba61a7a3 /tools/testing/selftests/bpf/prog_tests/get_stack_raw_tp.c | |
parent | 3ff340e24c9dd5cff9fc07d67914c5adf67f80d6 (diff) | |
parent | c68ef4ad180e09805fa46965d15e1dfadf09ffa5 (diff) |
Merge branch 'fixes-v5.14' into fixes
Diffstat (limited to 'tools/testing/selftests/bpf/prog_tests/get_stack_raw_tp.c')
-rw-r--r-- | tools/testing/selftests/bpf/prog_tests/get_stack_raw_tp.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tools/testing/selftests/bpf/prog_tests/get_stack_raw_tp.c b/tools/testing/selftests/bpf/prog_tests/get_stack_raw_tp.c index 925722217edf..522237aa4470 100644 --- a/tools/testing/selftests/bpf/prog_tests/get_stack_raw_tp.c +++ b/tools/testing/selftests/bpf/prog_tests/get_stack_raw_tp.c @@ -121,12 +121,12 @@ void test_get_stack_raw_tp(void) goto close_prog; link = bpf_program__attach_raw_tracepoint(prog, "sys_enter"); - if (CHECK(IS_ERR(link), "attach_raw_tp", "err %ld\n", PTR_ERR(link))) + if (!ASSERT_OK_PTR(link, "attach_raw_tp")) goto close_prog; pb_opts.sample_cb = get_stack_print_output; pb = perf_buffer__new(bpf_map__fd(map), 8, &pb_opts); - if (CHECK(IS_ERR(pb), "perf_buf__new", "err %ld\n", PTR_ERR(pb))) + if (!ASSERT_OK_PTR(pb, "perf_buf__new")) goto close_prog; /* trigger some syscall action */ @@ -141,9 +141,7 @@ void test_get_stack_raw_tp(void) } close_prog: - if (!IS_ERR_OR_NULL(link)) - bpf_link__destroy(link); - if (!IS_ERR_OR_NULL(pb)) - perf_buffer__free(pb); + bpf_link__destroy(link); + perf_buffer__free(pb); bpf_object__close(obj); } |