selftests/bpf: Refactor stacktrace_map case with skeleton

The loading method of the stacktrace_map test case looks too outdated,
refactor it with skeleton, and we can use global variable feature in
the next patch.

Signed-off-by: Tao Chen <chen.dylane@linux.dev>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20250925175030.1615837-2-chen.dylane@linux.dev

diff --git a/tools/testing/selftests/bpf/prog_tests/stacktrace_map.c b/tools/testing/selftests/bpf/prog_tests/stacktrace_map.c
index 84a7e40..2e3da20 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/stacktrace_map.c
+++ b/tools/testing/selftests/bpf/prog_tests/stacktrace_map.c
@@ -1,46 +1,26 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <test_progs.h>
+#include "stacktrace_map.skel.h"
 
 void test_stacktrace_map(void)
 {
+       struct stacktrace_map *skel;
        int control_map_fd, stackid_hmap_fd, stackmap_fd, stack_amap_fd;
-       const char *prog_name = "oncpu";
-       int err, prog_fd, stack_trace_len;
-       const char *file = "./test_stacktrace_map.bpf.o";
+       int err, stack_trace_len;
        __u32 key, val, duration = 0;
-       struct bpf_program *prog;
-       struct bpf_object *obj;
-       struct bpf_link *link;
 
-       err = bpf_prog_test_load(file, BPF_PROG_TYPE_TRACEPOINT, &obj, &prog_fd);
-       if (CHECK(err, "prog_load", "err %d errno %d\n", err, errno))
+       skel = stacktrace_map__open_and_load();
+       if (!ASSERT_OK_PTR(skel, "skel_open_and_load"))
                return;
 
-       prog = bpf_object__find_program_by_name(obj, prog_name);
-       if (CHECK(!prog, "find_prog", "prog '%s' not found\n", prog_name))
-               goto close_prog;
-
-       link = bpf_program__attach_tracepoint(prog, "sched", "sched_switch");
-       if (!ASSERT_OK_PTR(link, "attach_tp"))
-               goto close_prog;
-
-       /* find map fds */
-       control_map_fd = bpf_find_map(__func__, obj, "control_map");
-       if (CHECK_FAIL(control_map_fd < 0))
-               goto disable_pmu;
-
-       stackid_hmap_fd = bpf_find_map(__func__, obj, "stackid_hmap");
-       if (CHECK_FAIL(stackid_hmap_fd < 0))
-               goto disable_pmu;
-
-       stackmap_fd = bpf_find_map(__func__, obj, "stackmap");
-       if (CHECK_FAIL(stackmap_fd < 0))
-               goto disable_pmu;
-
-       stack_amap_fd = bpf_find_map(__func__, obj, "stack_amap");
-       if (CHECK_FAIL(stack_amap_fd < 0))
-               goto disable_pmu;
+       control_map_fd = bpf_map__fd(skel->maps.control_map);
+       stackid_hmap_fd = bpf_map__fd(skel->maps.stackid_hmap);
+       stackmap_fd = bpf_map__fd(skel->maps.stackmap);
+       stack_amap_fd = bpf_map__fd(skel->maps.stack_amap);
 
+       err = stacktrace_map__attach(skel);
+       if (!ASSERT_OK(err, "skel_attach"))
+               goto out;
        /* give some time for bpf program run */
        sleep(1);
 
@@ -55,21 +35,19 @@ void test_stacktrace_map(void)
        err = compare_map_keys(stackid_hmap_fd, stackmap_fd);
        if (CHECK(err, "compare_map_keys stackid_hmap vs. stackmap",
                  "err %d errno %d\n", err, errno))
-               goto disable_pmu;
+               goto out;
 
        err = compare_map_keys(stackmap_fd, stackid_hmap_fd);
        if (CHECK(err, "compare_map_keys stackmap vs. stackid_hmap",
                  "err %d errno %d\n", err, errno))
-               goto disable_pmu;
+               goto out;
 
        stack_trace_len = PERF_MAX_STACK_DEPTH * sizeof(__u64);
        err = compare_stack_ips(stackmap_fd, stack_amap_fd, stack_trace_len);
        if (CHECK(err, "compare_stack_ips stackmap vs. stack_amap",
                  "err %d errno %d\n", err, errno))
-               goto disable_pmu;
+               goto out;
 
-disable_pmu:
-       bpf_link__destroy(link);
-close_prog:
-       bpf_object__close(obj);
+out:
+       stacktrace_map__destroy(skel);
 }

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 e0cb469..e985d51 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
@@ -5,7 +5,7 @@ void test_stacktrace_map_raw_tp(void)
 {
        const char *prog_name = "oncpu";
        int control_map_fd, stackid_hmap_fd, stackmap_fd;
-       const char *file = "./test_stacktrace_map.bpf.o";
+       const char *file = "./stacktrace_map.bpf.o";
        __u32 key, val, duration = 0;
        int err, prog_fd;
        struct bpf_program *prog;

diff --git a/tools/testing/selftests/bpf/progs/stacktrace_map.c b/tools/testing/selftests/bpf/progs/stacktrace_map.c
new file mode 100644 (file)
index 0000000..4756800
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/stacktrace_map.c
@@ -0,0 +1,76 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (c) 2018 Facebook
+
+#include <vmlinux.h>
+#include <bpf/bpf_helpers.h>
+
+#ifndef PERF_MAX_STACK_DEPTH
+#define PERF_MAX_STACK_DEPTH         127
+#endif
+
+struct {
+       __uint(type, BPF_MAP_TYPE_ARRAY);
+       __uint(max_entries, 1);
+       __type(key, __u32);
+       __type(value, __u32);
+} control_map SEC(".maps");
+
+struct {
+       __uint(type, BPF_MAP_TYPE_HASH);
+       __uint(max_entries, 16384);
+       __type(key, __u32);
+       __type(value, __u32);
+} stackid_hmap SEC(".maps");
+
+typedef __u64 stack_trace_t[PERF_MAX_STACK_DEPTH];
+
+struct {
+       __uint(type, BPF_MAP_TYPE_STACK_TRACE);
+       __uint(max_entries, 16384);
+       __type(key, __u32);
+       __type(value, stack_trace_t);
+} stackmap SEC(".maps");
+
+struct {
+       __uint(type, BPF_MAP_TYPE_ARRAY);
+       __uint(max_entries, 16384);
+       __type(key, __u32);
+       __type(value, stack_trace_t);
+} stack_amap SEC(".maps");
+
+/* taken from /sys/kernel/tracing/events/sched/sched_switch/format */
+struct sched_switch_args {
+       unsigned long long pad;
+       char prev_comm[TASK_COMM_LEN];
+       int prev_pid;
+       int prev_prio;
+       long long prev_state;
+       char next_comm[TASK_COMM_LEN];
+       int next_pid;
+       int next_prio;
+};
+
+SEC("tracepoint/sched/sched_switch")
+int oncpu(struct sched_switch_args *ctx)
+{
+       __u32 max_len = PERF_MAX_STACK_DEPTH * sizeof(__u64);
+       __u32 key = 0, val = 0, *value_p;
+       void *stack_p;
+
+       value_p = bpf_map_lookup_elem(&control_map, &key);
+       if (value_p && *value_p)
+               return 0; /* skip if non-zero *value_p */
+
+       /* The size of stackmap and stackid_hmap should be the same */
+       key = bpf_get_stackid(ctx, &stackmap, 0);
+       if ((int)key >= 0) {
+               bpf_map_update_elem(&stackid_hmap, &key, &val, 0);
+               stack_p = bpf_map_lookup_elem(&stack_amap, &key);
+               if (stack_p)
+                       bpf_get_stack(ctx, stack_p, max_len, 0);
+       }
+
+       return 0;
+}
+
+char _license[] SEC("license") = "GPL";

diff --git a/tools/testing/selftests/bpf/progs/test_stacktrace_map.c b/tools/testing/selftests/bpf/progs/test_stacktrace_map.c
deleted file mode 100644 (file)
index 4756800..0000000
--- a/tools/testing/selftests/bpf/progs/test_stacktrace_map.c
+++ /dev/null
@@ -1,76 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-// Copyright (c) 2018 Facebook
-
-#include <vmlinux.h>
-#include <bpf/bpf_helpers.h>
-
-#ifndef PERF_MAX_STACK_DEPTH
-#define PERF_MAX_STACK_DEPTH         127
-#endif
-
-struct {
-       __uint(type, BPF_MAP_TYPE_ARRAY);
-       __uint(max_entries, 1);
-       __type(key, __u32);
-       __type(value, __u32);
-} control_map SEC(".maps");
-
-struct {
-       __uint(type, BPF_MAP_TYPE_HASH);
-       __uint(max_entries, 16384);
-       __type(key, __u32);
-       __type(value, __u32);
-} stackid_hmap SEC(".maps");
-
-typedef __u64 stack_trace_t[PERF_MAX_STACK_DEPTH];
-
-struct {
-       __uint(type, BPF_MAP_TYPE_STACK_TRACE);
-       __uint(max_entries, 16384);
-       __type(key, __u32);
-       __type(value, stack_trace_t);
-} stackmap SEC(".maps");
-
-struct {
-       __uint(type, BPF_MAP_TYPE_ARRAY);
-       __uint(max_entries, 16384);
-       __type(key, __u32);
-       __type(value, stack_trace_t);
-} stack_amap SEC(".maps");
-
-/* taken from /sys/kernel/tracing/events/sched/sched_switch/format */
-struct sched_switch_args {
-       unsigned long long pad;
-       char prev_comm[TASK_COMM_LEN];
-       int prev_pid;
-       int prev_prio;
-       long long prev_state;
-       char next_comm[TASK_COMM_LEN];
-       int next_pid;
-       int next_prio;
-};
-
-SEC("tracepoint/sched/sched_switch")
-int oncpu(struct sched_switch_args *ctx)
-{
-       __u32 max_len = PERF_MAX_STACK_DEPTH * sizeof(__u64);
-       __u32 key = 0, val = 0, *value_p;
-       void *stack_p;
-
-       value_p = bpf_map_lookup_elem(&control_map, &key);
-       if (value_p && *value_p)
-               return 0; /* skip if non-zero *value_p */
-
-       /* The size of stackmap and stackid_hmap should be the same */
-       key = bpf_get_stackid(ctx, &stackmap, 0);
-       if ((int)key >= 0) {
-               bpf_map_update_elem(&stackid_hmap, &key, &val, 0);
-               stack_p = bpf_map_lookup_elem(&stack_amap, &key);
-               if (stack_p)
-                       bpf_get_stack(ctx, stack_p, max_len, 0);
-       }
-
-       return 0;
-}
-
-char _license[] SEC("license") = "GPL";