Skip to content

L
linux
Commit 0c91c423 authored by Daniel Borkmann's avatar Daniel Borkmann
Browse files
Options

Merge branch 'bpf-improve-test-verifier-coverage' 

Alexei Starovoitov says:

====================
BPF verifier has 700+ tests used to check correctness of the verifier.
Beyond checking the verifier log tell kernel to run accepted programs
as well via bpf_prog_test_run() command. That improves quality of the
tests and increases bpf test coverage.
====================
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parents e7b2823a 111e6b45
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 1 deletion
kernel/bpf/syscall.c
View file @ 0c91c423
...@@ -1504,6 +1504,8 @@ static int bpf_prog_test_run(const union bpf_attr *attr, ...@@ -1504,6 +1504,8 @@ static int bpf_prog_test_run(const union bpf_attr *attr,
struct bpf_prog *prog; struct bpf_prog *prog;
int ret = -ENOTSUPP; int ret = -ENOTSUPP;
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
if (CHECK_ATTR(BPF_PROG_TEST_RUN)) if (CHECK_ATTR(BPF_PROG_TEST_RUN))
return -EINVAL; return -EINVAL;
......
net/core/filter.c
View file @ 0c91c423
...@@ -4526,6 +4526,7 @@ const struct bpf_verifier_ops sk_filter_verifier_ops = { ...@@ -4526,6 +4526,7 @@ const struct bpf_verifier_ops sk_filter_verifier_ops = {
}; };
const struct bpf_prog_ops sk_filter_prog_ops = { const struct bpf_prog_ops sk_filter_prog_ops = {
.test_run = bpf_prog_test_run_skb,
}; };
const struct bpf_verifier_ops tc_cls_act_verifier_ops = { const struct bpf_verifier_ops tc_cls_act_verifier_ops = {
......
tools/testing/selftests/bpf/test_verifier.c
View file @ 0c91c423
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <linux/filter.h> #include <linux/filter.h>
#include <linux/bpf_perf_event.h> #include <linux/bpf_perf_event.h>
#include <linux/bpf.h> #include <linux/bpf.h>
#include <linux/if_ether.h>
#include <bpf/bpf.h> #include <bpf/bpf.h>
...@@ -49,6 +50,8 @@ ...@@ -49,6 +50,8 @@
#define MAX_INSNS 512 #define MAX_INSNS 512
#define MAX_FIXUPS 8 #define MAX_FIXUPS 8
#define MAX_NR_MAPS 4 #define MAX_NR_MAPS 4
#define POINTER_VALUE 0xcafe4all
#define TEST_DATA_LEN 64
#define F_NEEDS_EFFICIENT_UNALIGNED_ACCESS (1 << 0) #define F_NEEDS_EFFICIENT_UNALIGNED_ACCESS (1 << 0)
#define F_LOAD_WITH_STRICT_ALIGNMENT (1 << 1) #define F_LOAD_WITH_STRICT_ALIGNMENT (1 << 1)
...@@ -62,6 +65,7 @@ struct bpf_test { ...@@ -62,6 +65,7 @@ struct bpf_test {
int fixup_map_in_map[MAX_FIXUPS]; int fixup_map_in_map[MAX_FIXUPS];
const char *errstr; const char *errstr;
const char *errstr_unpriv; const char *errstr_unpriv;
uint32_t retval;
enum { enum {
UNDEF, UNDEF,
ACCEPT, ACCEPT,
...@@ -95,6 +99,7 @@ static struct bpf_test tests[] = { ...@@ -95,6 +99,7 @@ static struct bpf_test tests[] = {
BPF_EXIT_INSN(), BPF_EXIT_INSN(),
}, },
.result = ACCEPT, .result = ACCEPT,
.retval = -3,
}, },
{ {
"unreachable", "unreachable",
...@@ -210,6 +215,7 @@ static struct bpf_test tests[] = { ...@@ -210,6 +215,7 @@ static struct bpf_test tests[] = {
BPF_EXIT_INSN(), BPF_EXIT_INSN(),
}, },
.result = ACCEPT, .result = ACCEPT,
.retval = 1,
}, },
{ {
"test8 ld_imm64", "test8 ld_imm64",
...@@ -517,6 +523,7 @@ static struct bpf_test tests[] = { ...@@ -517,6 +523,7 @@ static struct bpf_test tests[] = {
.errstr_unpriv = "R0 leaks addr", .errstr_unpriv = "R0 leaks addr",
.result = ACCEPT, .result = ACCEPT,
.result_unpriv = REJECT, .result_unpriv = REJECT,
.retval = POINTER_VALUE,
}, },
{ {
"check valid spill/fill, skb mark", "check valid spill/fill, skb mark",
...@@ -803,6 +810,7 @@ static struct bpf_test tests[] = { ...@@ -803,6 +810,7 @@ static struct bpf_test tests[] = {
.errstr_unpriv = "R1 pointer comparison", .errstr_unpriv = "R1 pointer comparison",
.result_unpriv = REJECT, .result_unpriv = REJECT,
.result = ACCEPT, .result = ACCEPT,
.retval = -ENOENT,
}, },
{ {
"jump test 4", "jump test 4",
...@@ -1823,6 +1831,7 @@ static struct bpf_test tests[] = { ...@@ -1823,6 +1831,7 @@ static struct bpf_test tests[] = {
BPF_EXIT_INSN(), BPF_EXIT_INSN(),
}, },
.result = ACCEPT, .result = ACCEPT,
.retval = 0xfaceb00c,
}, },
{ {
"PTR_TO_STACK store/load - bad alignment on off", "PTR_TO_STACK store/load - bad alignment on off",
...@@ -1881,6 +1890,7 @@ static struct bpf_test tests[] = { ...@@ -1881,6 +1890,7 @@ static struct bpf_test tests[] = {
.result = ACCEPT, .result = ACCEPT,
.result_unpriv = REJECT, .result_unpriv = REJECT,
.errstr_unpriv = "R0 leaks addr", .errstr_unpriv = "R0 leaks addr",
.retval = POINTER_VALUE,
}, },
{ {
"unpriv: add const to pointer", "unpriv: add const to pointer",
...@@ -2054,6 +2064,7 @@ static struct bpf_test tests[] = { ...@@ -2054,6 +2064,7 @@ static struct bpf_test tests[] = {
BPF_LDX_MEM(BPF_DW, BPF_REG_1, BPF_REG_6, 0), BPF_LDX_MEM(BPF_DW, BPF_REG_1, BPF_REG_6, 0),
BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
BPF_FUNC_get_hash_recalc), BPF_FUNC_get_hash_recalc),
BPF_MOV64_IMM(BPF_REG_0, 0),
BPF_EXIT_INSN(), BPF_EXIT_INSN(),
}, },
.result = ACCEPT, .result = ACCEPT,
...@@ -2818,6 +2829,7 @@ static struct bpf_test tests[] = { ...@@ -2818,6 +2829,7 @@ static struct bpf_test tests[] = {
}, },
.result = ACCEPT, .result = ACCEPT,
.prog_type = BPF_PROG_TYPE_SCHED_CLS, .prog_type = BPF_PROG_TYPE_SCHED_CLS,
.retval = 1,
}, },
{ {
"direct packet access: test12 (and, good access)", "direct packet access: test12 (and, good access)",
...@@ -2842,6 +2854,7 @@ static struct bpf_test tests[] = { ...@@ -2842,6 +2854,7 @@ static struct bpf_test tests[] = {
}, },
.result = ACCEPT, .result = ACCEPT,
.prog_type = BPF_PROG_TYPE_SCHED_CLS, .prog_type = BPF_PROG_TYPE_SCHED_CLS,
.retval = 1,
}, },
{ {
"direct packet access: test13 (branches, good access)", "direct packet access: test13 (branches, good access)",
...@@ -2872,6 +2885,7 @@ static struct bpf_test tests[] = { ...@@ -2872,6 +2885,7 @@ static struct bpf_test tests[] = {
}, },
.result = ACCEPT, .result = ACCEPT,
.prog_type = BPF_PROG_TYPE_SCHED_CLS, .prog_type = BPF_PROG_TYPE_SCHED_CLS,
.retval = 1,
}, },
{ {
"direct packet access: test14 (pkt_ptr += 0, CONST_IMM, good access)", "direct packet access: test14 (pkt_ptr += 0, CONST_IMM, good access)",
...@@ -2895,6 +2909,7 @@ static struct bpf_test tests[] = { ...@@ -2895,6 +2909,7 @@ static struct bpf_test tests[] = {
}, },
.result = ACCEPT, .result = ACCEPT,
.prog_type = BPF_PROG_TYPE_SCHED_CLS, .prog_type = BPF_PROG_TYPE_SCHED_CLS,
.retval = 1,
}, },
{ {
"direct packet access: test15 (spill with xadd)", "direct packet access: test15 (spill with xadd)",
...@@ -3181,6 +3196,7 @@ static struct bpf_test tests[] = { ...@@ -3181,6 +3196,7 @@ static struct bpf_test tests[] = {
}, },
.result = ACCEPT, .result = ACCEPT,
.prog_type = BPF_PROG_TYPE_SCHED_CLS, .prog_type = BPF_PROG_TYPE_SCHED_CLS,
.retval = 1,
}, },
{ {
"direct packet access: test28 (marking on <=, bad access)", "direct packet access: test28 (marking on <=, bad access)",
...@@ -5798,6 +5814,7 @@ static struct bpf_test tests[] = { ...@@ -5798,6 +5814,7 @@ static struct bpf_test tests[] = {
}, },
.result = ACCEPT, .result = ACCEPT,
.prog_type = BPF_PROG_TYPE_SCHED_CLS, .prog_type = BPF_PROG_TYPE_SCHED_CLS,
.retval = 0 /* csum_diff of 64-byte packet */,
}, },
{ {
"helper access to variable memory: size = 0 not allowed on NULL (!ARG_PTR_TO_MEM_OR_NULL)", "helper access to variable memory: size = 0 not allowed on NULL (!ARG_PTR_TO_MEM_OR_NULL)",
...@@ -6166,6 +6183,7 @@ static struct bpf_test tests[] = { ...@@ -6166,6 +6183,7 @@ static struct bpf_test tests[] = {
}, },
.prog_type = BPF_PROG_TYPE_SCHED_CLS, .prog_type = BPF_PROG_TYPE_SCHED_CLS,
.result = ACCEPT, .result = ACCEPT,
.retval = 42 /* ultimate return value */,
}, },
{ {
"ld_ind: check calling conv, r1", "ld_ind: check calling conv, r1",
...@@ -6237,6 +6255,7 @@ static struct bpf_test tests[] = { ...@@ -6237,6 +6255,7 @@ static struct bpf_test tests[] = {
BPF_EXIT_INSN(), BPF_EXIT_INSN(),
}, },
.result = ACCEPT, .result = ACCEPT,
.retval = 1,
}, },
{ {
"check bpf_perf_event_data->sample_period byte load permitted", "check bpf_perf_event_data->sample_period byte load permitted",
...@@ -7224,6 +7243,7 @@ static struct bpf_test tests[] = { ...@@ -7224,6 +7243,7 @@ static struct bpf_test tests[] = {
}, },
.fixup_map1 = { 3 }, .fixup_map1 = { 3 },
.result = ACCEPT, .result = ACCEPT,
.retval = POINTER_VALUE,
.result_unpriv = REJECT, .result_unpriv = REJECT,
.errstr_unpriv = "R0 leaks addr as return value" .errstr_unpriv = "R0 leaks addr as return value"
}, },
...@@ -7244,6 +7264,7 @@ static struct bpf_test tests[] = { ...@@ -7244,6 +7264,7 @@ static struct bpf_test tests[] = {
}, },
.fixup_map1 = { 3 }, .fixup_map1 = { 3 },
.result = ACCEPT, .result = ACCEPT,
.retval = POINTER_VALUE,
.result_unpriv = REJECT, .result_unpriv = REJECT,
.errstr_unpriv = "R0 leaks addr as return value" .errstr_unpriv = "R0 leaks addr as return value"
}, },
...@@ -7685,6 +7706,7 @@ static struct bpf_test tests[] = { ...@@ -7685,6 +7706,7 @@ static struct bpf_test tests[] = {
BPF_EXIT_INSN(), BPF_EXIT_INSN(),
}, },
.result = ACCEPT, .result = ACCEPT,
.retval = TEST_DATA_LEN,
.prog_type = BPF_PROG_TYPE_SCHED_CLS, .prog_type = BPF_PROG_TYPE_SCHED_CLS,
}, },
{ {
...@@ -8705,6 +8727,7 @@ static struct bpf_test tests[] = { ...@@ -8705,6 +8727,7 @@ static struct bpf_test tests[] = {
.errstr_unpriv = "function calls to other bpf functions are allowed for root only", .errstr_unpriv = "function calls to other bpf functions are allowed for root only",
.result_unpriv = REJECT, .result_unpriv = REJECT,
.result = ACCEPT, .result = ACCEPT,
.retval = 1,
}, },
{ {
"calls: overlapping caller/callee", "calls: overlapping caller/callee",
...@@ -8900,6 +8923,7 @@ static struct bpf_test tests[] = { ...@@ -8900,6 +8923,7 @@ static struct bpf_test tests[] = {
}, },
.prog_type = BPF_PROG_TYPE_SCHED_ACT, .prog_type = BPF_PROG_TYPE_SCHED_ACT,
.result = ACCEPT, .result = ACCEPT,
.retval = TEST_DATA_LEN,
}, },
{ {
"calls: callee using args1", "calls: callee using args1",
...@@ -8912,6 +8936,7 @@ static struct bpf_test tests[] = { ...@@ -8912,6 +8936,7 @@ static struct bpf_test tests[] = {
.errstr_unpriv = "allowed for root only", .errstr_unpriv = "allowed for root only",
.result_unpriv = REJECT, .result_unpriv = REJECT,
.result = ACCEPT, .result = ACCEPT,
.retval = POINTER_VALUE,
}, },
{ {
"calls: callee using wrong args2", "calls: callee using wrong args2",
...@@ -8942,6 +8967,7 @@ static struct bpf_test tests[] = { ...@@ -8942,6 +8967,7 @@ static struct bpf_test tests[] = {
.errstr_unpriv = "allowed for root only", .errstr_unpriv = "allowed for root only",
.result_unpriv = REJECT, .result_unpriv = REJECT,
.result = ACCEPT, .result = ACCEPT,
.retval = TEST_DATA_LEN + TEST_DATA_LEN - ETH_HLEN - ETH_HLEN,
}, },
{ {
"calls: callee changing pkt pointers", "calls: callee changing pkt pointers",
...@@ -8990,6 +9016,7 @@ static struct bpf_test tests[] = { ...@@ -8990,6 +9016,7 @@ static struct bpf_test tests[] = {
}, },
.prog_type = BPF_PROG_TYPE_SCHED_CLS, .prog_type = BPF_PROG_TYPE_SCHED_CLS,
.result = ACCEPT, .result = ACCEPT,
.retval = TEST_DATA_LEN + TEST_DATA_LEN,
}, },
{ {
"calls: calls with stack arith", "calls: calls with stack arith",
...@@ -9008,6 +9035,7 @@ static struct bpf_test tests[] = { ...@@ -9008,6 +9035,7 @@ static struct bpf_test tests[] = {
}, },
.prog_type = BPF_PROG_TYPE_SCHED_CLS, .prog_type = BPF_PROG_TYPE_SCHED_CLS,
.result = ACCEPT, .result = ACCEPT,
.retval = 42,
}, },
{ {
"calls: calls with misaligned stack access", "calls: calls with misaligned stack access",
...@@ -9041,6 +9069,7 @@ static struct bpf_test tests[] = { ...@@ -9041,6 +9069,7 @@ static struct bpf_test tests[] = {
}, },
.prog_type = BPF_PROG_TYPE_SCHED_CLS, .prog_type = BPF_PROG_TYPE_SCHED_CLS,
.result = ACCEPT, .result = ACCEPT,
.retval = 43,
}, },
{ {
"calls: calls control flow, jump test 2", "calls: calls control flow, jump test 2",
...@@ -9533,6 +9562,7 @@ static struct bpf_test tests[] = { ...@@ -9533,6 +9562,7 @@ static struct bpf_test tests[] = {
}, },
.prog_type = BPF_PROG_TYPE_XDP, .prog_type = BPF_PROG_TYPE_XDP,
.result = ACCEPT, .result = ACCEPT,
.retval = 42,
}, },
{ {
"calls: write into callee stack frame", "calls: write into callee stack frame",
...@@ -10144,6 +10174,7 @@ static struct bpf_test tests[] = { ...@@ -10144,6 +10174,7 @@ static struct bpf_test tests[] = {
}, },
.result = ACCEPT, .result = ACCEPT,
.prog_type = BPF_PROG_TYPE_SCHED_CLS, .prog_type = BPF_PROG_TYPE_SCHED_CLS,
.retval = POINTER_VALUE,
}, },
{ {
"calls: pkt_ptr spill into caller stack 2", "calls: pkt_ptr spill into caller stack 2",
...@@ -10209,6 +10240,7 @@ static struct bpf_test tests[] = { ...@@ -10209,6 +10240,7 @@ static struct bpf_test tests[] = {
}, },
.prog_type = BPF_PROG_TYPE_SCHED_CLS, .prog_type = BPF_PROG_TYPE_SCHED_CLS,
.result = ACCEPT, .result = ACCEPT,
.retval = 1,
}, },
{ {
"calls: pkt_ptr spill into caller stack 4", "calls: pkt_ptr spill into caller stack 4",
...@@ -10242,6 +10274,7 @@ static struct bpf_test tests[] = { ...@@ -10242,6 +10274,7 @@ static struct bpf_test tests[] = {
}, },
.prog_type = BPF_PROG_TYPE_SCHED_CLS, .prog_type = BPF_PROG_TYPE_SCHED_CLS,
.result = ACCEPT, .result = ACCEPT,
.retval = 1,
}, },
{ {
"calls: pkt_ptr spill into caller stack 5", "calls: pkt_ptr spill into caller stack 5",
...@@ -10650,10 +10683,12 @@ static void do_test_single(struct bpf_test *test, bool unpriv, ...@@ -10650,10 +10683,12 @@ static void do_test_single(struct bpf_test *test, bool unpriv,
int fd_prog, expected_ret, reject_from_alignment; int fd_prog, expected_ret, reject_from_alignment;
struct bpf_insn *prog = test->insns; struct bpf_insn *prog = test->insns;
int prog_len = probe_filter_length(prog); int prog_len = probe_filter_length(prog);
char data_in[TEST_DATA_LEN] = {};
int prog_type = test->prog_type; int prog_type = test->prog_type;
int map_fds[MAX_NR_MAPS]; int map_fds[MAX_NR_MAPS];
const char *expected_err; const char *expected_err;
int i; uint32_t retval;
int i, err;
for (i = 0; i < MAX_NR_MAPS; i++) for (i = 0; i < MAX_NR_MAPS; i++)
map_fds[i] = -1; map_fds[i] = -1;
...@@ -10696,6 +10731,19 @@ static void do_test_single(struct bpf_test *test, bool unpriv, ...@@ -10696,6 +10731,19 @@ static void do_test_single(struct bpf_test *test, bool unpriv,
} }
} }
if (fd_prog >= 0) {
err = bpf_prog_test_run(fd_prog, 1, data_in, sizeof(data_in),
NULL, NULL, &retval, NULL);
if (err && errno != 524/*ENOTSUPP*/ && errno != EPERM) {
printf("Unexpected bpf_prog_test_run error\n");
goto fail_log;
}
if (!err && retval != test->retval &&
test->retval != POINTER_VALUE) {
printf("FAIL retval %d != %d\n", retval, test->retval);
goto fail_log;
}
}
(*passes)++; (*passes)++;
printf("OK%s\n", reject_from_alignment ? printf("OK%s\n", reject_from_alignment ?
" (NOTE: reject due to unknown alignment)" : ""); " (NOTE: reject due to unknown alignment)" : "");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7