mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 04:47:05 +00:00
selftests/bpf: verifier/value.c converted to inline assembly
Test verifier/value.c automatically converted to use inline assembly. Signed-off-by: Eduard Zingerman <eddyz87@gmail.com> Link: https://lore.kernel.org/r/20230325025524.144043-39-eddyz87@gmail.com Signed-off-by: Alexei Starovoitov <ast@kernel.org>
This commit is contained in:
Eduard Zingerman
Alexei Starovoitov
parent
033914942d
commit
8f59e87a3b
3 changed files with 160 additions and 104 deletions
|
|
@ -35,6 +35,7 @@
|
|||
#include "verifier_stack_ptr.skel.h"
|
||||
#include "verifier_uninit.skel.h"
|
||||
#include "verifier_value_adj_spill.skel.h"
|
||||
#include "verifier_value.skel.h"
|
||||
|
||||
__maybe_unused
|
||||
static void run_tests_aux(const char *skel_name, skel_elf_bytes_fn elf_bytes_factory)
|
||||
|
|
@ -92,3 +93,4 @@ void test_verifier_spill_fill(void) { RUN(verifier_spill_fill); }
|
|||
void test_verifier_stack_ptr(void) { RUN(verifier_stack_ptr); }
|
||||
void test_verifier_uninit(void) { RUN(verifier_uninit); }
|
||||
void test_verifier_value_adj_spill(void) { RUN(verifier_value_adj_spill); }
|
||||
void test_verifier_value(void) { RUN(verifier_value); }
|
||||
|
|
|
|||
158
tools/testing/selftests/bpf/progs/verifier_value.c
Normal file
158
tools/testing/selftests/bpf/progs/verifier_value.c
Normal file
|
|
@ -0,0 +1,158 @@
|
|||
// SPDX-License-Identifier: GPL-2.0
|
||||
/* Converted from tools/testing/selftests/bpf/verifier/value.c */
|
||||
|
||||
#include <linux/bpf.h>
|
||||
#include <bpf/bpf_helpers.h>
|
||||
#include "bpf_misc.h"
|
||||
|
||||
#define MAX_ENTRIES 11
|
||||
|
||||
struct test_val {
|
||||
unsigned int index;
|
||||
int foo[MAX_ENTRIES];
|
||||
};
|
||||
|
||||
struct {
|
||||
__uint(type, BPF_MAP_TYPE_HASH);
|
||||
__uint(max_entries, 1);
|
||||
__type(key, long long);
|
||||
__type(value, struct test_val);
|
||||
} map_hash_48b SEC(".maps");
|
||||
|
||||
SEC("socket")
|
||||
__description("map element value store of cleared call register")
|
||||
__failure __msg("R1 !read_ok")
|
||||
__failure_unpriv __msg_unpriv("R1 !read_ok")
|
||||
__naked void store_of_cleared_call_register(void)
|
||||
{
|
||||
asm volatile (" \
|
||||
r2 = r10; \
|
||||
r2 += -8; \
|
||||
r1 = 0; \
|
||||
*(u64*)(r2 + 0) = r1; \
|
||||
r1 = %[map_hash_48b] ll; \
|
||||
call %[bpf_map_lookup_elem]; \
|
||||
if r0 == 0 goto l0_%=; \
|
||||
*(u64*)(r0 + 0) = r1; \
|
||||
l0_%=: exit; \
|
||||
" :
|
||||
: __imm(bpf_map_lookup_elem),
|
||||
__imm_addr(map_hash_48b)
|
||||
: __clobber_all);
|
||||
}
|
||||
|
||||
SEC("socket")
|
||||
__description("map element value with unaligned store")
|
||||
__success __failure_unpriv __msg_unpriv("R0 leaks addr")
|
||||
__retval(0) __flag(BPF_F_ANY_ALIGNMENT)
|
||||
__naked void element_value_with_unaligned_store(void)
|
||||
{
|
||||
asm volatile (" \
|
||||
r2 = r10; \
|
||||
r2 += -8; \
|
||||
r1 = 0; \
|
||||
*(u64*)(r2 + 0) = r1; \
|
||||
r1 = %[map_hash_48b] ll; \
|
||||
call %[bpf_map_lookup_elem]; \
|
||||
if r0 == 0 goto l0_%=; \
|
||||
r0 += 3; \
|
||||
r1 = 42; \
|
||||
*(u64*)(r0 + 0) = r1; \
|
||||
r1 = 43; \
|
||||
*(u64*)(r0 + 2) = r1; \
|
||||
r1 = 44; \
|
||||
*(u64*)(r0 - 2) = r1; \
|
||||
r8 = r0; \
|
||||
r1 = 32; \
|
||||
*(u64*)(r8 + 0) = r1; \
|
||||
r1 = 33; \
|
||||
*(u64*)(r8 + 2) = r1; \
|
||||
r1 = 34; \
|
||||
*(u64*)(r8 - 2) = r1; \
|
||||
r8 += 5; \
|
||||
r1 = 22; \
|
||||
*(u64*)(r8 + 0) = r1; \
|
||||
r1 = 23; \
|
||||
*(u64*)(r8 + 4) = r1; \
|
||||
r1 = 24; \
|
||||
*(u64*)(r8 - 7) = r1; \
|
||||
r7 = r8; \
|
||||
r7 += 3; \
|
||||
r1 = 22; \
|
||||
*(u64*)(r7 + 0) = r1; \
|
||||
r1 = 23; \
|
||||
*(u64*)(r7 + 4) = r1; \
|
||||
r1 = 24; \
|
||||
*(u64*)(r7 - 4) = r1; \
|
||||
l0_%=: exit; \
|
||||
" :
|
||||
: __imm(bpf_map_lookup_elem),
|
||||
__imm_addr(map_hash_48b)
|
||||
: __clobber_all);
|
||||
}
|
||||
|
||||
SEC("socket")
|
||||
__description("map element value with unaligned load")
|
||||
__success __failure_unpriv __msg_unpriv("R0 leaks addr")
|
||||
__retval(0) __flag(BPF_F_ANY_ALIGNMENT)
|
||||
__naked void element_value_with_unaligned_load(void)
|
||||
{
|
||||
asm volatile (" \
|
||||
r2 = r10; \
|
||||
r2 += -8; \
|
||||
r1 = 0; \
|
||||
*(u64*)(r2 + 0) = r1; \
|
||||
r1 = %[map_hash_48b] ll; \
|
||||
call %[bpf_map_lookup_elem]; \
|
||||
if r0 == 0 goto l0_%=; \
|
||||
r1 = *(u32*)(r0 + 0); \
|
||||
if r1 >= %[max_entries] goto l0_%=; \
|
||||
r0 += 3; \
|
||||
r7 = *(u64*)(r0 + 0); \
|
||||
r7 = *(u64*)(r0 + 2); \
|
||||
r8 = r0; \
|
||||
r7 = *(u64*)(r8 + 0); \
|
||||
r7 = *(u64*)(r8 + 2); \
|
||||
r0 += 5; \
|
||||
r7 = *(u64*)(r0 + 0); \
|
||||
r7 = *(u64*)(r0 + 4); \
|
||||
l0_%=: exit; \
|
||||
" :
|
||||
: __imm(bpf_map_lookup_elem),
|
||||
__imm_addr(map_hash_48b),
|
||||
__imm_const(max_entries, MAX_ENTRIES)
|
||||
: __clobber_all);
|
||||
}
|
||||
|
||||
SEC("socket")
|
||||
__description("map element value is preserved across register spilling")
|
||||
__success __failure_unpriv __msg_unpriv("R0 leaks addr")
|
||||
__retval(0) __flag(BPF_F_ANY_ALIGNMENT)
|
||||
__naked void is_preserved_across_register_spilling(void)
|
||||
{
|
||||
asm volatile (" \
|
||||
r2 = r10; \
|
||||
r2 += -8; \
|
||||
r1 = 0; \
|
||||
*(u64*)(r2 + 0) = r1; \
|
||||
r1 = %[map_hash_48b] ll; \
|
||||
call %[bpf_map_lookup_elem]; \
|
||||
if r0 == 0 goto l0_%=; \
|
||||
r0 += %[test_val_foo]; \
|
||||
r1 = 42; \
|
||||
*(u64*)(r0 + 0) = r1; \
|
||||
r1 = r10; \
|
||||
r1 += -184; \
|
||||
*(u64*)(r1 + 0) = r0; \
|
||||
r3 = *(u64*)(r1 + 0); \
|
||||
r1 = 42; \
|
||||
*(u64*)(r3 + 0) = r1; \
|
||||
l0_%=: exit; \
|
||||
" :
|
||||
: __imm(bpf_map_lookup_elem),
|
||||
__imm_addr(map_hash_48b),
|
||||
__imm_const(test_val_foo, offsetof(struct test_val, foo))
|
||||
: __clobber_all);
|
||||
}
|
||||
|
||||
char _license[] SEC("license") = "GPL";
|
||||
|
|
@ -1,104 +0,0 @@
|
|||
{
|
||||
"map element value store of cleared call register",
|
||||
.insns = {
|
||||
BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
|
||||
BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
|
||||
BPF_ST_MEM(BPF_DW, BPF_REG_2, 0, 0),
|
||||
BPF_LD_MAP_FD(BPF_REG_1, 0),
|
||||
BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem),
|
||||
BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 1),
|
||||
BPF_STX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, 0),
|
||||
BPF_EXIT_INSN(),
|
||||
},
|
||||
.fixup_map_hash_48b = { 3 },
|
||||
.errstr_unpriv = "R1 !read_ok",
|
||||
.errstr = "R1 !read_ok",
|
||||
.result = REJECT,
|
||||
.result_unpriv = REJECT,
|
||||
},
|
||||
{
|
||||
"map element value with unaligned store",
|
||||
.insns = {
|
||||
BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
|
||||
BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
|
||||
BPF_ST_MEM(BPF_DW, BPF_REG_2, 0, 0),
|
||||
BPF_LD_MAP_FD(BPF_REG_1, 0),
|
||||
BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem),
|
||||
BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 17),
|
||||
BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 3),
|
||||
BPF_ST_MEM(BPF_DW, BPF_REG_0, 0, 42),
|
||||
BPF_ST_MEM(BPF_DW, BPF_REG_0, 2, 43),
|
||||
BPF_ST_MEM(BPF_DW, BPF_REG_0, -2, 44),
|
||||
BPF_MOV64_REG(BPF_REG_8, BPF_REG_0),
|
||||
BPF_ST_MEM(BPF_DW, BPF_REG_8, 0, 32),
|
||||
BPF_ST_MEM(BPF_DW, BPF_REG_8, 2, 33),
|
||||
BPF_ST_MEM(BPF_DW, BPF_REG_8, -2, 34),
|
||||
BPF_ALU64_IMM(BPF_ADD, BPF_REG_8, 5),
|
||||
BPF_ST_MEM(BPF_DW, BPF_REG_8, 0, 22),
|
||||
BPF_ST_MEM(BPF_DW, BPF_REG_8, 4, 23),
|
||||
BPF_ST_MEM(BPF_DW, BPF_REG_8, -7, 24),
|
||||
BPF_MOV64_REG(BPF_REG_7, BPF_REG_8),
|
||||
BPF_ALU64_IMM(BPF_ADD, BPF_REG_7, 3),
|
||||
BPF_ST_MEM(BPF_DW, BPF_REG_7, 0, 22),
|
||||
BPF_ST_MEM(BPF_DW, BPF_REG_7, 4, 23),
|
||||
BPF_ST_MEM(BPF_DW, BPF_REG_7, -4, 24),
|
||||
BPF_EXIT_INSN(),
|
||||
},
|
||||
.fixup_map_hash_48b = { 3 },
|
||||
.errstr_unpriv = "R0 leaks addr",
|
||||
.result = ACCEPT,
|
||||
.result_unpriv = REJECT,
|
||||
.flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
|
||||
},
|
||||
{
|
||||
"map element value with unaligned load",
|
||||
.insns = {
|
||||
BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
|
||||
BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
|
||||
BPF_ST_MEM(BPF_DW, BPF_REG_2, 0, 0),
|
||||
BPF_LD_MAP_FD(BPF_REG_1, 0),
|
||||
BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem),
|
||||
BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 11),
|
||||
BPF_LDX_MEM(BPF_W, BPF_REG_1, BPF_REG_0, 0),
|
||||
BPF_JMP_IMM(BPF_JGE, BPF_REG_1, MAX_ENTRIES, 9),
|
||||
BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 3),
|
||||
BPF_LDX_MEM(BPF_DW, BPF_REG_7, BPF_REG_0, 0),
|
||||
BPF_LDX_MEM(BPF_DW, BPF_REG_7, BPF_REG_0, 2),
|
||||
BPF_MOV64_REG(BPF_REG_8, BPF_REG_0),
|
||||
BPF_LDX_MEM(BPF_DW, BPF_REG_7, BPF_REG_8, 0),
|
||||
BPF_LDX_MEM(BPF_DW, BPF_REG_7, BPF_REG_8, 2),
|
||||
BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 5),
|
||||
BPF_LDX_MEM(BPF_DW, BPF_REG_7, BPF_REG_0, 0),
|
||||
BPF_LDX_MEM(BPF_DW, BPF_REG_7, BPF_REG_0, 4),
|
||||
BPF_EXIT_INSN(),
|
||||
},
|
||||
.fixup_map_hash_48b = { 3 },
|
||||
.errstr_unpriv = "R0 leaks addr",
|
||||
.result = ACCEPT,
|
||||
.result_unpriv = REJECT,
|
||||
.flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
|
||||
},
|
||||
{
|
||||
"map element value is preserved across register spilling",
|
||||
.insns = {
|
||||
BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
|
||||
BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
|
||||
BPF_ST_MEM(BPF_DW, BPF_REG_2, 0, 0),
|
||||
BPF_LD_MAP_FD(BPF_REG_1, 0),
|
||||
BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem),
|
||||
BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 7),
|
||||
BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, offsetof(struct test_val, foo)),
|
||||
BPF_ST_MEM(BPF_DW, BPF_REG_0, 0, 42),
|
||||
BPF_MOV64_REG(BPF_REG_1, BPF_REG_10),
|
||||
BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, -184),
|
||||
BPF_STX_MEM(BPF_DW, BPF_REG_1, BPF_REG_0, 0),
|
||||
BPF_LDX_MEM(BPF_DW, BPF_REG_3, BPF_REG_1, 0),
|
||||
BPF_ST_MEM(BPF_DW, BPF_REG_3, 0, 42),
|
||||
BPF_EXIT_INSN(),
|
||||
},
|
||||
.fixup_map_hash_48b = { 3 },
|
||||
.errstr_unpriv = "R0 leaks addr",
|
||||
.result = ACCEPT,
|
||||
.result_unpriv = REJECT,
|
||||
.flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
|
||||
},
|
||||
Loading…
Reference in a new issue