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

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



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

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


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

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

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

#include "verifier_helper_access_var_len.skel.h"

#include "verifier_helper_packet_access.skel.h"

#include "verifier_helper_restricted.skel.h"



__maybe_unused

static void run_tests_aux(const char *skel_name, skel_elf_bytes_fn elf_bytes_factory)
@@ -60,3 +61,4 @@ void test_verifier_div0(void) { RUN(verifier_div0); } 
void test_verifier_div_overflow(void)         { RUN(verifier_div_overflow); }

void test_verifier_helper_access_var_len(void) { RUN(verifier_helper_access_var_len); }

void test_verifier_helper_packet_access(void) { RUN(verifier_helper_packet_access); }

void test_verifier_helper_restricted(void)    { RUN(verifier_helper_restricted); }

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

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

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



#include <linux/bpf.h>

#include <bpf/bpf_helpers.h>

#include "bpf_misc.h"



struct val {

	int cnt;

	struct bpf_spin_lock l;

};



struct {

	__uint(type, BPF_MAP_TYPE_ARRAY);

	__uint(max_entries, 1);

	__type(key, int);

	__type(value, struct val);

} map_spin_lock SEC(".maps");



struct timer {

	struct bpf_timer t;

};



struct {

	__uint(type, BPF_MAP_TYPE_ARRAY);

	__uint(max_entries, 1);

	__type(key, int);

	__type(value, struct timer);

} map_timer SEC(".maps");



SEC("kprobe")

__description("bpf_ktime_get_coarse_ns is forbidden in BPF_PROG_TYPE_KPROBE")

__failure __msg("unknown func bpf_ktime_get_coarse_ns")

__naked void in_bpf_prog_type_kprobe_1(void)

{

	asm volatile ("					\

	call %[bpf_ktime_get_coarse_ns];		\

	r0 = 0;						\

	exit;						\

"	:

	: __imm(bpf_ktime_get_coarse_ns)

	: __clobber_all);

}



SEC("tracepoint")

__description("bpf_ktime_get_coarse_ns is forbidden in BPF_PROG_TYPE_TRACEPOINT")

__failure __msg("unknown func bpf_ktime_get_coarse_ns")

__naked void in_bpf_prog_type_tracepoint_1(void)

{

	asm volatile ("					\

	call %[bpf_ktime_get_coarse_ns];		\

	r0 = 0;						\

	exit;						\

"	:

	: __imm(bpf_ktime_get_coarse_ns)

	: __clobber_all);

}



SEC("perf_event")

__description("bpf_ktime_get_coarse_ns is forbidden in BPF_PROG_TYPE_PERF_EVENT")

__failure __msg("unknown func bpf_ktime_get_coarse_ns")

__naked void bpf_prog_type_perf_event_1(void)

{

	asm volatile ("					\

	call %[bpf_ktime_get_coarse_ns];		\

	r0 = 0;						\

	exit;						\

"	:

	: __imm(bpf_ktime_get_coarse_ns)

	: __clobber_all);

}



SEC("raw_tracepoint")

__description("bpf_ktime_get_coarse_ns is forbidden in BPF_PROG_TYPE_RAW_TRACEPOINT")

__failure __msg("unknown func bpf_ktime_get_coarse_ns")

__naked void bpf_prog_type_raw_tracepoint_1(void)

{

	asm volatile ("					\

	call %[bpf_ktime_get_coarse_ns];		\

	r0 = 0;						\

	exit;						\

"	:

	: __imm(bpf_ktime_get_coarse_ns)

	: __clobber_all);

}



SEC("kprobe")

__description("bpf_timer_init isn restricted in BPF_PROG_TYPE_KPROBE")

__failure __msg("tracing progs cannot use bpf_timer yet")

__naked void in_bpf_prog_type_kprobe_2(void)

{

	asm volatile ("					\

	r2 = r10;					\

	r2 += -8;					\

	r1 = 0;						\

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

	r1 = %[map_timer] ll;				\

	call %[bpf_map_lookup_elem];			\

	if r0 == 0 goto l0_%=;				\

	r1 = r0;					\

	r2 = %[map_timer] ll;				\

	r3 = 1;						\

l0_%=:	call %[bpf_timer_init];				\

	exit;						\

"	:

	: __imm(bpf_map_lookup_elem),

	  __imm(bpf_timer_init),

	  __imm_addr(map_timer)

	: __clobber_all);

}



