Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 118d38a3 authored by Stanislav Fomichev's avatar Stanislav Fomichev Committed by Greg Kroah-Hartman
Browse files

selftests/bpf: skip verifier tests for unsupported program types 



[ Upstream commit 8184d44c9a577a2f1842ed6cc844bfd4a9981d8e ]

Use recently introduced bpf_probe_prog_type() to skip tests in the
test_verifier() if bpf_verify_program() fails. The skipped test is
indicated in the output.

Example:

...
679/p bpf_get_stack return R0 within range SKIP (unsupported program
type 5)
680/p ld_abs: invalid op 1 OK
...
Summary: 863 PASSED, 165 SKIPPED, 3 FAILED

Signed-off-by: default avatarStanislav Fomichev <sdf@google.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ae92cf47

tools/testing/selftests/bpf/test_verifier.c

+8 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/if_ether.h>



#include <bpf/bpf.h>

#include <bpf/libbpf.h>



#ifdef HAVE_GENHDR

# include "autoconf.h"
@@ -56,6 +57,7 @@ 


#define UNPRIV_SYSCTL "kernel/unprivileged_bpf_disabled"

static bool unpriv_disabled = false;

static int skips;



struct bpf_test {

	const char *descr;
@@ -12770,6 +12772,11 @@ static void do_test_single(struct bpf_test *test, bool unpriv, 
	fd_prog = bpf_verify_program(prog_type ? : BPF_PROG_TYPE_SOCKET_FILTER,

				     prog, prog_len, test->flags & F_LOAD_WITH_STRICT_ALIGNMENT,

				     "GPL", 0, bpf_vlog, sizeof(bpf_vlog), 1);

	if (fd_prog < 0 && !bpf_probe_prog_type(prog_type, 0)) {

		printf("SKIP (unsupported program type %d)\n", prog_type);

		skips++;

		goto close_fds;

	}



	expected_ret = unpriv && test->result_unpriv != UNDEF ?

		       test->result_unpriv : test->result;
@@ -12905,7 +12912,7 @@ static void get_unpriv_disabled() 


static int do_test(bool unpriv, unsigned int from, unsigned int to)

{

	int i, passes = 0, errors = 0, skips = 0;

	int i, passes = 0, errors = 0;



	for (i = from; i < to; i++) {

		struct bpf_test *test = &tests[i];