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

selftests/bpf: verifier/loops1 converted to inline assembly 



Test verifier/loops1 automatically converted to use inline assembly.

There are a few modifications for the converted tests.
"tracepoint" programs do not support test execution, change program
type to "xdp" (which supports test execution) for the following tests
that have __retval tags:
- bounded loop, count to 4
- bonded loop containing forward jump

Also, remove the __retval tag for test:
- bounded loop, count from positive unknown to 4

As it's return value is a random number.

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


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

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

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

#include "verifier_ld_ind.skel.h"

#include "verifier_leak_ptr.skel.h"

#include "verifier_loops1.skel.h"

#include "verifier_map_ptr.skel.h"

#include "verifier_map_ret_val.skel.h"

#include "verifier_masking.skel.h"
@@ -115,6 +116,7 @@ void test_verifier_int_ptr(void) { RUN(verifier_int_ptr); } 
void test_verifier_jeq_infer_not_null(void)   { RUN(verifier_jeq_infer_not_null); }

void test_verifier_ld_ind(void)               { RUN(verifier_ld_ind); }

void test_verifier_leak_ptr(void)             { RUN(verifier_leak_ptr); }

void test_verifier_loops1(void)               { RUN(verifier_loops1); }

void test_verifier_map_ptr(void)              { RUN(verifier_map_ptr); }

void test_verifier_map_ret_val(void)          { RUN(verifier_map_ret_val); }

void test_verifier_masking(void)              { RUN(verifier_masking); }

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

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

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



#include <linux/bpf.h>

#include <bpf/bpf_helpers.h>

#include "bpf_misc.h"



SEC("xdp")

__description("bounded loop, count to 4")

__success __retval(4)

__naked void bounded_loop_count_to_4(void)

