Skip to content

Commit 3f7a841

Browse files
mykyta5anakryiko
authored andcommitted
selftests/bpf: Removed obsolete tests
Now bpf_timer can be used in tracepoints, so these tests are no longer relevant. Signed-off-by: Mykyta Yatsenko <yatsenko@meta.com> Signed-off-by: Alexei Starovoitov <ast@kernel.org> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Link: https://lore.kernel.org/bpf/20260201025403.66625-9-alexei.starovoitov@gmail.com
1 parent 083c5a4 commit 3f7a841

1 file changed

Lines changed: 0 additions & 111 deletions

File tree

tools/testing/selftests/bpf/progs/verifier_helper_restricted.c

Lines changed: 0 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,6 @@ struct {
1717
__type(value, struct val);
1818
} map_spin_lock SEC(".maps");
1919

20-
struct timer {
21-
struct bpf_timer t;
22-
};
23-
24-
struct {
25-
__uint(type, BPF_MAP_TYPE_ARRAY);
26-
__uint(max_entries, 1);
27-
__type(key, int);
28-
__type(value, struct timer);
29-
} map_timer SEC(".maps");
30-
3120
SEC("kprobe")
3221
__description("bpf_ktime_get_coarse_ns is forbidden in BPF_PROG_TYPE_KPROBE")
3322
__failure __msg("program of this type cannot use helper bpf_ktime_get_coarse_ns")
@@ -84,106 +73,6 @@ __naked void bpf_prog_type_raw_tracepoint_1(void)
8473
: __clobber_all);
8574
}
8675

87-
SEC("kprobe")
88-
__description("bpf_timer_init isn restricted in BPF_PROG_TYPE_KPROBE")
89-
__failure __msg("tracing progs cannot use bpf_timer yet")
90-
__naked void in_bpf_prog_type_kprobe_2(void)
91-
{
92-
asm volatile (" \
93-
r2 = r10; \
94-
r2 += -8; \
95-
r1 = 0; \
96-
*(u64*)(r2 + 0) = r1; \
97-
r1 = %[map_timer] ll; \
98-
call %[bpf_map_lookup_elem]; \
99-
if r0 == 0 goto l0_%=; \
100-
r1 = r0; \
101-
r2 = %[map_timer] ll; \
102-
r3 = 1; \
103-
l0_%=: call %[bpf_timer_init]; \
104-
exit; \
105-
" :
106-
: __imm(bpf_map_lookup_elem),
107-
__imm(bpf_timer_init),
108-
__imm_addr(map_timer)
109-
: __clobber_all);
110-
}
111-
112-
SEC("perf_event")
113-
__description("bpf_timer_init is forbidden in BPF_PROG_TYPE_PERF_EVENT")
114-
__failure __msg("tracing progs cannot use bpf_timer yet")
115-
__naked void bpf_prog_type_perf_event_2(void)
116-
{
117-
asm volatile (" \
118-
r2 = r10; \
119-
r2 += -8; \
120-
r1 = 0; \
121-
*(u64*)(r2 + 0) = r1; \
122-
r1 = %[map_timer] ll; \
123-
call %[bpf_map_lookup_elem]; \
124-
if r0 == 0 goto l0_%=; \
125-
r1 = r0; \
126-
r2 = %[map_timer] ll; \
127-
r3 = 1; \
128-
l0_%=: call %[bpf_timer_init]; \
129-
exit; \
130-
" :
131-
: __imm(bpf_map_lookup_elem),
132-
__imm(bpf_timer_init),
133-
__imm_addr(map_timer)
134-
: __clobber_all);
135-
}
136-
137-
SEC("tracepoint")
138-
__description("bpf_timer_init is forbidden in BPF_PROG_TYPE_TRACEPOINT")
139-
__failure __msg("tracing progs cannot use bpf_timer yet")
140-
__naked void in_bpf_prog_type_tracepoint_2(void)
141-
{
142-
asm volatile (" \
143-
r2 = r10; \
144-
r2 += -8; \
145-
r1 = 0; \
146-
*(u64*)(r2 + 0) = r1; \
147-
r1 = %[map_timer] ll; \
148-
call %[bpf_map_lookup_elem]; \
149-
if r0 == 0 goto l0_%=; \
150-
r1 = r0; \
151-
r2 = %[map_timer] ll; \
152-
r3 = 1; \
153-
l0_%=: call %[bpf_timer_init]; \
154-
exit; \
155-
" :
156-
: __imm(bpf_map_lookup_elem),
157-
__imm(bpf_timer_init),
158-
__imm_addr(map_timer)
159-
: __clobber_all);
160-
}
161-
162-
SEC("raw_tracepoint")
163-
__description("bpf_timer_init is forbidden in BPF_PROG_TYPE_RAW_TRACEPOINT")
164-
__failure __msg("tracing progs cannot use bpf_timer yet")
165-
__naked void bpf_prog_type_raw_tracepoint_2(void)
166-
{
167-
asm volatile (" \
168-
r2 = r10; \
169-
r2 += -8; \
170-
r1 = 0; \
171-
*(u64*)(r2 + 0) = r1; \
172-
r1 = %[map_timer] ll; \
173-
call %[bpf_map_lookup_elem]; \
174-
if r0 == 0 goto l0_%=; \
175-
r1 = r0; \
176-
r2 = %[map_timer] ll; \
177-
r3 = 1; \
178-
l0_%=: call %[bpf_timer_init]; \
179-
exit; \
180-
" :
181-
: __imm(bpf_map_lookup_elem),
182-
__imm(bpf_timer_init),
183-
__imm_addr(map_timer)
184-
: __clobber_all);
185-
}
186-
18776
SEC("kprobe")
18877
__description("bpf_spin_lock is forbidden in BPF_PROG_TYPE_KPROBE")
18978
__failure __msg("tracing progs cannot use bpf_spin_lock yet")

0 commit comments

Comments
 (0)