SEC("perf_event")

__description("bpf_timer_init is forbidden in BPF_PROG_TYPE_PERF_EVENT")

__failure __msg("tracing progs cannot use bpf_timer yet")

__naked void bpf_prog_type_perf_event_2(void)

{

	asm volatile ("					\

	r2 = r10;					\

	r2 += -8;					\

	r1 = 0;						\

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

	r1 = %[map_timer] ll;				\

	call %[bpf_map_lookup_elem];			\

	if r0 == 0 goto l0_%=;				\

	r1 = r0;					\

	r2 = %[map_timer] ll;				\

	r3 = 1;						\

l0_%=:	call %[bpf_timer_init];				\

	exit;						\

"	:

	: __imm(bpf_map_lookup_elem),

	  __imm(bpf_timer_init),

	  __imm_addr(map_timer)

	: __clobber_all);

}



SEC("tracepoint")

__description("bpf_timer_init is forbidden in BPF_PROG_TYPE_TRACEPOINT")

__failure __msg("tracing progs cannot use bpf_timer yet")

__naked void in_bpf_prog_type_tracepoint_2(void)

{

	asm volatile ("					\

	r2 = r10;					\

	r2 += -8;					\

	r1 = 0;						\

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

	r1 = %[map_timer] ll;				\

	call %[bpf_map_lookup_elem];			\

	if r0 == 0 goto l0_%=;				\

	r1 = r0;					\

	r2 = %[map_timer] ll;				\

	r3 = 1;						\

l0_%=:	call %[bpf_timer_init];				\

	exit;						\

"	:

	: __imm(bpf_map_lookup_elem),

	  __imm(bpf_timer_init),

	  __imm_addr(map_timer)

	: __clobber_all);

}



SEC("raw_tracepoint")

__description("bpf_timer_init is forbidden in BPF_PROG_TYPE_RAW_TRACEPOINT")

__failure __msg("tracing progs cannot use bpf_timer yet")

__naked void bpf_prog_type_raw_tracepoint_2(void)

{

	asm volatile ("					\

	r2 = r10;					\

	r2 += -8;					\

	r1 = 0;						\

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

	r1 = %[map_timer] ll;				\

	call %[bpf_map_lookup_elem];			\

	if r0 == 0 goto l0_%=;				\

	r1 = r0;					\

	r2 = %[map_timer] ll;				\

	r3 = 1;						\

l0_%=:	call %[bpf_timer_init];				\

	exit;						\

"	:

	: __imm(bpf_map_lookup_elem),

	  __imm(bpf_timer_init),

	  __imm_addr(map_timer)

	: __clobber_all);

}



SEC("kprobe")

__description("bpf_spin_lock is forbidden in BPF_PROG_TYPE_KPROBE")

__failure __msg("tracing progs cannot use bpf_spin_lock yet")

__naked void in_bpf_prog_type_kprobe_3(void)

{

	asm volatile ("					\

	r2 = r10;					\

	r2 += -8;					\

	r1 = 0;						\

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

	r1 = %[map_spin_lock] ll;			\

	call %[bpf_map_lookup_elem];			\

	if r0 == 0 goto l0_%=;				\

	r1 = r0;					\

	call %[bpf_spin_lock];				\

l0_%=:	exit;						\

"	:

	: __imm(bpf_map_lookup_elem),

	  __imm(bpf_spin_lock),

	  __imm_addr(map_spin_lock)

	: __clobber_all);

}



SEC("tracepoint")

__description("bpf_spin_lock is forbidden in BPF_PROG_TYPE_TRACEPOINT")

__failure __msg("tracing progs cannot use bpf_spin_lock yet")

__naked void in_bpf_prog_type_tracepoint_3(void)

{

	asm volatile ("					\

	r2 = r10;					\

	r2 += -8;					\

	r1 = 0;						\

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

	r1 = %[map_spin_lock] ll;			\

	call %[bpf_map_lookup_elem];			\

	if r0 == 0 goto l0_%=;				\

	r1 = r0;					\

	call %[bpf_spin_lock];				\

l0_%=:	exit;						\

"	:

	: __imm(bpf_map_lookup_elem),

	  __imm(bpf_spin_lock),

	  __imm_addr(map_spin_lock)

	: __clobber_all);

}



SEC("perf_event")

__description("bpf_spin_lock is forbidden in BPF_PROG_TYPE_PERF_EVENT")

