提交 c33563e9 编写于 作者: G Greg Kroah-Hartman

Revert "selftests/bpf: skip verifier tests for unsupported program types"

This reverts commit 118d38a3 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: NTommi Rantala <tommi.t.rantala@nokia.com>
Cc: Stanislav Fomichev <sdf@google.com>
Cc: Sasha Levin <sashal@kernel.org>
Acked-by: NDaniel Borkmann <daniel@iogearbox.net>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 90110ffd
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include <linux/if_ether.h> #include <linux/if_ether.h>
#include <bpf/bpf.h> #include <bpf/bpf.h>
#include <bpf/libbpf.h>
#ifdef HAVE_GENHDR #ifdef HAVE_GENHDR
# include "autoconf.h" # include "autoconf.h"
...@@ -57,7 +56,6 @@ ...@@ -57,7 +56,6 @@
#define UNPRIV_SYSCTL "kernel/unprivileged_bpf_disabled" #define UNPRIV_SYSCTL "kernel/unprivileged_bpf_disabled"
static bool unpriv_disabled = false; static bool unpriv_disabled = false;
static int skips;
struct bpf_test { struct bpf_test {
const char *descr; const char *descr;
...@@ -12772,11 +12770,6 @@ static void do_test_single(struct bpf_test *test, bool unpriv, ...@@ -12772,11 +12770,6 @@ static void do_test_single(struct bpf_test *test, bool unpriv,
fd_prog = bpf_verify_program(prog_type ? : BPF_PROG_TYPE_SOCKET_FILTER, fd_prog = bpf_verify_program(prog_type ? : BPF_PROG_TYPE_SOCKET_FILTER,
prog, prog_len, test->flags & F_LOAD_WITH_STRICT_ALIGNMENT, prog, prog_len, test->flags & F_LOAD_WITH_STRICT_ALIGNMENT,
"GPL", 0, bpf_vlog, sizeof(bpf_vlog), 1); "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 ? expected_ret = unpriv && test->result_unpriv != UNDEF ?
test->result_unpriv : test->result; test->result_unpriv : test->result;
...@@ -12912,7 +12905,7 @@ static void get_unpriv_disabled() ...@@ -12912,7 +12905,7 @@ static void get_unpriv_disabled()
static int do_test(bool unpriv, unsigned int from, unsigned int to) 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++) { for (i = from; i < to; i++) {
struct bpf_test *test = &tests[i]; struct bpf_test *test = &tests[i];
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册