Skip to content

Commit 2c6401c

Browse files
olsajiriAlexei Starovoitov
olsajiri
authored and
Alexei Starovoitov
committed
selftests/bpf: Add kprobe_multi bpf_cookie test
Adding bpf_cookie test for programs attached by kprobe_multi links. Signed-off-by: Jiri Olsa <[email protected]> Signed-off-by: Alexei Starovoitov <[email protected]> Link: https://lore.kernel.org/bpf/[email protected]
1 parent f7a11ee commit 2c6401c

File tree

2 files changed

+131
-19
lines changed

2 files changed

+131
-19
lines changed

‎tools/testing/selftests/bpf/prog_tests/bpf_cookie.c

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <unistd.h>
88
#include <test_progs.h>
99
#include "test_bpf_cookie.skel.h"
10+
#include "kprobe_multi.skel.h"
1011

1112
/* uprobe attach point */
1213
static void trigger_func(void)
@@ -63,6 +64,112 @@ static void kprobe_subtest(struct test_bpf_cookie *skel)
6364
bpf_link__destroy(retlink2);
6465
}
6566

67+
static void kprobe_multi_test_run(struct kprobe_multi *skel)
68+
{
69+
LIBBPF_OPTS(bpf_test_run_opts, topts);
70+
int err, prog_fd;
71+
72+
prog_fd = bpf_program__fd(skel->progs.trigger);
73+
err = bpf_prog_test_run_opts(prog_fd, &topts);
74+
ASSERT_OK(err, "test_run");
75+
ASSERT_EQ(topts.retval, 0, "test_run");
76+
77+
ASSERT_EQ(skel->bss->kprobe_test1_result, 1, "kprobe_test1_result");
78+
ASSERT_EQ(skel->bss->kprobe_test2_result, 1, "kprobe_test2_result");
79+
ASSERT_EQ(skel->bss->kprobe_test3_result, 1, "kprobe_test3_result");
80+
ASSERT_EQ(skel->bss->kprobe_test4_result, 1, "kprobe_test4_result");
81+
ASSERT_EQ(skel->bss->kprobe_test5_result, 1, "kprobe_test5_result");
82+
ASSERT_EQ(skel->bss->kprobe_test6_result, 1, "kprobe_test6_result");
83+
ASSERT_EQ(skel->bss->kprobe_test7_result, 1, "kprobe_test7_result");
84+
ASSERT_EQ(skel->bss->kprobe_test8_result, 1, "kprobe_test8_result");
85+
86+
ASSERT_EQ(skel->bss->kretprobe_test1_result, 1, "kretprobe_test1_result");
87+
ASSERT_EQ(skel->bss->kretprobe_test2_result, 1, "kretprobe_test2_result");
88+
ASSERT_EQ(skel->bss->kretprobe_test3_result, 1, "kretprobe_test3_result");
89+
ASSERT_EQ(skel->bss->kretprobe_test4_result, 1, "kretprobe_test4_result");
90+
ASSERT_EQ(skel->bss->kretprobe_test5_result, 1, "kretprobe_test5_result");
91+
ASSERT_EQ(skel->bss->kretprobe_test6_result, 1, "kretprobe_test6_result");
92+
ASSERT_EQ(skel->bss->kretprobe_test7_result, 1, "kretprobe_test7_result");
93+
ASSERT_EQ(skel->bss->kretprobe_test8_result, 1, "kretprobe_test8_result");
94+
}
95+
96+
static void kprobe_multi_link_api_subtest(void)
97+
{
98+
int prog_fd, link1_fd = -1, link2_fd = -1;
99+
struct kprobe_multi *skel = NULL;
100+
LIBBPF_OPTS(bpf_link_create_opts, opts);
101+
unsigned long long addrs[8];
102+
__u64 cookies[8];
103+
104+
if (!ASSERT_OK(load_kallsyms(), "load_kallsyms"))
105+
goto cleanup;
106+
107+
skel = kprobe_multi__open_and_load();
108+
if (!ASSERT_OK_PTR(skel, "fentry_raw_skel_load"))
109+
goto cleanup;
110+
111+
skel->bss->pid = getpid();
112+
skel->bss->test_cookie = true;
113+
114+
#define GET_ADDR(__sym, __addr) ({ \
115+
__addr = ksym_get_addr(__sym); \
116+
if (!ASSERT_NEQ(__addr, 0, "ksym_get_addr " #__sym)) \
117+
goto cleanup; \
118+
})
119+
120+
GET_ADDR("bpf_fentry_test1", addrs[0]);
121+
GET_ADDR("bpf_fentry_test2", addrs[1]);
122+
GET_ADDR("bpf_fentry_test3", addrs[2]);
123+
GET_ADDR("bpf_fentry_test4", addrs[3]);
124+
GET_ADDR("bpf_fentry_test5", addrs[4]);
125+
GET_ADDR("bpf_fentry_test6", addrs[5]);
126+
GET_ADDR("bpf_fentry_test7", addrs[6]);
127+
GET_ADDR("bpf_fentry_test8", addrs[7]);
128+
129+
#undef GET_ADDR
130+
131+
cookies[0] = 1;
132+
cookies[1] = 2;
133+
cookies[2] = 3;
134+
cookies[3] = 4;
135+
cookies[4] = 5;
136+
cookies[5] = 6;
137+
cookies[6] = 7;
138+
cookies[7] = 8;
139+
140+
opts.kprobe_multi.addrs = (const unsigned long *) &addrs;
141+
opts.kprobe_multi.cnt = ARRAY_SIZE(addrs);
142+
opts.kprobe_multi.cookies = (const __u64 *) &cookies;
143+
prog_fd = bpf_program__fd(skel->progs.test_kprobe);
144+
145+
link1_fd = bpf_link_create(prog_fd, 0, BPF_TRACE_KPROBE_MULTI, &opts);
146+
if (!ASSERT_GE(link1_fd, 0, "link1_fd"))
147+
goto cleanup;
148+
149+
cookies[0] = 8;
150+
cookies[1] = 7;
151+
cookies[2] = 6;
152+
cookies[3] = 5;
153+
cookies[4] = 4;
154+
cookies[5] = 3;
155+
cookies[6] = 2;
156+
cookies[7] = 1;
157+
158+
opts.kprobe_multi.flags = BPF_F_KPROBE_MULTI_RETURN;
159+
prog_fd = bpf_program__fd(skel->progs.test_kretprobe);
160+
161+
link2_fd = bpf_link_create(prog_fd, 0, BPF_TRACE_KPROBE_MULTI, &opts);
162+
if (!ASSERT_GE(link2_fd, 0, "link2_fd"))
163+
goto cleanup;
164+
165+
kprobe_multi_test_run(skel);
166+
167+
cleanup:
168+
close(link1_fd);
169+
close(link2_fd);
170+
kprobe_multi__destroy(skel);
171+
}
172+
66173
static void uprobe_subtest(struct test_bpf_cookie *skel)
67174
{
68175
DECLARE_LIBBPF_OPTS(bpf_uprobe_opts, opts);
@@ -249,6 +356,8 @@ void test_bpf_cookie(void)
249356

250357
if (test__start_subtest("kprobe"))
251358
kprobe_subtest(skel);
359+
if (test__start_subtest("multi_kprobe_link_api"))
360+
kprobe_multi_link_api_subtest();
252361
if (test__start_subtest("uprobe"))
253362
uprobe_subtest(skel);
254363
if (test__start_subtest("tracepoint"))

‎tools/testing/selftests/bpf/progs/kprobe_multi.c

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ extern const void bpf_fentry_test7 __ksym;
1616
extern const void bpf_fentry_test8 __ksym;
1717

1818
int pid = 0;
19+
bool test_cookie = false;
1920

2021
__u64 kprobe_test1_result = 0;
2122
__u64 kprobe_test2_result = 0;
@@ -40,31 +41,33 @@ static void kprobe_multi_check(void *ctx, bool is_return)
4041
if (bpf_get_current_pid_tgid() >> 32 != pid)
4142
return;
4243

44+
__u64 cookie = test_cookie ? bpf_get_attach_cookie(ctx) : 0;
4345
__u64 addr = bpf_get_func_ip(ctx);
4446

45-
#define SET(__var, __addr) ({ \
46-
if ((const void *) addr == __addr) \
47-
__var = 1; \
47+
#define SET(__var, __addr, __cookie) ({ \
48+
if (((const void *) addr == __addr) && \
49+
(!test_cookie || (cookie == __cookie))) \
50+
__var = 1; \
4851
})
4952

