|
|
@@ -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];
|