Commit 03391494 authored by Eduard Zingerman's avatar Eduard Zingerman Committed by Alexei Starovoitov
Browse files

selftests/bpf: verifier/value_adj_spill.c converted to inline assembly 



Test verifier/value_adj_spill.c automatically converted to use inline assembly.

Signed-off-by: default avatarEduard Zingerman <eddyz87@gmail.com>
Link: https://lore.kernel.org/r/20230325025524.144043-38-eddyz87@gmail.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent ab839a58

tools/testing/selftests/bpf/prog_tests/verifier.c

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include "verifier_spill_fill.skel.h"

#include "verifier_stack_ptr.skel.h"

#include "verifier_uninit.skel.h"

#include "verifier_value_adj_spill.skel.h"



__maybe_unused

static void run_tests_aux(const char *skel_name, skel_elf_bytes_fn elf_bytes_factory)
@@ -90,3 +91,4 @@ void test_verifier_ringbuf(void) { RUN(verifier_ringbuf); } 
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); }

tools/testing/selftests/bpf/progs/verifier_value_adj_spill.c

0 → 100644
+78 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Converted from tools/testing/selftests/bpf/verifier/value_adj_spill.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 is preserved across register spilling")

__success __failure_unpriv __msg_unpriv("R0 leaks addr")

__retval(0)

__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_%=;				\

	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)

	: __clobber_all);

}



SEC("socket")

__description("map element value or null is marked on register spilling")

__success __failure_unpriv __msg_unpriv("R0 leaks addr")

__retval(0)

__naked void is_marked_on_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];			\

	r1 = r10;					\

	r1 += -152;					\

	*(u64*)(r1 + 0) = r0;				\

	if r0 == 0 goto l0_%=;				\

	r3 = *(u64*)(r1 + 0);				\

	r1 = 42;					\

	*(u64*)(r3 + 0) = r1;				\

l0_%=:	exit;						\

"	:

	: __imm(bpf_map_lookup_elem),

	  __imm_addr(map_hash_48b)

	: __clobber_all);

}



char _license[] SEC("license") = "GPL";

tools/testing/selftests/bpf/verifier/value_adj_spill.c

deleted100644 → 0
+0 −43
Original line number Diff line number Diff line 
{

	"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, 6),

	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,

},

{

	"map element value or null is marked on 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_MOV64_REG(BPF_REG_1, BPF_REG_10),

	BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, -152),

	BPF_STX_MEM(BPF_DW, BPF_REG_1, BPF_REG_0, 0),

	BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 2),

	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,

},