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

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



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

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


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

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

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

#include "verifier_cgroup_skb.skel.h"

#include "verifier_cgroup_storage.skel.h"

#include "verifier_const_or.skel.h"



__maybe_unused

static void run_tests_aux(const char *skel_name, skel_elf_bytes_fn elf_bytes_factory)
@@ -46,3 +47,4 @@ void test_verifier_cfg(void) { RUN(verifier_cfg); } 
void test_verifier_cgroup_inv_retcode(void)   { RUN(verifier_cgroup_inv_retcode); }

void test_verifier_cgroup_skb(void)           { RUN(verifier_cgroup_skb); }

void test_verifier_cgroup_storage(void)       { RUN(verifier_cgroup_storage); }

void test_verifier_const_or(void)             { RUN(verifier_const_or); }

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

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

/* Converted from tools/testing/selftests/bpf/verifier/const_or.c */



#include <linux/bpf.h>

#include <bpf/bpf_helpers.h>

#include "bpf_misc.h"



SEC("tracepoint")

__description("constant register |= constant should keep constant type")

__success

__naked void constant_should_keep_constant_type(void)

{

	asm volatile ("					\

	r1 = r10;					\

	r1 += -48;					\

	r2 = 34;					\

	r2 |= 13;					\

	r3 = 0;						\

	call %[bpf_probe_read_kernel];			\

	exit;						\

"	:

	: __imm(bpf_probe_read_kernel)

	: __clobber_all);

}



SEC("tracepoint")

__description("constant register |= constant should not bypass stack boundary checks")

__failure __msg("invalid indirect access to stack R1 off=-48 size=58")

__naked void not_bypass_stack_boundary_checks_1(void)

{

	asm volatile ("					\

	r1 = r10;					\

	r1 += -48;					\

	r2 = 34;					\

	r2 |= 24;					\

	r3 = 0;						\

	call %[bpf_probe_read_kernel];			\

	exit;						\

"	:

	: __imm(bpf_probe_read_kernel)

	: __clobber_all);

}



SEC("tracepoint")

__description("constant register |= constant register should keep constant type")

__success

__naked void register_should_keep_constant_type(void)

{

	asm volatile ("					\

	r1 = r10;					\

	r1 += -48;					\

	r2 = 34;					\

	r4 = 13;					\

	r2 |= r4;					\

	r3 = 0;						\

	call %[bpf_probe_read_kernel];			\

	exit;						\

"	:

	: __imm(bpf_probe_read_kernel)

	: __clobber_all);

}



SEC("tracepoint")

__description("constant register |= constant register should not bypass stack boundary checks")

__failure __msg("invalid indirect access to stack R1 off=-48 size=58")

__naked void not_bypass_stack_boundary_checks_2(void)

{

	asm volatile ("					\

	r1 = r10;					\

	r1 += -48;					\

	r2 = 34;					\

	r4 = 24;					\

	r2 |= r4;					\

	r3 = 0;						\

	call %[bpf_probe_read_kernel];			\

	exit;						\

"	:

	: __imm(bpf_probe_read_kernel)

	: __clobber_all);

}



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

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

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

	"constant register |= constant should keep constant type",

	.insns = {

	BPF_MOV64_REG(BPF_REG_1, BPF_REG_10),

	BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, -48),

	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_kernel),

	BPF_EXIT_INSN(),

	},

	.result = ACCEPT,

	.prog_type = BPF_PROG_TYPE_TRACEPOINT,

},

{

	"constant register |= constant should not bypass stack boundary checks",

	.insns = {

	BPF_MOV64_REG(BPF_REG_1, BPF_REG_10),

	BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, -48),

	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_kernel),

	BPF_EXIT_INSN(),

	},

	.errstr = "invalid indirect access to stack R1 off=-48 size=58",

	.result = REJECT,

	.prog_type = BPF_PROG_TYPE_TRACEPOINT,

},

{

	"constant register |= constant register should keep constant type",

	.insns = {

	BPF_MOV64_REG(BPF_REG_1, BPF_REG_10),

	BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, -48),

	BPF_MOV64_IMM(BPF_REG_2, 34),

	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_kernel),

	BPF_EXIT_INSN(),

	},

	.result = ACCEPT,

	.prog_type = BPF_PROG_TYPE_TRACEPOINT,

},

{

	"constant register |= constant register should not bypass stack boundary checks",

	.insns = {

	BPF_MOV64_REG(BPF_REG_1, BPF_REG_10),

	BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, -48),

	BPF_MOV64_IMM(BPF_REG_2, 34),

	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_kernel),

	BPF_EXIT_INSN(),

	},

	.errstr = "invalid indirect access to stack R1 off=-48 size=58",

	.result = REJECT,

	.prog_type = BPF_PROG_TYPE_TRACEPOINT,

},