{

	asm volatile ("					\

	r0 = 0;						\

l0_%=:	r0 += 1;					\

	if r0 < 4 goto l0_%=;				\

	exit;						\

"	::: __clobber_all);

}



SEC("tracepoint")

__description("bounded loop, count to 20")

__success

__naked void bounded_loop_count_to_20(void)

{

	asm volatile ("					\

	r0 = 0;						\

l0_%=:	r0 += 3;					\

	if r0 < 20 goto l0_%=;				\

	exit;						\

"	::: __clobber_all);

}



SEC("tracepoint")

__description("bounded loop, count from positive unknown to 4")

__success

__naked void from_positive_unknown_to_4(void)

{

	asm volatile ("					\

	call %[bpf_get_prandom_u32];			\

	if r0 s< 0 goto l0_%=;				\

l1_%=:	r0 += 1;					\

	if r0 < 4 goto l1_%=;				\

l0_%=:	exit;						\

"	:

	: __imm(bpf_get_prandom_u32)

	: __clobber_all);

}



SEC("tracepoint")

__description("bounded loop, count from totally unknown to 4")

__success

__naked void from_totally_unknown_to_4(void)

{

	asm volatile ("					\

	call %[bpf_get_prandom_u32];			\

l0_%=:	r0 += 1;					\

	if r0 < 4 goto l0_%=;				\

	exit;						\

"	:

	: __imm(bpf_get_prandom_u32)

	: __clobber_all);

}



SEC("tracepoint")

__description("bounded loop, count to 4 with equality")

__success

__naked void count_to_4_with_equality(void)

{

	asm volatile ("					\

	r0 = 0;						\

l0_%=:	r0 += 1;					\

	if r0 != 4 goto l0_%=;				\

	exit;						\

"	::: __clobber_all);

}



SEC("tracepoint")

__description("bounded loop, start in the middle")

__failure __msg("back-edge")

__naked void loop_start_in_the_middle(void)

{

	asm volatile ("					\

	r0 = 0;						\

	goto l0_%=;					\

l1_%=:	r0 += 1;					\

l0_%=:	if r0 < 4 goto l1_%=;				\

	exit;						\

"	::: __clobber_all);

}



SEC("xdp")

__description("bounded loop containing a forward jump")

__success __retval(4)

__naked void loop_containing_a_forward_jump(void)

{

	asm volatile ("					\

	r0 = 0;						\

l1_%=:	r0 += 1;					\

	if r0 == r0 goto l0_%=;				\

l0_%=:	if r0 < 4 goto l1_%=;				\

	exit;						\

"	::: __clobber_all);

}



SEC("tracepoint")

__description("bounded loop that jumps out rather than in")

__success

__naked void jumps_out_rather_than_in(void)

{

	asm volatile ("					\

	r6 = 0;						\

l1_%=:	r6 += 1;					\

	if r6 > 10000 goto l0_%=;			\

	call %[bpf_get_prandom_u32];			\

	goto l1_%=;					\

l0_%=:	exit;						\

"	:

	: __imm(bpf_get_prandom_u32)

	: __clobber_all);

}



SEC("tracepoint")

__description("infinite loop after a conditional jump")

__failure __msg("program is too large")

__naked void loop_after_a_conditional_jump(void)

{

	asm volatile ("					\

	r0 = 5;						\

	if r0 < 4 goto l0_%=;				\

l1_%=:	r0 += 1;					\

	goto l1_%=;					\

l0_%=:	exit;						\

"	::: __clobber_all);

}



SEC("tracepoint")

__description("bounded recursion")

__failure __msg("back-edge")

__naked void bounded_recursion(void)

{

	asm volatile ("					\

	r1 = 0;						\

	call bounded_recursion__1;			\

	exit;						\

"	::: __clobber_all);

}



static __naked __noinline __attribute__((used))

void bounded_recursion__1(void)

{

	asm volatile ("					\

	r1 += 1;					\

	r0 = r1;					\

	if r1 < 4 goto l0_%=;				\

	exit;						\

l0_%=:	call bounded_recursion__1;			\

	exit;						\

"	::: __clobber_all);

}



SEC("tracepoint")

__description("infinite loop in two jumps")

__failure __msg("loop detected")

__naked void infinite_loop_in_two_jumps(void)

{

	asm volatile ("					\

	r0 = 0;						\

l1_%=:	goto l0_%=;					\

l0_%=:	if r0 < 4 goto l1_%=;				\

	exit;						\

"	::: __clobber_all);

}



SEC("tracepoint")

__description("infinite loop: three-jump trick")

__failure __msg("loop detected")

__naked void infinite_loop_three_jump_trick(void)

{

	asm volatile ("					\

	r0 = 0;						\

l2_%=:	r0 += 1;					\

	r0 &= 1;					\

	if r0 < 2 goto l0_%=;				\

	exit;						\

l0_%=:	r0 += 1;					\

	r0 &= 1;					\

	if r0 < 2 goto l1_%=;				\

	exit;						\

l1_%=:	r0 += 1;					\

	r0 &= 1;					\

	if r0 < 2 goto l2_%=;				\

	exit;						\

"	::: __clobber_all);

}



SEC("xdp")

__description("not-taken loop with back jump to 1st insn")

__success __retval(123)

__naked void back_jump_to_1st_insn_1(void)

{

	asm volatile ("					\

l0_%=:	r0 = 123;					\

	if r0 == 4 goto l0_%=;				\

	exit;						\

"	::: __clobber_all);

}



SEC("xdp")

__description("taken loop with back jump to 1st insn")

__success __retval(55)

__naked void back_jump_to_1st_insn_2(void)

{

	asm volatile ("					\

	r1 = 10;					\

	r2 = 0;						\

	call back_jump_to_1st_insn_2__1;		\

	exit;						\

"	::: __clobber_all);

}



static __naked __noinline __attribute__((used))

void back_jump_to_1st_insn_2__1(void)

{

	asm volatile ("					\

l0_%=:	r2 += r1;					\

	r1 -= 1;					\

	if r1 != 0 goto l0_%=;				\

	r0 = r2;					\

	exit;						\

"	::: __clobber_all);

}



SEC("xdp")

__description("taken loop with back jump to 1st insn, 2")

__success __retval(55)

__naked void jump_to_1st_insn_2(void)

{

	asm volatile ("					\

	r1 = 10;					\

	r2 = 0;						\

	call jump_to_1st_insn_2__1;			\

	exit;						\

"	::: __clobber_all);

}



static __naked __noinline __attribute__((used))

void jump_to_1st_insn_2__1(void)

{

	asm volatile ("					\

l0_%=:	r2 += r1;					\

	r1 -= 1;					\

	if w1 != 0 goto l0_%=;				\

	r0 = r2;					\

	exit;						\

"	::: __clobber_all);

}



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

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

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

	"bounded loop, count to 4",

	.insns = {

	BPF_MOV64_IMM(BPF_REG_0, 0),

	BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 1),

	BPF_JMP_IMM(BPF_JLT, BPF_REG_0, 4, -2),

	BPF_EXIT_INSN(),

	},

	.result = ACCEPT,

	.prog_type = BPF_PROG_TYPE_TRACEPOINT,

	.retval = 4,

},

{

	"bounded loop, count to 20",

	.insns = {

	BPF_MOV64_IMM(BPF_REG_0, 0),

	BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 3),

	BPF_JMP_IMM(BPF_JLT, BPF_REG_0, 20, -2),

	BPF_EXIT_INSN(),

	},

	.result = ACCEPT,

	.prog_type = BPF_PROG_TYPE_TRACEPOINT,

},

{

	"bounded loop, count from positive unknown to 4",

	.insns = {

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

	BPF_JMP_IMM(BPF_JSLT, BPF_REG_0, 0, 2),

	BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 1),

	BPF_JMP_IMM(BPF_JLT, BPF_REG_0, 4, -2),

	BPF_EXIT_INSN(),

	},

	.result = ACCEPT,

	.prog_type = BPF_PROG_TYPE_TRACEPOINT,

	.retval = 4,

},

{

	"bounded loop, count from totally unknown to 4",

	.insns = {

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

	BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 1),

	BPF_JMP_IMM(BPF_JLT, BPF_REG_0, 4, -2),

	BPF_EXIT_INSN(),

	},

	.result = ACCEPT,

	.prog_type = BPF_PROG_TYPE_TRACEPOINT,

},

{

	"bounded loop, count to 4 with equality",

	.insns = {

		BPF_MOV64_IMM(BPF_REG_0, 0),

		BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 1),

		BPF_JMP_IMM(BPF_JNE, BPF_REG_0, 4, -2),

		BPF_EXIT_INSN(),

	},

	.result = ACCEPT,

	.prog_type = BPF_PROG_TYPE_TRACEPOINT,

},

{

	"bounded loop, start in the middle",

	.insns = {

		BPF_MOV64_IMM(BPF_REG_0, 0),

		BPF_JMP_A(1),

		BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 1),

		BPF_JMP_IMM(BPF_JLT, BPF_REG_0, 4, -2),

		BPF_EXIT_INSN(),

	},

	.result = REJECT,

	.errstr = "back-edge",

	.prog_type = BPF_PROG_TYPE_TRACEPOINT,

	.retval = 4,

},

{

	"bounded loop containing a forward jump",

	.insns = {

		BPF_MOV64_IMM(BPF_REG_0, 0),

		BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 1),

		BPF_JMP_REG(BPF_JEQ, BPF_REG_0, BPF_REG_0, 0),

		BPF_JMP_IMM(BPF_JLT, BPF_REG_0, 4, -3),

		BPF_EXIT_INSN(),

	},

	.result = ACCEPT,

	.prog_type = BPF_PROG_TYPE_TRACEPOINT,

	.retval = 4,

},

{

	"bounded loop that jumps out rather than in",

	.insns = {

	BPF_MOV64_IMM(BPF_REG_6, 0),

	BPF_ALU64_IMM(BPF_ADD, BPF_REG_6, 1),

	BPF_JMP_IMM(BPF_JGT, BPF_REG_6, 10000, 2),

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

	BPF_JMP_A(-4),

	BPF_EXIT_INSN(),

	},

	.result = ACCEPT,

	.prog_type = BPF_PROG_TYPE_TRACEPOINT,

},

{

	"infinite loop after a conditional jump",

	.insns = {

	BPF_MOV64_IMM(BPF_REG_0, 5),

	BPF_JMP_IMM(BPF_JLT, BPF_REG_0, 4, 2),

	BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 1),

	BPF_JMP_A(-2),

	BPF_EXIT_INSN(),

	},

	.result = REJECT,

	.errstr = "program is too large",

	.prog_type = BPF_PROG_TYPE_TRACEPOINT,

},

{

	"bounded recursion",

	.insns = {

	BPF_MOV64_IMM(BPF_REG_1, 0),

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

	BPF_EXIT_INSN(),

	BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 1),

	BPF_MOV64_REG(BPF_REG_0, BPF_REG_1),

	BPF_JMP_IMM(BPF_JLT, BPF_REG_1, 4, 1),

	BPF_EXIT_INSN(),

	BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 1, 0, -5),

	BPF_EXIT_INSN(),

	},

	.result = REJECT,

	.errstr = "back-edge",

	.prog_type = BPF_PROG_TYPE_TRACEPOINT,

},

{

	"infinite loop in two jumps",

	.insns = {

	BPF_MOV64_IMM(BPF_REG_0, 0),

	BPF_JMP_A(0),

	BPF_JMP_IMM(BPF_JLT, BPF_REG_0, 4, -2),

	BPF_EXIT_INSN(),

	},

	.result = REJECT,

	.errstr = "loop detected",

	.prog_type = BPF_PROG_TYPE_TRACEPOINT,

},

{

	"infinite loop: three-jump trick",

	.insns = {

	BPF_MOV64_IMM(BPF_REG_0, 0),

	BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 1),

	BPF_ALU64_IMM(BPF_AND, BPF_REG_0, 1),

	BPF_JMP_IMM(BPF_JLT, BPF_REG_0, 2, 1),

	BPF_EXIT_INSN(),

	BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 1),

	BPF_ALU64_IMM(BPF_AND, BPF_REG_0, 1),

	BPF_JMP_IMM(BPF_JLT, BPF_REG_0, 2, 1),

	BPF_EXIT_INSN(),

	BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 1),

	BPF_ALU64_IMM(BPF_AND, BPF_REG_0, 1),

	BPF_JMP_IMM(BPF_JLT, BPF_REG_0, 2, -11),

	BPF_EXIT_INSN(),

	},

	.result = REJECT,

	.errstr = "loop detected",

	.prog_type = BPF_PROG_TYPE_TRACEPOINT,

},

{

	"not-taken loop with back jump to 1st insn",

	.insns = {

	BPF_MOV64_IMM(BPF_REG_0, 123),

	BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 4, -2),

	BPF_EXIT_INSN(),

	},

	.result = ACCEPT,

	.prog_type = BPF_PROG_TYPE_XDP,

	.retval = 123,

},

