Skip to content

Commit 6676f6a

Browse files
florianlkernel-patches-bot
authored andcommitted
selftests/bpf: Print reason when a tester could not run a program
Commit 8184d44 ("selftests/bpf: skip verifier tests for unsupported program types") added a check to skip unsupported program types. As bpf_probe_prog_type can change errno, do_single_test should save it before printing a reason why a supported BPF program type failed to load. Fixes: 8184d44 ("selftests/bpf: skip verifier tests for unsupported program types") Cc: Stanislav Fomichev <sdf@google.com> Cc: Krzesimir Nowak <krzesimir@kinvolk.io> Signed-off-by: Florian Lehner <dev@der-flo.net> Acked-by: Andrii Nakryiko <andrii@kernel.org>
1 parent 77daf87 commit 6676f6a

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

tools/testing/selftests/bpf/test_verifier.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -936,6 +936,7 @@ static void do_test_single(struct bpf_test *test, bool unpriv,
936936
int run_errs, run_successes;
937937
int map_fds[MAX_NR_MAPS];
938938
const char *expected_err;
939+
int saved_errno;
939940
int fixup_skips;
940941
__u32 pflags;
941942
int i, err;
@@ -997,6 +998,7 @@ static void do_test_single(struct bpf_test *test, bool unpriv,
997998
}
998999

9991000
fd_prog = bpf_load_program_xattr(&attr, bpf_vlog, sizeof(bpf_vlog));
1001+
saved_errno = errno;
10001002

10011003
/* BPF_PROG_TYPE_TRACING requires more setup and
10021004
* bpf_probe_prog_type won't give correct answer
@@ -1013,7 +1015,7 @@ static void do_test_single(struct bpf_test *test, bool unpriv,
10131015
if (expected_ret == ACCEPT || expected_ret == VERBOSE_ACCEPT) {
10141016
if (fd_prog < 0) {
10151017
printf("FAIL\nFailed to load prog '%s'!\n",
1016-
strerror(errno));
1018+
strerror(saved_errno));
10171019
goto fail_log;
10181020
}
10191021
#ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS

0 commit comments

Comments
 (0)