__failure __msg("tracing progs cannot use bpf_spin_lock yet")

__naked void bpf_prog_type_perf_event_3(void)

{

	asm volatile ("					\

	r2 = r10;					\

	r2 += -8;					\

	r1 = 0;						\

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

	r1 = %[map_spin_lock] ll;			\

	call %[bpf_map_lookup_elem];			\

	if r0 == 0 goto l0_%=;				\

	r1 = r0;					\

	call %[bpf_spin_lock];				\

l0_%=:	exit;						\

"	:

	: __imm(bpf_map_lookup_elem),

	  __imm(bpf_spin_lock),

	  __imm_addr(map_spin_lock)

	: __clobber_all);

}



SEC("raw_tracepoint")

__description("bpf_spin_lock is forbidden in BPF_PROG_TYPE_RAW_TRACEPOINT")

__failure __msg("tracing progs cannot use bpf_spin_lock yet")

__naked void bpf_prog_type_raw_tracepoint_3(void)

{

	asm volatile ("					\

	r2 = r10;					\

	r2 += -8;					\

	r1 = 0;						\

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

	r1 = %[map_spin_lock] ll;			\

	call %[bpf_map_lookup_elem];			\

	if r0 == 0 goto l0_%=;				\

	r1 = r0;					\

	call %[bpf_spin_lock];				\

l0_%=:	exit;						\

"	:

	: __imm(bpf_map_lookup_elem),

	  __imm(bpf_spin_lock),

	  __imm_addr(map_spin_lock)

	: __clobber_all);

}



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

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

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

	"bpf_ktime_get_coarse_ns is forbidden in BPF_PROG_TYPE_KPROBE",

	.insns = {

		BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_ktime_get_coarse_ns),

		BPF_MOV64_IMM(BPF_REG_0, 0),

		BPF_EXIT_INSN(),

	},

	.errstr = "unknown func bpf_ktime_get_coarse_ns",

	.result = REJECT,

	.prog_type = BPF_PROG_TYPE_KPROBE,

},

{

	"bpf_ktime_get_coarse_ns is forbidden in BPF_PROG_TYPE_TRACEPOINT",

	.insns = {

		BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_ktime_get_coarse_ns),

		BPF_MOV64_IMM(BPF_REG_0, 0),

		BPF_EXIT_INSN(),

	},

	.errstr = "unknown func bpf_ktime_get_coarse_ns",

	.result = REJECT,

	.prog_type = BPF_PROG_TYPE_TRACEPOINT,

},

{

	"bpf_ktime_get_coarse_ns is forbidden in BPF_PROG_TYPE_PERF_EVENT",

	.insns = {

	BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_ktime_get_coarse_ns),

	BPF_MOV64_IMM(BPF_REG_0, 0),

	BPF_EXIT_INSN(),

	},

	.errstr = "unknown func bpf_ktime_get_coarse_ns",

	.result = REJECT,

	.prog_type = BPF_PROG_TYPE_PERF_EVENT,

},

{

	"bpf_ktime_get_coarse_ns is forbidden in BPF_PROG_TYPE_RAW_TRACEPOINT",

	.insns = {

	BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_ktime_get_coarse_ns),

	BPF_MOV64_IMM(BPF_REG_0, 0),

	BPF_EXIT_INSN(),

	},

	.errstr = "unknown func bpf_ktime_get_coarse_ns",

	.result = REJECT,

	.prog_type = BPF_PROG_TYPE_RAW_TRACEPOINT,

},

{

	"bpf_timer_init isn restricted in BPF_PROG_TYPE_KPROBE",

	.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_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_map_lookup_elem),

	BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 4),

	BPF_MOV64_REG(BPF_REG_1, BPF_REG_0),

	BPF_LD_MAP_FD(BPF_REG_2, 0),

	BPF_MOV64_IMM(BPF_REG_3, 1),

	BPF_EMIT_CALL(BPF_FUNC_timer_init),

	BPF_EXIT_INSN(),

	},

	.fixup_map_timer = { 3, 8 },

	.errstr = "tracing progs cannot use bpf_timer yet",

	.result = REJECT,

	.prog_type = BPF_PROG_TYPE_KPROBE,

},

