Skip to content

Commit e4ac1af

Browse files
Tao ChenKernel Patches Daemon
authored andcommitted
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 replace control_map with control global variable. Signed-off-by: Tao Chen <[email protected]>
1 parent 562da73 commit e4ac1af

File tree

2 files changed

+26
-49
lines changed

2 files changed

+26
-49
lines changed
Lines changed: 22 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,59 @@
11
// SPDX-License-Identifier: GPL-2.0
22
#include <test_progs.h>
3+
#include "stacktrace_map.skel.h"
34

45
void test_stacktrace_map(void)
56
{
6-
int control_map_fd, stackid_hmap_fd, stackmap_fd, stack_amap_fd;
7-
const char *prog_name = "oncpu";
8-
int err, prog_fd, stack_trace_len;
9-
const char *file = "./test_stacktrace_map.bpf.o";
10-
__u32 key, val, duration = 0;
11-
struct bpf_program *prog;
12-
struct bpf_object *obj;
13-
struct bpf_link *link;
7+
struct stacktrace_map *skel;
8+
int stackid_hmap_fd, stackmap_fd, stack_amap_fd;
9+
int err, stack_trace_len;
10+
__u32 duration = 0;
1411

15-
err = bpf_prog_test_load(file, BPF_PROG_TYPE_TRACEPOINT, &obj, &prog_fd);
16-
if (CHECK(err, "prog_load", "err %d errno %d\n", err, errno))
12+
skel = stacktrace_map__open_and_load();
13+
if (!ASSERT_OK_PTR(skel, "skel_open_and_load"))
1714
return;
1815

19-
prog = bpf_object__find_program_by_name(obj, prog_name);
20-
if (CHECK(!prog, "find_prog", "prog '%s' not found\n", prog_name))
21-
goto close_prog;
22-
23-
link = bpf_program__attach_tracepoint(prog, "sched", "sched_switch");
24-
if (!ASSERT_OK_PTR(link, "attach_tp"))
25-
goto close_prog;
26-
2716
/* find map fds */
28-
control_map_fd = bpf_find_map(__func__, obj, "control_map");
29-
if (CHECK_FAIL(control_map_fd < 0))
30-
goto disable_pmu;
31-
32-
stackid_hmap_fd = bpf_find_map(__func__, obj, "stackid_hmap");
17+
stackid_hmap_fd = bpf_map__fd(skel->maps.stackid_hmap);
3318
if (CHECK_FAIL(stackid_hmap_fd < 0))
34-
goto disable_pmu;
19+
goto out;
3520

36-
stackmap_fd = bpf_find_map(__func__, obj, "stackmap");
21+
stackmap_fd = bpf_map__fd(skel->maps.stackmap);
3722
if (CHECK_FAIL(stackmap_fd < 0))
38-
goto disable_pmu;
23+
goto out;
3924

40-
stack_amap_fd = bpf_find_map(__func__, obj, "stack_amap");
25+
stack_amap_fd = bpf_map__fd(skel->maps.stack_amap);
4126
if (CHECK_FAIL(stack_amap_fd < 0))
42-
goto disable_pmu;
27+
goto out;
4328

29+
err = stacktrace_map__attach(skel);
30+
if (!ASSERT_OK(err, "skel_attach"))
31+
goto out;
4432
/* give some time for bpf program run */
4533
sleep(1);
4634

4735
/* disable stack trace collection */
48-
key = 0;
49-
val = 1;
50-
bpf_map_update_elem(control_map_fd, &key, &val, 0);
36+
skel->bss->control = 1;
5137

5238
/* for every element in stackid_hmap, we can find a corresponding one
5339
* in stackmap, and vice versa.
5440
*/
5541
err = compare_map_keys(stackid_hmap_fd, stackmap_fd);
5642
if (CHECK(err, "compare_map_keys stackid_hmap vs. stackmap",
5743
"err %d errno %d\n", err, errno))
58-
goto disable_pmu;
44+
goto out;
5945

6046
err = compare_map_keys(stackmap_fd, stackid_hmap_fd);
6147
if (CHECK(err, "compare_map_keys stackmap vs. stackid_hmap",
6248
"err %d errno %d\n", err, errno))
63-
goto disable_pmu;
49+
goto out;
6450

6551
stack_trace_len = PERF_MAX_STACK_DEPTH * sizeof(__u64);
6652
err = compare_stack_ips(stackmap_fd, stack_amap_fd, stack_trace_len);
6753
if (CHECK(err, "compare_stack_ips stackmap vs. stack_amap",
6854
"err %d errno %d\n", err, errno))
69-
goto disable_pmu;
55+
goto out;
7056

71-
disable_pmu:
72-
bpf_link__destroy(link);
73-
close_prog:
74-
bpf_object__close(obj);
57+
out:
58+
stacktrace_map__destroy(skel);
7559
}

tools/testing/selftests/bpf/progs/test_stacktrace_map.c renamed to tools/testing/selftests/bpf/progs/stacktrace_map.c

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@
88
#define PERF_MAX_STACK_DEPTH 127
99
#endif
1010

11-
struct {
12-
__uint(type, BPF_MAP_TYPE_ARRAY);
13-
__uint(max_entries, 1);
14-
__type(key, __u32);
15-
__type(value, __u32);
16-
} control_map SEC(".maps");
17-
1811
struct {
1912
__uint(type, BPF_MAP_TYPE_HASH);
2013
__uint(max_entries, 16384);
@@ -50,16 +43,16 @@ struct sched_switch_args {
5043
int next_prio;
5144
};
5245

46+
int control = 0;
5347
SEC("tracepoint/sched/sched_switch")
5448
int oncpu(struct sched_switch_args *ctx)
5549
{
5650
__u32 max_len = PERF_MAX_STACK_DEPTH * sizeof(__u64);
57-
__u32 key = 0, val = 0, *value_p;
51+
__u32 key = 0, val = 0;
5852
void *stack_p;
5953

60-
value_p = bpf_map_lookup_elem(&control_map, &key);
61-
if (value_p && *value_p)
62-
return 0; /* skip if non-zero *value_p */
54+
if (control)
55+
return 0;
6356

6457
/* The size of stackmap and stackid_hmap should be the same */
6558
key = bpf_get_stackid(ctx, &stackmap, 0);

0 commit comments

Comments
 (0)