| From 97f8ab14a01b356c19f81374ffeaacab2b59fddf Mon Sep 17 00:00:00 2001 |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Date: Thu, 23 May 2019 19:48:54 +0200 |
| Subject: Revert "selftests/bpf: skip verifier tests for unsupported program types" |
| |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| This reverts commit 118d38a3577f7728278f6afda8436af05a6bec7f which is |
| commit 8184d44c9a577a2f1842ed6cc844bfd4a9981d8e upstream. |
| |
| Tommi reports that this patch breaks the build, it's not really needed |
| so let's revert it. |
| |
| Reported-by: Tommi Rantala <tommi.t.rantala@nokia.com> |
| Cc: Stanislav Fomichev <sdf@google.com> |
| Cc: Sasha Levin <sashal@kernel.org> |
| Acked-by: Daniel Borkmann <daniel@iogearbox.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| tools/testing/selftests/bpf/test_verifier.c | 9 +-------- |
| 1 file changed, 1 insertion(+), 8 deletions(-) |
| |
| --- a/tools/testing/selftests/bpf/test_verifier.c |
| +++ b/tools/testing/selftests/bpf/test_verifier.c |
| @@ -32,7 +32,6 @@ |
| #include <linux/if_ether.h> |
| |
| #include <bpf/bpf.h> |
| -#include <bpf/libbpf.h> |
| |
| #ifdef HAVE_GENHDR |
| # include "autoconf.h" |
| @@ -57,7 +56,6 @@ |
| |
| #define UNPRIV_SYSCTL "kernel/unprivileged_bpf_disabled" |
| static bool unpriv_disabled = false; |
| -static int skips; |
| |
| struct bpf_test { |
| const char *descr; |
| @@ -12772,11 +12770,6 @@ static void do_test_single(struct bpf_te |
| 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; |
| @@ -12912,7 +12905,7 @@ static void get_unpriv_disabled() |
| |
| static int do_test(bool unpriv, unsigned int from, unsigned int to) |
| { |
| - int i, passes = 0, errors = 0; |
| + int i, passes = 0, errors = 0, skips = 0; |
| |
| for (i = from; i < to; i++) { |
| struct bpf_test *test = &tests[i]; |