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

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



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

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


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

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

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

#include "verifier_cgroup_storage.skel.h"

#include "verifier_const_or.skel.h"

#include "verifier_ctx_sk_msg.skel.h"



__maybe_unused

static void run_tests_aux(const char *skel_name, skel_elf_bytes_fn elf_bytes_factory)
@@ -48,3 +49,4 @@ 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); }

void test_verifier_ctx_sk_msg(void)           { RUN(verifier_ctx_sk_msg); }

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

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

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



#include <linux/bpf.h>

#include <bpf/bpf_helpers.h>

#include "bpf_misc.h"



SEC("sk_msg")

__description("valid access family in SK_MSG")

__success

__naked void access_family_in_sk_msg(void)

{

	asm volatile ("					\

	r0 = *(u32*)(r1 + %[sk_msg_md_family]);		\

	exit;						\

"	:

	: __imm_const(sk_msg_md_family, offsetof(struct sk_msg_md, family))

	: __clobber_all);

}



SEC("sk_msg")

__description("valid access remote_ip4 in SK_MSG")

__success

__naked void remote_ip4_in_sk_msg(void)

{

	asm volatile ("					\

	r0 = *(u32*)(r1 + %[sk_msg_md_remote_ip4]);	\

	exit;						\

"	:

	: __imm_const(sk_msg_md_remote_ip4, offsetof(struct sk_msg_md, remote_ip4))

	: __clobber_all);

}



SEC("sk_msg")

__description("valid access local_ip4 in SK_MSG")

__success

__naked void local_ip4_in_sk_msg(void)

{

	asm volatile ("					\

	r0 = *(u32*)(r1 + %[sk_msg_md_local_ip4]);	\

	exit;						\

"	:

	: __imm_const(sk_msg_md_local_ip4, offsetof(struct sk_msg_md, local_ip4))

	: __clobber_all);

}



SEC("sk_msg")

__description("valid access remote_port in SK_MSG")

__success

__naked void remote_port_in_sk_msg(void)

{

	asm volatile ("					\

	r0 = *(u32*)(r1 + %[sk_msg_md_remote_port]);	\

	exit;						\

"	:

	: __imm_const(sk_msg_md_remote_port, offsetof(struct sk_msg_md, remote_port))

	: __clobber_all);

}



SEC("sk_msg")

__description("valid access local_port in SK_MSG")

__success

__naked void local_port_in_sk_msg(void)

{

	asm volatile ("					\

	r0 = *(u32*)(r1 + %[sk_msg_md_local_port]);	\

	exit;						\

"	:

	: __imm_const(sk_msg_md_local_port, offsetof(struct sk_msg_md, local_port))

	: __clobber_all);

}



SEC("sk_skb")

__description("valid access remote_ip6 in SK_MSG")

__success

__naked void remote_ip6_in_sk_msg(void)

{

	asm volatile ("					\

	r0 = *(u32*)(r1 + %[sk_msg_md_remote_ip6_0]);	\

	r0 = *(u32*)(r1 + %[sk_msg_md_remote_ip6_1]);	\

	r0 = *(u32*)(r1 + %[sk_msg_md_remote_ip6_2]);	\

	r0 = *(u32*)(r1 + %[sk_msg_md_remote_ip6_3]);	\

	exit;						\

"	:

	: __imm_const(sk_msg_md_remote_ip6_0, offsetof(struct sk_msg_md, remote_ip6[0])),

	  __imm_const(sk_msg_md_remote_ip6_1, offsetof(struct sk_msg_md, remote_ip6[1])),

	  __imm_const(sk_msg_md_remote_ip6_2, offsetof(struct sk_msg_md, remote_ip6[2])),

	  __imm_const(sk_msg_md_remote_ip6_3, offsetof(struct sk_msg_md, remote_ip6[3]))

	: __clobber_all);

}



SEC("sk_skb")

__description("valid access local_ip6 in SK_MSG")

__success

__naked void local_ip6_in_sk_msg(void)

