Skip to content

Commit

Permalink
selftests/bpf: Expand coverage of preempt tests to sleepable kfunc
Browse files Browse the repository at this point in the history
For preemption-related kfuncs, we don't test their interaction with
sleepable kfuncs (we do test helpers) even though the verifier has
code to protect against such a pattern. Expand coverage of the selftest
to include this case.

Acked-by: Eduard Zingerman <[email protected]>
Signed-off-by: Kumar Kartikeya Dwivedi <[email protected]>
  • Loading branch information
kkdwivedi authored and Kernel Patches Daemon committed Nov 28, 2024
1 parent ec9ea59 commit c7c7954
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions tools/testing/selftests/bpf/progs/preempt_lock.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#include "bpf_misc.h"
#include "bpf_experimental.h"

extern int bpf_copy_from_user_str(void *dst, u32 dst__sz, const void *unsafe_ptr__ign, u64 flags) __weak __ksym;

SEC("?tc")
__failure __msg("BPF_EXIT instruction in main prog cannot be used inside bpf_preempt_disable-ed region")
int preempt_lock_missing_1(struct __sk_buff *ctx)
Expand Down Expand Up @@ -113,6 +115,18 @@ int preempt_sleepable_helper(void *ctx)
return 0;
}

SEC("?fentry.s/" SYS_PREFIX "sys_getpgid")
__failure __msg("kernel func bpf_copy_from_user_str is sleepable within non-preemptible region")
int preempt_sleepable_kfunc(void *ctx)
{
u32 data;

bpf_preempt_disable();
bpf_copy_from_user_str(&data, sizeof(data), NULL, 0);
bpf_preempt_enable();
return 0;
}

int __noinline preempt_global_subprog(void)
{
preempt_balance_subprog();
Expand Down

0 comments on commit c7c7954

Please sign in to comment.