5053
if (is_return) {
51-
SET(kretprobe_test1_result, &bpf_fentry_test1);
52-
SET(kretprobe_test2_result, &bpf_fentry_test2);
53-
SET(kretprobe_test3_result, &bpf_fentry_test3);
54-
SET(kretprobe_test4_result, &bpf_fentry_test4);
55-
SET(kretprobe_test5_result, &bpf_fentry_test5);
56-
SET(kretprobe_test6_result, &bpf_fentry_test6);
57-
SET(kretprobe_test7_result, &bpf_fentry_test7);
58-
SET(kretprobe_test8_result, &bpf_fentry_test8);
54+
SET(kretprobe_test1_result, &bpf_fentry_test1, 8);
55+
SET(kretprobe_test2_result, &bpf_fentry_test2, 7);
56+
SET(kretprobe_test3_result, &bpf_fentry_test3, 6);
57+
SET(kretprobe_test4_result, &bpf_fentry_test4, 5);
58+
SET(kretprobe_test5_result, &bpf_fentry_test5, 4);
59+
SET(kretprobe_test6_result, &bpf_fentry_test6, 3);
60+
SET(kretprobe_test7_result, &bpf_fentry_test7, 2);
61+
SET(kretprobe_test8_result, &bpf_fentry_test8, 1);
5962
} else {
60-
SET(kprobe_test1_result, &bpf_fentry_test1);
61-
SET(kprobe_test2_result, &bpf_fentry_test2);
62-
SET(kprobe_test3_result, &bpf_fentry_test3);
63-
SET(kprobe_test4_result, &bpf_fentry_test4);
64-
SET(kprobe_test5_result, &bpf_fentry_test5);
65-
SET(kprobe_test6_result, &bpf_fentry_test6);
66-
SET(kprobe_test7_result, &bpf_fentry_test7);
67-
SET(kprobe_test8_result, &bpf_fentry_test8);
63+
SET(kprobe_test1_result, &bpf_fentry_test1, 1);
64+
SET(kprobe_test2_result, &bpf_fentry_test2, 2);
65+
SET(kprobe_test3_result, &bpf_fentry_test3, 3);
66+
SET(kprobe_test4_result, &bpf_fentry_test4, 4);
67+
SET(kprobe_test5_result, &bpf_fentry_test5, 5);
68+
SET(kprobe_test6_result, &bpf_fentry_test6, 6);
69+
SET(kprobe_test7_result, &bpf_fentry_test7, 7);
70+
SET(kprobe_test8_result, &bpf_fentry_test8, 8);
6871
}
6972

7073
#undef SET

0 commit comments

Comments
 (0)