bpf, selftests: Use bpf_probe_read_kernel
Subsystems (3)
PATCH 1/1 bpf, selftests: Use bpf_probe_read_kernel
Since commit 0ebeea8ca8a4 ("bpf: Restrict bpf_probe_read{, str}() only to archs where they work") 44 verifier tests fail on s390 due to not having bpf_probe_read anymore. Fix by using bpf_probe_read_kernel.
Signed-off-by Ilya Leoshkevich <[email protected]>
--- .../testing/selftests/bpf/verifier/const_or.c | 8 ++-- .../bpf/verifier/helper_access_var_len.c | 44 +++++++++---------- .../bpf/verifier/helper_value_access.c | 36 +++++++-------- .../testing/selftests/bpf/verifier/precise.c | 8 ++-- 4 files changed, 48 insertions(+), 48 deletions(-)
tools/testing/selftests/bpf/verifier/const_or.c +4 -4
@@ -6,7 +6,7 @@BPF_MOV64_IMM (BPF_REG_2 ,34 ),BPF_ALU64_IMM (BPF_OR ,BPF_REG_2 ,13 ),BPF_MOV64_IMM (BPF_REG_3 ,0 ), -BPF_EMIT_CALL (BPF_FUNC_probe_read), +BPF_EMIT_CALL (BPF_FUNC_probe_read_kernel), BPF_EXIT_INSN(), }, .result = ACCEPT,
@@ -20,7 +20,7 @@BPF_MOV64_IMM (BPF_REG_2 ,34 ),BPF_ALU64_IMM (BPF_OR ,BPF_REG_2 ,24 ),BPF_MOV64_IMM (BPF_REG_3 ,0 ), -BPF_EMIT_CALL (BPF_FUNC_probe_read), +BPF_EMIT_CALL (BPF_FUNC_probe_read_kernel), BPF_EXIT_INSN(), }, .errstr = "invalid stack type R1 off=-48 access_size=58",
@@ -36,7 +36,7 @@BPF_MOV64_IMM (BPF_REG_4 ,13 ),BPF_ALU64_REG (BPF_OR ,BPF_REG_2 ,BPF_REG_4 ),BPF_MOV64_IMM (BPF_REG_3 ,0 ), -BPF_EMIT_CALL (BPF_FUNC_probe_read), +BPF_EMIT_CALL (BPF_FUNC_probe_read_kernel), BPF_EXIT_INSN(), }, .result = ACCEPT,
@@ -51,7 +51,7 @@BPF_MOV64_IMM (BPF_REG_4 ,24 ),BPF_ALU64_REG (BPF_OR ,BPF_REG_2 ,BPF_REG_4 ),BPF_MOV64_IMM (BPF_REG_3 ,0 ), -BPF_EMIT_CALL (BPF_FUNC_probe_read), +BPF_EMIT_CALL (BPF_FUNC_probe_read_kernel), BPF_EXIT_INSN(), }, .errstr = "invalid stack type R1 off=-48 access_size=58",
tools/testing/selftests/bpf/verifier/helper_access_var_len.c +22 -22
176 lines not on this page · raw message
tools/testing/selftests/bpf/verifier/helper_value_access.c +18 -18
@@ -10,7 +10,7 @@BPF_MOV64_REG (BPF_REG_1 ,BPF_REG_0 ),BPF_MOV64_IMM (BPF_REG_2 ,sizeof (struct test_val )),BPF_MOV64_IMM (BPF_REG_3 ,0 ), -BPF_EMIT_CALL (BPF_FUNC_probe_read), +BPF_EMIT_CALL (BPF_FUNC_probe_read_kernel), BPF_EXIT_INSN(), }, .fixup_map_hash_48b = { 3 },
@@ -29,7 +29,7 @@BPF_MOV64_REG (BPF_REG_1 ,BPF_REG_0 ),BPF_MOV64_IMM (BPF_REG_2 ,8 ),BPF_MOV64_IMM (BPF_REG_3 ,0 ), -BPF_EMIT_CALL (BPF_FUNC_probe_read), +BPF_EMIT_CALL (BPF_FUNC_probe_read_kernel), BPF_EXIT_INSN(), }, .fixup_map_hash_48b = { 3 },
@@ -67,7 +67,7 @@BPF_MOV64_REG (BPF_REG_1 ,BPF_REG_0 ),BPF_MOV64_IMM (BPF_REG_2 ,sizeof (struct test_val ) +8 ),BPF_MOV64_IMM (BPF_REG_3 ,0 ), -BPF_EMIT_CALL (BPF_FUNC_probe_read), +BPF_EMIT_CALL (BPF_FUNC_probe_read_kernel), BPF_EXIT_INSN(), }, .fixup_map_hash_48b = { 3 },
@@ -87,7 +87,7 @@BPF_MOV64_REG (BPF_REG_1 ,BPF_REG_0 ),BPF_MOV64_IMM (BPF_REG_2 ,-8 ),BPF_MOV64_IMM (BPF_REG_3 ,0 ), -BPF_EMIT_CALL (BPF_FUNC_probe_read), +BPF_EMIT_CALL (BPF_FUNC_probe_read_kernel), BPF_EXIT_INSN(), }, .fixup_map_hash_48b = { 3 },
@@ -109,7 +109,7 @@BPF_MOV64_IMM (BPF_REG_2 ,sizeof (struct test_val ) - offsetof(struct test_val , foo)),BPF_MOV64_IMM (BPF_REG_3 ,0 ), -BPF_EMIT_CALL (BPF_FUNC_probe_read), +BPF_EMIT_CALL (BPF_FUNC_probe_read_kernel), BPF_EXIT_INSN(), }, .fixup_map_hash_48b = { 3 },
@@ -129,7 +129,7 @@BPF_ALU64_IMM (BPF_ADD ,BPF_REG_1 , offsetof(struct test_val , foo)),BPF_MOV64_IMM (BPF_REG_2 ,8 ),BPF_MOV64_IMM (BPF_REG_3 ,0 ), -BPF_EMIT_CALL (BPF_FUNC_probe_read), +BPF_EMIT_CALL (BPF_FUNC_probe_read_kernel), BPF_EXIT_INSN(), }, .fixup_map_hash_48b = { 3 },
@@ -170,7 +170,7 @@BPF_MOV64_IMM (BPF_REG_2 ,sizeof (struct test_val ) - offsetof(struct test_val , foo) +8 ),BPF_MOV64_IMM (BPF_REG_3 ,0 ), -BPF_EMIT_CALL (BPF_FUNC_probe_read), +BPF_EMIT_CALL (BPF_FUNC_probe_read_kernel), BPF_EXIT_INSN(), }, .fixup_map_hash_48b = { 3 },
@@ -191,7 +191,7 @@BPF_ALU64_IMM (BPF_ADD ,BPF_REG_1 , offsetof(struct test_val , foo)),BPF_MOV64_IMM (BPF_REG_2 ,-8 ),BPF_MOV64_IMM (BPF_REG_3 ,0 ), -BPF_EMIT_CALL (BPF_FUNC_probe_read), +BPF_EMIT_CALL (BPF_FUNC_probe_read_kernel), BPF_EXIT_INSN(), }, .fixup_map_hash_48b = { 3 },
@@ -212,7 +212,7 @@BPF_ALU64_IMM (BPF_ADD ,BPF_REG_1 , offsetof(struct test_val , foo)),BPF_MOV64_IMM (BPF_REG_2 ,-1 ),BPF_MOV64_IMM (BPF_REG_3 ,0 ), -BPF_EMIT_CALL (BPF_FUNC_probe_read), +BPF_EMIT_CALL (BPF_FUNC_probe_read_kernel), BPF_EXIT_INSN(), }, .fixup_map_hash_48b = { 3 },
@@ -235,7 +235,7 @@BPF_MOV64_IMM (BPF_REG_2 ,sizeof (struct test_val ) - offsetof(struct test_val , foo)),BPF_MOV64_IMM (BPF_REG_3 ,0 ), -BPF_EMIT_CALL (BPF_FUNC_probe_read), +BPF_EMIT_CALL (BPF_FUNC_probe_read_kernel), BPF_EXIT_INSN(), }, .fixup_map_hash_48b = { 3 },
@@ -256,7 +256,7 @@BPF_ALU64_REG (BPF_ADD ,BPF_REG_1 ,BPF_REG_3 ),BPF_MOV64_IMM (BPF_REG_2 ,8 ),BPF_MOV64_IMM (BPF_REG_3 ,0 ), -BPF_EMIT_CALL (BPF_FUNC_probe_read), +BPF_EMIT_CALL (BPF_FUNC_probe_read_kernel), BPF_EXIT_INSN(), }, .fixup_map_hash_48b = { 3 },
@@ -300,7 +300,7 @@sizeof (struct test_val ) - offsetof(struct test_val, foo) + 8),BPF_MOV64_IMM (BPF_REG_3 ,0 ), -BPF_EMIT_CALL (BPF_FUNC_probe_read), +BPF_EMIT_CALL (BPF_FUNC_probe_read_kernel), BPF_EXIT_INSN(), }, .fixup_map_hash_48b = { 3 },
@@ -322,7 +322,7 @@BPF_ALU64_REG (BPF_ADD ,BPF_REG_1 ,BPF_REG_3 ),BPF_MOV64_IMM (BPF_REG_2 ,-8 ),BPF_MOV64_IMM (BPF_REG_3 ,0 ), -BPF_EMIT_CALL (BPF_FUNC_probe_read), +BPF_EMIT_CALL (BPF_FUNC_probe_read_kernel), BPF_EXIT_INSN(), }, .fixup_map_hash_48b = { 3 },
@@ -344,7 +344,7 @@BPF_ALU64_REG (BPF_ADD ,BPF_REG_1 ,BPF_REG_3 ),BPF_MOV64_IMM (BPF_REG_2 ,-1 ),BPF_MOV64_IMM (BPF_REG_3 ,0 ), -BPF_EMIT_CALL (BPF_FUNC_probe_read), +BPF_EMIT_CALL (BPF_FUNC_probe_read_kernel), BPF_EXIT_INSN(), }, .fixup_map_hash_48b = { 3 },
@@ -368,7 +368,7 @@BPF_MOV64_IMM (BPF_REG_2 ,sizeof (struct test_val ) - offsetof(struct test_val , foo)),BPF_MOV64_IMM (BPF_REG_3 ,0 ), -BPF_EMIT_CALL (BPF_FUNC_probe_read), +BPF_EMIT_CALL (BPF_FUNC_probe_read_kernel), BPF_EXIT_INSN(), }, .fixup_map_hash_48b = { 3 },
@@ -390,7 +390,7 @@BPF_ALU64_REG (BPF_ADD ,BPF_REG_1 ,BPF_REG_3 ),BPF_MOV64_IMM (BPF_REG_2 ,8 ),BPF_MOV64_IMM (BPF_REG_3 ,0 ), -BPF_EMIT_CALL (BPF_FUNC_probe_read), +BPF_EMIT_CALL (BPF_FUNC_probe_read_kernel), BPF_EXIT_INSN(), }, .fixup_map_hash_48b = { 3 },
@@ -433,7 +433,7 @@BPF_ALU64_REG (BPF_ADD ,BPF_REG_1 ,BPF_REG_3 ),BPF_MOV64_IMM (BPF_REG_2 ,1 ),BPF_MOV64_IMM (BPF_REG_3 ,0 ), -BPF_EMIT_CALL (BPF_FUNC_probe_read), +BPF_EMIT_CALL (BPF_FUNC_probe_read_kernel), BPF_EXIT_INSN(), }, .fixup_map_hash_48b = { 3 },
@@ -458,7 +458,7 @@sizeof (struct test_val ) - offsetof(struct test_val, foo) + 1),BPF_MOV64_IMM (BPF_REG_3 ,0 ), -BPF_EMIT_CALL (BPF_FUNC_probe_read), +BPF_EMIT_CALL (BPF_FUNC_probe_read_kernel), BPF_EXIT_INSN(), }, .fixup_map_hash_48b = { 3 },
tools/testing/selftests/bpf/verifier/precise.c +4 -4
@@ -31,14 +31,14 @@BPF_MOV64_REG (BPF_REG_1 ,BPF_REG_FP ),BPF_ALU64_IMM (BPF_ADD ,BPF_REG_1 ,-8 ),BPF_MOV64_IMM (BPF_REG_3 ,0 ), -BPF_EMIT_CALL (BPF_FUNC_probe_read), +BPF_EMIT_CALL (BPF_FUNC_probe_read_kernel), BPF_EXIT_INSN(), }, .prog_type =BPF_PROG_TYPE_TRACEPOINT , .fixup_map_array_48b = { 1 }, .result = VERBOSE_ACCEPT, .errstr = -"26: (85) call bpf_probe_read#4\ +"26: (85) call bpf_probe_read_kernel#113\ last_idx 26 first_idx 20\ regs=4 stack=0 before 25\ regs=4 stack=0 before 24\
@@ -91,7 +91,7 @@BPF_MOV64_REG (BPF_REG_1 ,BPF_REG_FP ),BPF_ALU64_IMM (BPF_ADD ,BPF_REG_1 ,-8 ),BPF_MOV64_IMM (BPF_REG_3 ,0 ), -BPF_EMIT_CALL (BPF_FUNC_probe_read), +BPF_EMIT_CALL (BPF_FUNC_probe_read_kernel), BPF_EXIT_INSN(), }, .prog_type = BPF_PROG_TYPE_TRACEPOINT,
@@ -99,7 +99,7 @@ .result = VERBOSE_ACCEPT, .flags = BPF_F_TEST_STATE_FREQ, .errstr = -"26: (85) call bpf_probe_read#4\ +"26: (85) call bpf_probe_read_kernel#113\ last_idx 26 first_idx 22\ regs=4 stack=0 before 25\ regs=4 stack=0 before 24\
Signature · 1 line
2.25.4
Daniel Borkmann
maintainerQuoted 5 lines · Ilya Leoshkevich
Since commit
0ebeea8ca8a4("bpf: Restrict bpf_probe_read{, str}() only to archs where they work") 44 verifier tests fail on s390 due to not havingbpf_probe_readanymore. Fix by usingbpf_probe_read_kernel.Signed-off-by Ilya Leoshkevich <[email protected]>
Good point, applied, thanks!