Commit 7943c0f3 authored by Alexei Starovoitov's avatar Alexei Starovoitov Committed by David S. Miller
Browse files

bpf: remove test map scaffolding and user proper types 



proper types and function helpers are ready. Use them in verifier testsuite.
Remove temporary stubs

Signed-off-by: default avatarAlexei Starovoitov <ast@plumgrid.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d0003ec0

kernel/bpf/test_stub.c

+9 −47
Original line number Diff line number Diff line
@@ -18,26 +18,18 @@ struct bpf_context { 
	u64 arg2;

};



static u64 test_func(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5)

{

	return 0;

}



static struct bpf_func_proto test_funcs[] = {

	[BPF_FUNC_unspec] = {

		.func = test_func,

		.gpl_only = true,

		.ret_type = RET_PTR_TO_MAP_VALUE_OR_NULL,

		.arg1_type = ARG_CONST_MAP_PTR,

		.arg2_type = ARG_PTR_TO_MAP_KEY,

	},

};



static const struct bpf_func_proto *test_func_proto(enum bpf_func_id func_id)

{

	if (func_id < 0 || func_id >= ARRAY_SIZE(test_funcs))

	switch (func_id) {

	case BPF_FUNC_map_lookup_elem:

		return &bpf_map_lookup_elem_proto;

	case BPF_FUNC_map_update_elem:

		return &bpf_map_update_elem_proto;

	case BPF_FUNC_map_delete_elem:

		return &bpf_map_delete_elem_proto;

	default:

		return NULL;

	return &test_funcs[func_id];

	}

}



static const struct bpf_context_access {
@@ -78,38 +70,8 @@ static struct bpf_prog_type_list tl_prog = { 
	.type = BPF_PROG_TYPE_UNSPEC,

};



static struct bpf_map *test_map_alloc(union bpf_attr *attr)

{

	struct bpf_map *map;



	map = kzalloc(sizeof(*map), GFP_USER);

	if (!map)

		return ERR_PTR(-ENOMEM);



	map->key_size = attr->key_size;

	map->value_size = attr->value_size;

	map->max_entries = attr->max_entries;

	return map;

}



static void test_map_free(struct bpf_map *map)

{

	kfree(map);

}



static struct bpf_map_ops test_map_ops = {

	.map_alloc = test_map_alloc,

	.map_free = test_map_free,

};



static struct bpf_map_type_list tl_map = {

	.ops = &test_map_ops,

	.type = BPF_MAP_TYPE_UNSPEC,

};



static int __init register_test_ops(void)

{

	bpf_register_map_type(&tl_map);

	bpf_register_prog_type(&tl_prog);

	return 0;

}

samples/bpf/test_verifier.c

+7 −7
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static struct bpf_test tests[] = { 
			BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),

			BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),

			BPF_LD_MAP_FD(BPF_REG_1, 0),

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

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

			BPF_EXIT_INSN(),

		},

		.fixup = {2},
@@ -417,7 +417,7 @@ static struct bpf_test tests[] = { 
			BPF_ALU64_REG(BPF_MOV, BPF_REG_2, BPF_REG_10),

			BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),

			BPF_LD_MAP_FD(BPF_REG_1, 0),

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

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

			BPF_EXIT_INSN(),

		},

		.errstr = "fd 0 is not pointing to valid bpf_map",
@@ -430,7 +430,7 @@ static struct bpf_test tests[] = { 
			BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),

			BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),

			BPF_LD_MAP_FD(BPF_REG_1, 0),

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

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

			BPF_ST_MEM(BPF_DW, BPF_REG_0, 0, 0),

			BPF_EXIT_INSN(),

		},
@@ -445,7 +445,7 @@ static struct bpf_test tests[] = { 
			BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),

			BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),

			BPF_LD_MAP_FD(BPF_REG_1, 0),

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

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

			BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 1),

			BPF_ST_MEM(BPF_DW, BPF_REG_0, 4, 0),

			BPF_EXIT_INSN(),
@@ -461,7 +461,7 @@ static struct bpf_test tests[] = { 
			BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),

			BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),

			BPF_LD_MAP_FD(BPF_REG_1, 0),

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

			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_ST_MEM(BPF_DW, BPF_REG_0, 0, 0),

			BPF_EXIT_INSN(),
@@ -548,7 +548,7 @@ static struct bpf_test tests[] = { 
			BPF_ST_MEM(BPF_DW, BPF_REG_2, -56, 0),

			BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -56),

			BPF_LD_MAP_FD(BPF_REG_1, 0),

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

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

			BPF_EXIT_INSN(),

		},

		.fixup = {24},
@@ -659,7 +659,7 @@ static int create_map(void) 
	long long key, value = 0;

	int map_fd;



	map_fd = bpf_create_map(BPF_MAP_TYPE_UNSPEC, sizeof(key), sizeof(value), 1024);

	map_fd = bpf_create_map(BPF_MAP_TYPE_HASH, sizeof(key), sizeof(value), 1024);

	if (map_fd < 0) {

		printf("failed to create map '%s'\n", strerror(errno));

	}