{

	asm volatile ("					\

	r0 = *(u32*)(r1 + %[sk_msg_md_local_ip6_0]);	\

	r0 = *(u32*)(r1 + %[sk_msg_md_local_ip6_1]);	\

	r0 = *(u32*)(r1 + %[sk_msg_md_local_ip6_2]);	\

	r0 = *(u32*)(r1 + %[sk_msg_md_local_ip6_3]);	\

	exit;						\

"	:

	: __imm_const(sk_msg_md_local_ip6_0, offsetof(struct sk_msg_md, local_ip6[0])),

	  __imm_const(sk_msg_md_local_ip6_1, offsetof(struct sk_msg_md, local_ip6[1])),

	  __imm_const(sk_msg_md_local_ip6_2, offsetof(struct sk_msg_md, local_ip6[2])),

	  __imm_const(sk_msg_md_local_ip6_3, offsetof(struct sk_msg_md, local_ip6[3]))

	: __clobber_all);

}



SEC("sk_msg")

__description("valid access size in SK_MSG")

__success

__naked void access_size_in_sk_msg(void)

{

	asm volatile ("					\

	r0 = *(u32*)(r1 + %[sk_msg_md_size]);		\

	exit;						\

"	:

	: __imm_const(sk_msg_md_size, offsetof(struct sk_msg_md, size))

	: __clobber_all);

}



SEC("sk_msg")

__description("invalid 64B read of size in SK_MSG")

__failure __msg("invalid bpf_context access")

__flag(BPF_F_ANY_ALIGNMENT)

__naked void of_size_in_sk_msg(void)

{

	asm volatile ("					\

	r2 = *(u64*)(r1 + %[sk_msg_md_size]);		\

	exit;						\

"	:

	: __imm_const(sk_msg_md_size, offsetof(struct sk_msg_md, size))

	: __clobber_all);

}



SEC("sk_msg")

__description("invalid read past end of SK_MSG")

__failure __msg("invalid bpf_context access")

__naked void past_end_of_sk_msg(void)

{

	asm volatile ("					\

	r2 = *(u32*)(r1 + %[__imm_0]);			\

	exit;						\

"	:

	: __imm_const(__imm_0, offsetof(struct sk_msg_md, size) + 4)

	: __clobber_all);

}



SEC("sk_msg")

__description("invalid read offset in SK_MSG")

__failure __msg("invalid bpf_context access")

__flag(BPF_F_ANY_ALIGNMENT)

__naked void read_offset_in_sk_msg(void)

{

	asm volatile ("					\

	r2 = *(u32*)(r1 + %[__imm_0]);			\

	exit;						\

"	:

	: __imm_const(__imm_0, offsetof(struct sk_msg_md, family) + 1)

	: __clobber_all);

}



SEC("sk_msg")

__description("direct packet read for SK_MSG")

__success

__naked void packet_read_for_sk_msg(void)

{

	asm volatile ("					\

	r2 = *(u64*)(r1 + %[sk_msg_md_data]);		\

	r3 = *(u64*)(r1 + %[sk_msg_md_data_end]);	\

	r0 = r2;					\

	r0 += 8;					\

	if r0 > r3 goto l0_%=;				\

	r0 = *(u8*)(r2 + 0);				\

l0_%=:	r0 = 0;						\

	exit;						\

"	:

	: __imm_const(sk_msg_md_data, offsetof(struct sk_msg_md, data)),

	  __imm_const(sk_msg_md_data_end, offsetof(struct sk_msg_md, data_end))

	: __clobber_all);

}



SEC("sk_msg")

__description("direct packet write for SK_MSG")

__success

__naked void packet_write_for_sk_msg(void)

{

	asm volatile ("					\

	r2 = *(u64*)(r1 + %[sk_msg_md_data]);		\

	r3 = *(u64*)(r1 + %[sk_msg_md_data_end]);	\

	r0 = r2;					\

	r0 += 8;					\

	if r0 > r3 goto l0_%=;				\

	*(u8*)(r2 + 0) = r2;				\

l0_%=:	r0 = 0;						\

	exit;						\

"	:

	: __imm_const(sk_msg_md_data, offsetof(struct sk_msg_md, data)),

	  __imm_const(sk_msg_md_data_end, offsetof(struct sk_msg_md, data_end))

	: __clobber_all);

}



SEC("sk_msg")

__description("overlapping checks for direct packet access SK_MSG")

__success

__naked void direct_packet_access_sk_msg(void)

{

	asm volatile ("					\

	r2 = *(u64*)(r1 + %[sk_msg_md_data]);		\

	r3 = *(u64*)(r1 + %[sk_msg_md_data_end]);	\

	r0 = r2;					\

	r0 += 8;					\

	if r0 > r3 goto l0_%=;				\

	r1 = r2;					\

	r1 += 6;					\

	if r1 > r3 goto l0_%=;				\

	r0 = *(u16*)(r2 + 6);				\

l0_%=:	r0 = 0;						\

	exit;						\

"	:

	: __imm_const(sk_msg_md_data, offsetof(struct sk_msg_md, data)),

	  __imm_const(sk_msg_md_data_end, offsetof(struct sk_msg_md, data_end))

	: __clobber_all);

}



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

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

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

	"valid access family in SK_MSG",

	.insns = {

	BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1,

		    offsetof(struct sk_msg_md, family)),

	BPF_EXIT_INSN(),

	},

	.result = ACCEPT,

	.prog_type = BPF_PROG_TYPE_SK_MSG,

},

{

	"valid access remote_ip4 in SK_MSG",

	.insns = {

	BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1,

		    offsetof(struct sk_msg_md, remote_ip4)),

	BPF_EXIT_INSN(),

	},

	.result = ACCEPT,

	.prog_type = BPF_PROG_TYPE_SK_MSG,

},

{

	"valid access local_ip4 in SK_MSG",

	.insns = {

	BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1,

		    offsetof(struct sk_msg_md, local_ip4)),

	BPF_EXIT_INSN(),

	},

	.result = ACCEPT,

	.prog_type = BPF_PROG_TYPE_SK_MSG,

},

{

	"valid access remote_port in SK_MSG",

	.insns = {

	BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1,

		    offsetof(struct sk_msg_md, remote_port)),

	BPF_EXIT_INSN(),

	},

	.result = ACCEPT,

	.prog_type = BPF_PROG_TYPE_SK_MSG,

},

{

	"valid access local_port in SK_MSG",

	.insns = {

	BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1,

		    offsetof(struct sk_msg_md, local_port)),

	BPF_EXIT_INSN(),

	},

	.result = ACCEPT,

	.prog_type = BPF_PROG_TYPE_SK_MSG,

},

{

	"valid access remote_ip6 in SK_MSG",

	.insns = {

	BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1,

		    offsetof(struct sk_msg_md, remote_ip6[0])),

	BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1,

		    offsetof(struct sk_msg_md, remote_ip6[1])),

	BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1,

		    offsetof(struct sk_msg_md, remote_ip6[2])),

	BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1,

		    offsetof(struct sk_msg_md, remote_ip6[3])),

	BPF_EXIT_INSN(),

	},

	.result = ACCEPT,

	.prog_type = BPF_PROG_TYPE_SK_SKB,

},

{

	"valid access local_ip6 in SK_MSG",

	.insns = {

	BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1,

		    offsetof(struct sk_msg_md, local_ip6[0])),

	BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1,

		    offsetof(struct sk_msg_md, local_ip6[1])),

	BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1,

		    offsetof(struct sk_msg_md, local_ip6[2])),

	BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1,

		    offsetof(struct sk_msg_md, local_ip6[3])),

	BPF_EXIT_INSN(),

	},

	.result = ACCEPT,

	.prog_type = BPF_PROG_TYPE_SK_SKB,

},

{

	"valid access size in SK_MSG",

	.insns = {

	BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1,

		    offsetof(struct sk_msg_md, size)),

	BPF_EXIT_INSN(),

	},

	.result = ACCEPT,

	.prog_type = BPF_PROG_TYPE_SK_MSG,

},

