Skip to contentSkip to conversation

selftests/bpf: Fix test_verifier after introducing resolve_pseudo_ldimm64

PATCH Applied Hao Luo 2 participants 2 messages Oct 7, 2020

Subsystems (5)
lore
Share & tools
lore

Hao Luo

author
#0 lore raw

PATCH v3 1/1 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")

---
Changelog in v3:
- Remove without renaming the rest

Changelog in v2:
- Remove the test instead of modifying the err msg.

 tools/testing/selftests/bpf/verifier/basic.c    | 2 +-
 tools/testing/selftests/bpf/verifier/ld_imm64.c | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)
tools/testing/selftests/bpf/verifier/basic.c +1 -1
index b8d18642653a..de84f0d57082 100644
@@ -2,7 +2,7 @@
 	"empty prog",
 	.insns = {
 	},
-	.errstr = "unknown opcode 00",
+	.errstr = "last insn is not an exit or jmp",
 	.result = REJECT,
 },
 {
tools/testing/selftests/bpf/verifier/ld_imm64.c +0 -8
index 3856dba733e9..f9297900cea6 100644
@@ -50,14 +50,6 @@
 	.errstr = "invalid bpf_ld_imm64 insn",
 	.result = REJECT,
 },
-{
-	"test5 ld_imm64",
-	.insns = {
-	BPF_RAW_INSN(BPF_LD | BPF_IMM | BPF_DW, 0, 0, 0, 0),
-	},
-	.errstr = "invalid bpf_ld_imm64 insn",
-	.result = REJECT,
-},
 {
 	"test6 ld_imm64",
 	.insns = {
Signature · 1 line
2.28.0.806.g8561365e88-goog
#1 lore raw
This patch was applied to bpf/bpf-next.git (refs/heads/master):

Hello:

This patch was applied to bpf/bpf-next.git (refs/heads/master):

Quoted 9 lines · On Tue, 6 Oct 2020 19:28:57 -0700 you wrote:

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.

[...]

Here is the summary with links:
- [v3] selftests/bpf: Fix test_verifier after introducing resolve_pseudo_ldimm64

    https://git.kernel.org/bpf/bpf-next/c/bf88a80a0407

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html