Commit 8c51b314 authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Daniel Borkmann

selftests/bpf: switch test to new attach_perf_event API

Use new bpf_program__attach_perf_event() in test previously relying on
direct ioctl manipulations.
Signed-off-by: default avatarAndrii Nakryiko <andriin@fb.com>
Reviewed-by: default avatarStanislav Fomichev <sdf@google.com>
Acked-by: default avatarSong Liu <songliubraving@fb.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 84bf5e1f
...@@ -17,6 +17,7 @@ static __u64 read_perf_max_sample_freq(void) ...@@ -17,6 +17,7 @@ static __u64 read_perf_max_sample_freq(void)
void test_stacktrace_build_id_nmi(void) void test_stacktrace_build_id_nmi(void)
{ {
int control_map_fd, stackid_hmap_fd, stackmap_fd, stack_amap_fd; int control_map_fd, stackid_hmap_fd, stackmap_fd, stack_amap_fd;
const char *prog_name = "tracepoint/random/urandom_read";
const char *file = "./test_stacktrace_build_id.o"; const char *file = "./test_stacktrace_build_id.o";
int err, pmu_fd, prog_fd; int err, pmu_fd, prog_fd;
struct perf_event_attr attr = { struct perf_event_attr attr = {
...@@ -25,7 +26,9 @@ void test_stacktrace_build_id_nmi(void) ...@@ -25,7 +26,9 @@ void test_stacktrace_build_id_nmi(void)
.config = PERF_COUNT_HW_CPU_CYCLES, .config = PERF_COUNT_HW_CPU_CYCLES,
}; };
__u32 key, previous_key, val, duration = 0; __u32 key, previous_key, val, duration = 0;
struct bpf_program *prog;
struct bpf_object *obj; struct bpf_object *obj;
struct bpf_link *link;
char buf[256]; char buf[256];
int i, j; int i, j;
struct bpf_stack_build_id id_offs[PERF_MAX_STACK_DEPTH]; struct bpf_stack_build_id id_offs[PERF_MAX_STACK_DEPTH];
...@@ -39,6 +42,10 @@ void test_stacktrace_build_id_nmi(void) ...@@ -39,6 +42,10 @@ void test_stacktrace_build_id_nmi(void)
if (CHECK(err, "prog_load", "err %d errno %d\n", err, errno)) if (CHECK(err, "prog_load", "err %d errno %d\n", err, errno))
return; return;
prog = bpf_object__find_program_by_title(obj, prog_name);
if (CHECK(!prog, "find_prog", "prog '%s' not found\n", prog_name))
goto close_prog;
pmu_fd = syscall(__NR_perf_event_open, &attr, -1 /* pid */, pmu_fd = syscall(__NR_perf_event_open, &attr, -1 /* pid */,
0 /* cpu 0 */, -1 /* group id */, 0 /* cpu 0 */, -1 /* group id */,
0 /* flags */); 0 /* flags */);
...@@ -47,15 +54,12 @@ void test_stacktrace_build_id_nmi(void) ...@@ -47,15 +54,12 @@ void test_stacktrace_build_id_nmi(void)
pmu_fd, errno)) pmu_fd, errno))
goto close_prog; goto close_prog;
err = ioctl(pmu_fd, PERF_EVENT_IOC_ENABLE, 0); link = bpf_program__attach_perf_event(prog, pmu_fd);
if (CHECK(err, "perf_event_ioc_enable", "err %d errno %d\n", if (CHECK(IS_ERR(link), "attach_perf_event",
err, errno)) "err %ld\n", PTR_ERR(link))) {
goto close_pmu; close(pmu_fd);
goto close_prog;
err = ioctl(pmu_fd, PERF_EVENT_IOC_SET_BPF, prog_fd); }
if (CHECK(err, "perf_event_ioc_set_bpf", "err %d errno %d\n",
err, errno))
goto disable_pmu;
/* find map fds */ /* find map fds */
control_map_fd = bpf_find_map(__func__, obj, "control_map"); control_map_fd = bpf_find_map(__func__, obj, "control_map");
...@@ -134,8 +138,7 @@ void test_stacktrace_build_id_nmi(void) ...@@ -134,8 +138,7 @@ void test_stacktrace_build_id_nmi(void)
* try it one more time. * try it one more time.
*/ */
if (build_id_matches < 1 && retry--) { if (build_id_matches < 1 && retry--) {
ioctl(pmu_fd, PERF_EVENT_IOC_DISABLE); bpf_link__destroy(link);
close(pmu_fd);
bpf_object__close(obj); bpf_object__close(obj);
printf("%s:WARN:Didn't find expected build ID from the map, retrying\n", printf("%s:WARN:Didn't find expected build ID from the map, retrying\n",
__func__); __func__);
...@@ -154,11 +157,7 @@ void test_stacktrace_build_id_nmi(void) ...@@ -154,11 +157,7 @@ void test_stacktrace_build_id_nmi(void)
*/ */
disable_pmu: disable_pmu:
ioctl(pmu_fd, PERF_EVENT_IOC_DISABLE); bpf_link__destroy(link);
close_pmu:
close(pmu_fd);
close_prog: close_prog:
bpf_object__close(obj); bpf_object__close(obj);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment