selftests/bpf: convert existing tracepoint tests to new APIs

Convert some existing tests that attach to tracepoints to use
bpf_program__attach_tracepoint API instead.

Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Reviewed-by: Stanislav Fomichev <sdf@google.com>
Acked-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

diff --git a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c
index 3aab2b0..ac44fda 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c
+++ b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c
@@ -4,11 +4,13 @@
 void test_stacktrace_build_id(void)
 {
        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";
-       int bytes, efd, err, pmu_fd, prog_fd, stack_trace_len;
-       struct perf_event_attr attr = {};
+       int err, prog_fd, stack_trace_len;
        __u32 key, previous_key, val, duration = 0;
+       struct bpf_program *prog;
        struct bpf_object *obj;
+       struct bpf_link *link = NULL;
        char buf[256];
        int i, j;
        struct bpf_stack_build_id id_offs[PERF_MAX_STACK_DEPTH];
@@ -18,44 +20,16 @@ void test_stacktrace_build_id(void)
 retry:
        err = bpf_prog_load(file, BPF_PROG_TYPE_TRACEPOINT, &obj, &prog_fd);
        if (CHECK(err, "prog_load", "err %d errno %d\n", err, errno))
-               goto out;
+               return;
 
-       /* Get the ID for the sched/sched_switch tracepoint */
-       snprintf(buf, sizeof(buf),
-                "/sys/kernel/debug/tracing/events/random/urandom_read/id");
-       efd = open(buf, O_RDONLY, 0);
-       if (CHECK(efd < 0, "open", "err %d errno %d\n", efd, errno))
+       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;
 
-       bytes = read(efd, buf, sizeof(buf));
-       close(efd);
-       if (CHECK(bytes <= 0 || bytes >= sizeof(buf),
-                 "read", "bytes %d errno %d\n", bytes, errno))
+       link = bpf_program__attach_tracepoint(prog, "random", "urandom_read");
+       if (CHECK(IS_ERR(link), "attach_tp", "err %ld\n", PTR_ERR(link)))
                goto close_prog;
 
-       /* Open the perf event and attach bpf progrram */
-       attr.config = strtol(buf, NULL, 0);
-       attr.type = PERF_TYPE_TRACEPOINT;
-       attr.sample_type = PERF_SAMPLE_RAW | PERF_SAMPLE_CALLCHAIN;
-       attr.sample_period = 1;
-       attr.wakeup_events = 1;
-       pmu_fd = syscall(__NR_perf_event_open, &attr, -1 /* pid */,
-                        0 /* cpu 0 */, -1 /* group id */,
-                        0 /* flags */);
-       if (CHECK(pmu_fd < 0, "perf_event_open", "err %d errno %d\n",
-                 pmu_fd, errno))
-               goto close_prog;
-
-       err = ioctl(pmu_fd, PERF_EVENT_IOC_ENABLE, 0);
-       if (CHECK(err, "perf_event_ioc_enable", "err %d errno %d\n",
-                 err, errno))
-               goto close_pmu;
-
-       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 */
        control_map_fd = bpf_find_map(__func__, obj, "control_map");
        if (CHECK(control_map_fd < 0, "bpf_find_map control_map",
@@ -133,8 +107,7 @@ retry:
         * try it one more time.
         */
        if (build_id_matches < 1 && retry--) {
-               ioctl(pmu_fd, PERF_EVENT_IOC_DISABLE);
-               close(pmu_fd);
+               bpf_link__destroy(link);
                bpf_object__close(obj);
                printf("%s:WARN:Didn't find expected build ID from the map, retrying\n",
                       __func__);
@@ -152,14 +125,8 @@ retry:
              "err %d errno %d\n", err, errno);
 
 disable_pmu:
-       ioctl(pmu_fd, PERF_EVENT_IOC_DISABLE);
-
-close_pmu:
-       close(pmu_fd);
+       bpf_link__destroy(link);
 
 close_prog:
        bpf_object__close(obj);
-
-out:
-       return;
 }

diff --git a/tools/testing/selftests/bpf/prog_tests/stacktrace_map.c b/tools/testing/selftests/bpf/prog_tests/stacktrace_map.c
index 2bfd50a..fc53933 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/stacktrace_map.c
+++ b/tools/testing/selftests/bpf/prog_tests/stacktrace_map.c
@@ -4,50 +4,26 @@
 void test_stacktrace_map(void)
 {
        int control_map_fd, stackid_hmap_fd, stackmap_fd, stack_amap_fd;
+       const char *prog_name = "tracepoint/sched/sched_switch";
+       int err, prog_fd, stack_trace_len;
        const char *file = "./test_stacktrace_map.o";
-       int bytes, efd, err, pmu_fd, prog_fd, stack_trace_len;
-       struct perf_event_attr attr = {};
        __u32 key, val, duration = 0;
+       struct bpf_program *prog;
        struct bpf_object *obj;
-       char buf[256];
+       struct bpf_link *link;
 
        err = bpf_prog_load(file, BPF_PROG_TYPE_TRACEPOINT, &obj, &prog_fd);
        if (CHECK(err, "prog_load", "err %d errno %d\n", err, errno))
                return;
 
-       /* Get the ID for the sched/sched_switch tracepoint */
-       snprintf(buf, sizeof(buf),
-                "/sys/kernel/debug/tracing/events/sched/sched_switch/id");
-       efd = open(buf, O_RDONLY, 0);
-       if (CHECK(efd < 0, "open", "err %d errno %d\n", efd, errno))
+       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;
 
-       bytes = read(efd, buf, sizeof(buf));
-       close(efd);
-       if (bytes <= 0 || bytes >= sizeof(buf))
+       link = bpf_program__attach_tracepoint(prog, "sched", "sched_switch");
+       if (CHECK(IS_ERR(link), "attach_tp", "err %ld\n", PTR_ERR(link)))
                goto close_prog;
 
-       /* Open the perf event and attach bpf progrram */
-       attr.config = strtol(buf, NULL, 0);
-       attr.type = PERF_TYPE_TRACEPOINT;
-       attr.sample_type = PERF_SAMPLE_RAW | PERF_SAMPLE_CALLCHAIN;
-       attr.sample_period = 1;
-       attr.wakeup_events = 1;
-       pmu_fd = syscall(__NR_perf_event_open, &attr, -1 /* pid */,
-                        0 /* cpu 0 */, -1 /* group id */,
-                        0 /* flags */);
-       if (CHECK(pmu_fd < 0, "perf_event_open", "err %d errno %d\n",
-                 pmu_fd, errno))
-               goto close_prog;
-
-       err = ioctl(pmu_fd, PERF_EVENT_IOC_ENABLE, 0);
-       if (err)
-               goto disable_pmu;
-
-       err = ioctl(pmu_fd, PERF_EVENT_IOC_SET_BPF, prog_fd);
-       if (err)
-               goto disable_pmu;
-
        /* find map fds */
        control_map_fd = bpf_find_map(__func__, obj, "control_map");
        if (control_map_fd < 0)
@@ -96,8 +72,7 @@ void test_stacktrace_map(void)
 disable_pmu:
        error_cnt++;
 disable_pmu_noerr:
-       ioctl(pmu_fd, PERF_EVENT_IOC_DISABLE);
-       close(pmu_fd);
+       bpf_link__destroy(link);
 close_prog:
        bpf_object__close(obj);
 }

diff --git a/tools/testing/selftests/bpf/prog_tests/stacktrace_map_raw_tp.c b/tools/testing/selftests/bpf/prog_tests/stacktrace_map_raw_tp.c
index 1f8387d..fbfa8e7 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/stacktrace_map_raw_tp.c
+++ b/tools/testing/selftests/bpf/prog_tests/stacktrace_map_raw_tp.c
@@ -3,18 +3,25 @@
 
 void test_stacktrace_map_raw_tp(void)
 {
+       const char *prog_name = "tracepoint/sched/sched_switch";
        int control_map_fd, stackid_hmap_fd, stackmap_fd;
        const char *file = "./test_stacktrace_map.o";
-       int efd, err, prog_fd;
        __u32 key, val, duration = 0;
+       int err, prog_fd;
+       struct bpf_program *prog;
        struct bpf_object *obj;
+       struct bpf_link *link = NULL;
 
        err = bpf_prog_load(file, BPF_PROG_TYPE_RAW_TRACEPOINT, &obj, &prog_fd);
        if (CHECK(err, "prog_load raw tp", "err %d errno %d\n", err, errno))
                return;
 
-       efd = bpf_raw_tracepoint_open("sched_switch", prog_fd);
-       if (CHECK(efd < 0, "raw_tp_open", "err %d errno %d\n", efd, errno))
+       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;
+
+       link = bpf_program__attach_raw_tracepoint(prog, "sched_switch");
+       if (CHECK(IS_ERR(link), "attach_raw_tp", "err %ld\n", PTR_ERR(link)))
                goto close_prog;
 
        /* find map fds */
@@ -55,5 +62,7 @@ void test_stacktrace_map_raw_tp(void)
 close_prog:
        error_cnt++;
 close_prog_noerr:
+       if (!IS_ERR_OR_NULL(link))
+               bpf_link__destroy(link);
        bpf_object__close(obj);
 }