AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

selftests: bpf: Don't run sk_lookup in verifier tests

Browse Source 
commit b4f894633fa14d7d46ba7676f950b90a401504bb upstream.

sk_lookup doesn't allow setting data_in for bpf_prog_run. This doesn't
play well with the verifier tests, since they always set a 64 byte
input buffer. Allow not running verifier tests by setting
bpf_test.runs to a negative value and don't run the ctx access case
for sk_lookup. We have dedicated ctx access tests so skipping here
doesn't reduce coverage.

Signed-off-by: Lorenz Bauer <lmb@cloudflare.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20210303101816.36774-6-lmb@cloudflare.com
Signed-off-by: Tianchen Ding <dtcccc@linux.alibaba.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Lorenz Bauer 2022-08-01 15:29:16 +08:00 committed by Greg Kroah-Hartman
parent 6d3fad2b44
commit 4bfc9dc608
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/testing/selftests/bpf/test_verifier.c
View File

@ -100,7 +100,7 @@ struct bpf_test {
enum bpf_prog_type prog_type; enum bpf_prog_type prog_type;
uint8_t flags; uint8_t flags;
void (*fill_helper)(struct bpf_test *self); void (*fill_helper)(struct bpf_test *self);
uint8_t runs; int runs;
#define bpf_testdata_struct_t \ #define bpf_testdata_struct_t \
struct { \ struct { \
uint32_t retval, retval_unpriv; \ uint32_t retval, retval_unpriv; \
@ -1054,7 +1054,7 @@ static void do_test_single(struct bpf_test *test, bool unpriv,
run_errs = 0; run_errs = 0;
run_successes = 0; run_successes = 0;
if (!alignment_prevented_execution && fd_prog >= 0) { if (!alignment_prevented_execution && fd_prog >= 0 && test->runs >= 0) {
uint32_t expected_val; uint32_t expected_val;
int i; int i;

1
tools/testing/selftests/bpf/verifier/ctx_sk_lookup.c
View File

@ -239,6 +239,7 @@
.result = ACCEPT, .result = ACCEPT,
.prog_type = BPF_PROG_TYPE_SK_LOOKUP, .prog_type = BPF_PROG_TYPE_SK_LOOKUP,
.expected_attach_type = BPF_SK_LOOKUP, .expected_attach_type = BPF_SK_LOOKUP,
.runs = -1,
}, },
/* invalid 8-byte reads from a 4-byte fields in bpf_sk_lookup */ /* invalid 8-byte reads from a 4-byte fields in bpf_sk_lookup */
{ {