{

	"taken loop with back jump to 1st insn",

	.insns = {

	BPF_MOV64_IMM(BPF_REG_1, 10),

	BPF_MOV64_IMM(BPF_REG_2, 0),

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

	BPF_EXIT_INSN(),

	BPF_ALU64_REG(BPF_ADD, BPF_REG_2, BPF_REG_1),

	BPF_ALU64_IMM(BPF_SUB, BPF_REG_1, 1),

	BPF_JMP_IMM(BPF_JNE, BPF_REG_1, 0, -3),

	BPF_MOV64_REG(BPF_REG_0, BPF_REG_2),

	BPF_EXIT_INSN(),

	},

	.result = ACCEPT,

	.prog_type = BPF_PROG_TYPE_XDP,

	.retval = 55,

},

{

	"taken loop with back jump to 1st insn, 2",

	.insns = {

	BPF_MOV64_IMM(BPF_REG_1, 10),

	BPF_MOV64_IMM(BPF_REG_2, 0),

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

	BPF_EXIT_INSN(),

	BPF_ALU64_REG(BPF_ADD, BPF_REG_2, BPF_REG_1),

	BPF_ALU64_IMM(BPF_SUB, BPF_REG_1, 1),

	BPF_JMP32_IMM(BPF_JNE, BPF_REG_1, 0, -3),

	BPF_MOV64_REG(BPF_REG_0, BPF_REG_2),

	BPF_EXIT_INSN(),

	},

	.result = ACCEPT,

	.prog_type = BPF_PROG_TYPE_XDP,

	.retval = 55,

},