Skip to content

Commit

Permalink
selftests/bpf: Skip callback tests if jit is disabled in test_verifier
Browse files Browse the repository at this point in the history
If CONFIG_BPF_JIT_ALWAYS_ON is not set and bpf_jit_enable is 0, there
exist 6 failed tests.

  [root@linux bpf]# echo 0 > /proc/sys/net/core/bpf_jit_enable
  [root@linux bpf]# echo 0 > /proc/sys/kernel/unprivileged_bpf_disabled
  [root@linux bpf]# ./test_verifier | grep FAIL
  torvalds#106/p inline simple bpf_loop call FAIL
  torvalds#107/p don't inline bpf_loop call, flags non-zero FAIL
  torvalds#108/p don't inline bpf_loop call, callback non-constant FAIL
  torvalds#109/p bpf_loop_inline and a dead func FAIL
  torvalds#110/p bpf_loop_inline stack locations for loop vars FAIL
  torvalds#111/p inline bpf_loop call in a big program FAIL
  Summary: 768 PASSED, 15 SKIPPED, 6 FAILED

The test log shows that callbacks are not allowed in non-JITed programs,
interpreter doesn't support them yet, thus these tests should be skipped
if jit is disabled, copy some check functions from the other places under
tools directory, and then handle this case in do_test_single().

With this patch:

  [root@linux bpf]# echo 0 > /proc/sys/net/core/bpf_jit_enable
  [root@linux bpf]# echo 0 > /proc/sys/kernel/unprivileged_bpf_disabled
  [root@linux bpf]# ./test_verifier | grep FAIL
  Summary: 768 PASSED, 21 SKIPPED, 0 FAILED

Signed-off-by: Tiezhu Yang <[email protected]>
  • Loading branch information
Tiezhu Yang authored and intel-lab-lkp committed Jan 15, 2024
1 parent e3c12a7 commit edaea8e
Showing 1 changed file with 23 additions and 0 deletions.
23 changes: 23 additions & 0 deletions tools/testing/selftests/bpf/test_verifier.c
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
1ULL << CAP_BPF)
#define UNPRIV_SYSCTL "kernel/unprivileged_bpf_disabled"
static bool unpriv_disabled = false;
static bool jit_disabled;
static int skips;
static bool verbose = false;
static int verif_log_level = 0;
Expand Down Expand Up @@ -1355,6 +1356,16 @@ static bool is_skip_insn(struct bpf_insn *insn)
return memcmp(insn, &skip_insn, sizeof(skip_insn)) == 0;
}

static bool is_ldimm64_insn(struct bpf_insn *insn)
{
return insn->code == (BPF_LD | BPF_IMM | BPF_DW);
}

static bool insn_is_pseudo_func(struct bpf_insn *insn)
{
return is_ldimm64_insn(insn) && insn->src_reg == BPF_PSEUDO_FUNC;
}

static int null_terminated_insn_len(struct bpf_insn *seq, int max_len)
{
int i;
Expand Down Expand Up @@ -1619,6 +1630,16 @@ static void do_test_single(struct bpf_test *test, bool unpriv,
goto close_fds;
}

if (fd_prog < 0 && saved_errno == EINVAL && jit_disabled) {
for (i = 0; i < prog_len; i++, prog++) {
if (insn_is_pseudo_func(prog)) {
printf("SKIP (callbacks are not allowed in non-JITed programs)\n");
skips++;
goto close_fds;
}
}
}

alignment_prevented_execution = 0;

if (expected_ret == ACCEPT || expected_ret == VERBOSE_ACCEPT) {
Expand Down Expand Up @@ -1844,6 +1865,8 @@ int main(int argc, char **argv)
return EXIT_FAILURE;
}

jit_disabled = !is_jit_enabled();

/* Use libbpf 1.0 API mode */
libbpf_set_strict_mode(LIBBPF_STRICT_ALL);

Expand Down

0 comments on commit edaea8e

Please sign in to comment.