selftests/bpf: Fix test_verifier after introducing resolve_pseudo_ldimm64
authorHao Luo <haoluo@google.com>
Wed, 7 Oct 2020 02:28:57 +0000 (19:28 -0700)
committerAlexei Starovoitov <ast@kernel.org>
Wed, 7 Oct 2020 03:16:57 +0000 (20:16 -0700)
commitbf88a80a0407e67f21ceafbf03828086f149dfad
tree8e48fdc0a9a73e127309540440f57b8176adf813
parent67ed375530e223624508382a9348a21c3b2ccc09
selftests/bpf: Fix test_verifier after introducing resolve_pseudo_ldimm64

Commit 4976b718c355 ("bpf: Introduce pseudo_btf_id") switched
the order of check_subprogs() and resolve_pseudo_ldimm() in
the verifier. Now an empty prog expects to see the error "last
insn is not an the prog of a single invalid ldimm exit or jmp"
instead, because the check for subprogs comes first. It's now
pointless to validate that half of ldimm64 won't be the last
instruction.

Tested:
 # ./test_verifier
 Summary: 1129 PASSED, 537 SKIPPED, 0 FAILED
 and the full set of bpf selftests.

Fixes: 4976b718c355 ("bpf: Introduce pseudo_btf_id")
Signed-off-by: Hao Luo <haoluo@google.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20201007022857.2791884-1-haoluo@google.com
tools/testing/selftests/bpf/verifier/basic.c
tools/testing/selftests/bpf/verifier/ld_imm64.c