{

	"bpf_timer_init is forbidden in BPF_PROG_TYPE_PERF_EVENT",

	.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_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_map_lookup_elem),

	BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 4),

	BPF_MOV64_REG(BPF_REG_1, BPF_REG_0),

	BPF_LD_MAP_FD(BPF_REG_2, 0),

	BPF_MOV64_IMM(BPF_REG_3, 1),

	BPF_EMIT_CALL(BPF_FUNC_timer_init),

	BPF_EXIT_INSN(),

	},

	.fixup_map_timer = { 3, 8 },

	.errstr = "tracing progs cannot use bpf_timer yet",

	.result = REJECT,

	.prog_type = BPF_PROG_TYPE_PERF_EVENT,

},

{

	"bpf_timer_init is forbidden in BPF_PROG_TYPE_TRACEPOINT",

	.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_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_map_lookup_elem),

	BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 4),

	BPF_MOV64_REG(BPF_REG_1, BPF_REG_0),

	BPF_LD_MAP_FD(BPF_REG_2, 0),

	BPF_MOV64_IMM(BPF_REG_3, 1),

	BPF_EMIT_CALL(BPF_FUNC_timer_init),

	BPF_EXIT_INSN(),

	},

	.fixup_map_timer = { 3, 8 },

	.errstr = "tracing progs cannot use bpf_timer yet",

	.result = REJECT,

	.prog_type = BPF_PROG_TYPE_TRACEPOINT,

},

{

	"bpf_timer_init is forbidden in BPF_PROG_TYPE_RAW_TRACEPOINT",

	.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_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_map_lookup_elem),

	BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 4),

	BPF_MOV64_REG(BPF_REG_1, BPF_REG_0),

	BPF_LD_MAP_FD(BPF_REG_2, 0),

	BPF_MOV64_IMM(BPF_REG_3, 1),

	BPF_EMIT_CALL(BPF_FUNC_timer_init),

	BPF_EXIT_INSN(),

	},

	.fixup_map_timer = { 3, 8 },

	.errstr = "tracing progs cannot use bpf_timer yet",

	.result = REJECT,

	.prog_type = BPF_PROG_TYPE_RAW_TRACEPOINT,

},

{

	"bpf_spin_lock is forbidden in BPF_PROG_TYPE_KPROBE",

	.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_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_map_lookup_elem),

	BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 2),

	BPF_MOV64_REG(BPF_REG_1, BPF_REG_0),

	BPF_EMIT_CALL(BPF_FUNC_spin_lock),

	BPF_EXIT_INSN(),

	},

	.fixup_map_spin_lock = { 3 },

	.errstr = "tracing progs cannot use bpf_spin_lock yet",

	.result = REJECT,

	.prog_type = BPF_PROG_TYPE_KPROBE,

},

{

	"bpf_spin_lock is forbidden in BPF_PROG_TYPE_TRACEPOINT",

	.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_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_map_lookup_elem),

	BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 2),

	BPF_MOV64_REG(BPF_REG_1, BPF_REG_0),

	BPF_EMIT_CALL(BPF_FUNC_spin_lock),

	BPF_EXIT_INSN(),

	},

	.fixup_map_spin_lock = { 3 },

	.errstr = "tracing progs cannot use bpf_spin_lock yet",

	.result = REJECT,

	.prog_type = BPF_PROG_TYPE_TRACEPOINT,

},

{

	"bpf_spin_lock is forbidden in BPF_PROG_TYPE_PERF_EVENT",

	.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_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_map_lookup_elem),

	BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 2),

	BPF_MOV64_REG(BPF_REG_1, BPF_REG_0),

	BPF_EMIT_CALL(BPF_FUNC_spin_lock),

	BPF_EXIT_INSN(),

	},

	.fixup_map_spin_lock = { 3 },

	.errstr = "tracing progs cannot use bpf_spin_lock yet",

	.result = REJECT,

	.prog_type = BPF_PROG_TYPE_PERF_EVENT,

},

{

	"bpf_spin_lock is forbidden in BPF_PROG_TYPE_RAW_TRACEPOINT",

	.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_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_map_lookup_elem),

	BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 2),

	BPF_MOV64_REG(BPF_REG_1, BPF_REG_0),

	BPF_EMIT_CALL(BPF_FUNC_spin_lock),

	BPF_EXIT_INSN(),

	},

	.fixup_map_spin_lock = { 3 },

	.errstr = "tracing progs cannot use bpf_spin_lock yet",

	.result = REJECT,

	.prog_type = BPF_PROG_TYPE_RAW_TRACEPOINT,

},