{

	"invalid 64B read of size in SK_MSG",

	.insns = {

	BPF_LDX_MEM(BPF_DW, BPF_REG_2, BPF_REG_1,

		    offsetof(struct sk_msg_md, size)),

	BPF_EXIT_INSN(),

	},

	.errstr = "invalid bpf_context access",

	.result = REJECT,

	.prog_type = BPF_PROG_TYPE_SK_MSG,

	.flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,

},

{

	"invalid read past end of SK_MSG",

	.insns = {

	BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1,

		    offsetof(struct sk_msg_md, size) + 4),

	BPF_EXIT_INSN(),

	},

	.errstr = "invalid bpf_context access",

	.result = REJECT,

	.prog_type = BPF_PROG_TYPE_SK_MSG,

},

{

	"invalid read offset in SK_MSG",

	.insns = {

	BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1,

		    offsetof(struct sk_msg_md, family) + 1),

	BPF_EXIT_INSN(),

	},

	.errstr = "invalid bpf_context access",

	.result = REJECT,

	.prog_type = BPF_PROG_TYPE_SK_MSG,

	.flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,

},

{

	"direct packet read for SK_MSG",

	.insns = {

	BPF_LDX_MEM(BPF_DW, BPF_REG_2, BPF_REG_1,

		    offsetof(struct sk_msg_md, data)),

	BPF_LDX_MEM(BPF_DW, BPF_REG_3, BPF_REG_1,

		    offsetof(struct sk_msg_md, data_end)),

	BPF_MOV64_REG(BPF_REG_0, BPF_REG_2),

	BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 8),

	BPF_JMP_REG(BPF_JGT, BPF_REG_0, BPF_REG_3, 1),

	BPF_LDX_MEM(BPF_B, BPF_REG_0, BPF_REG_2, 0),

	BPF_MOV64_IMM(BPF_REG_0, 0),

	BPF_EXIT_INSN(),

	},

	.result = ACCEPT,

	.prog_type = BPF_PROG_TYPE_SK_MSG,

},

{

	"direct packet write for SK_MSG",

	.insns = {

	BPF_LDX_MEM(BPF_DW, BPF_REG_2, BPF_REG_1,

		    offsetof(struct sk_msg_md, data)),

	BPF_LDX_MEM(BPF_DW, BPF_REG_3, BPF_REG_1,

		    offsetof(struct sk_msg_md, data_end)),

	BPF_MOV64_REG(BPF_REG_0, BPF_REG_2),

	BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 8),

	BPF_JMP_REG(BPF_JGT, BPF_REG_0, BPF_REG_3, 1),

	BPF_STX_MEM(BPF_B, BPF_REG_2, BPF_REG_2, 0),

	BPF_MOV64_IMM(BPF_REG_0, 0),

	BPF_EXIT_INSN(),

	},

	.result = ACCEPT,

	.prog_type = BPF_PROG_TYPE_SK_MSG,

},

{

	"overlapping checks for direct packet access SK_MSG",

	.insns = {

	BPF_LDX_MEM(BPF_DW, BPF_REG_2, BPF_REG_1,

		    offsetof(struct sk_msg_md, data)),

	BPF_LDX_MEM(BPF_DW, BPF_REG_3, BPF_REG_1,

		    offsetof(struct sk_msg_md, data_end)),

	BPF_MOV64_REG(BPF_REG_0, BPF_REG_2),

	BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 8),

	BPF_JMP_REG(BPF_JGT, BPF_REG_0, BPF_REG_3, 4),

	BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),

	BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 6),

	BPF_JMP_REG(BPF_JGT, BPF_REG_1, BPF_REG_3, 1),

	BPF_LDX_MEM(BPF_H, BPF_REG_0, BPF_REG_2, 6),

	BPF_MOV64_IMM(BPF_REG_0, 0),

	BPF_EXIT_INSN(),

	},

	.result = ACCEPT,

	.prog_type = BPF_PROG_TYPE_SK_MSG,

},