Commit bd368cb5 authored by Hengqi Chen's avatar Hengqi Chen Committed by Andrii Nakryiko
Browse files

selftests/bpf: Use BTF-defined key/value for map definitions 



Change map definitions in BPF selftests to use BTF-defined
key/value types. This unifies the map definitions and ensures
libbpf won't emit warning about retrying map creation.

Signed-off-by: default avatarHengqi Chen <hengqi.chen@gmail.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20210930161456.3444544-3-hengqi.chen@gmail.com
parent f7310523

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

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ 
char _license[] SEC("license") = "GPL";

struct {

	__uint(type, BPF_MAP_TYPE_PERF_EVENT_ARRAY);

	__uint(key_size, sizeof(int));

	__uint(value_size, sizeof(int));

	__type(key, int);

	__type(value, int);

} perf_buf_map SEC(".maps");



#define _(P) (__builtin_preserve_access_index(P))

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

+2 −2
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ typedef __u64 stack_trace_t[PERF_MAX_STACK_DEPTH]; 
struct {

	__uint(type, BPF_MAP_TYPE_STACK_TRACE);

	__uint(max_entries, 16384);

	__uint(key_size, sizeof(__u32));

	__uint(value_size, sizeof(stack_trace_t));

	__type(key, __u32);

	__type(value, stack_trace_t);

} stackmap SEC(".maps");



struct {

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

+6 −6
Original line number Diff line number Diff line
@@ -7,22 +7,22 @@ int _version SEC("version") = 1; 
struct {

	__uint(type, BPF_MAP_TYPE_SOCKMAP);

	__uint(max_entries, 20);

	__uint(key_size, sizeof(int));

	__uint(value_size, sizeof(int));

	__type(key, int);

	__type(value, int);

} sock_map_rx SEC(".maps");



struct {

	__uint(type, BPF_MAP_TYPE_SOCKMAP);

	__uint(max_entries, 20);

	__uint(key_size, sizeof(int));

	__uint(value_size, sizeof(int));

	__type(key, int);

	__type(value, int);

} sock_map_tx SEC(".maps");



struct {

	__uint(type, BPF_MAP_TYPE_SOCKMAP);

	__uint(max_entries, 20);

	__uint(key_size, sizeof(int));

	__uint(value_size, sizeof(int));

	__type(key, int);

	__type(value, int);

} sock_map_msg SEC(".maps");



struct {

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

+7 −7
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ struct inner_map_sz2 { 
struct outer_arr {

	__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);

	__uint(max_entries, 3);

	__uint(key_size, sizeof(int));

	__uint(value_size, sizeof(int));

	__type(key, int);

	__type(value, int);

	/* it's possible to use anonymous struct as inner map definition here */

	__array(values, struct {

		__uint(type, BPF_MAP_TYPE_ARRAY);
@@ -61,8 +61,8 @@ struct inner_map_sz4 { 
struct outer_arr_dyn {

	__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);

	__uint(max_entries, 3);

	__uint(key_size, sizeof(int));

	__uint(value_size, sizeof(int));

	__type(key, int);

	__type(value, int);

	__array(values, struct {

		__uint(type, BPF_MAP_TYPE_ARRAY);

		__uint(map_flags, BPF_F_INNER_MAP);
@@ -81,7 +81,7 @@ struct outer_arr_dyn { 
struct outer_hash {

	__uint(type, BPF_MAP_TYPE_HASH_OF_MAPS);

	__uint(max_entries, 5);

	__uint(key_size, sizeof(int));

	__type(key, int);

	/* Here everything works flawlessly due to reuse of struct inner_map

	 * and compiler will complain at the attempt to use non-inner_map

	 * references below. This is great experience.
@@ -111,8 +111,8 @@ struct sockarr_sz2 { 
struct outer_sockarr_sz1 {

	__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);

	__uint(max_entries, 1);

	__uint(key_size, sizeof(int));

	__uint(value_size, sizeof(int));

	__type(key, int);

	__type(value, int);

	__array(values, struct sockarr_sz1);

} outer_sockarr SEC(".maps") = {

	.values = { (void *)&sockarr_sz1 },

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

+4 −6
Original line number Diff line number Diff line
@@ -9,18 +9,16 @@ struct { 
	__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);

	__uint(max_entries, 1);

	__uint(map_flags, 0);

	__uint(key_size, sizeof(__u32));

	/* must be sizeof(__u32) for map in map */

	__uint(value_size, sizeof(__u32));

	__type(key, __u32);

	__type(value, __u32);

} mim_array SEC(".maps");



struct {

	__uint(type, BPF_MAP_TYPE_HASH_OF_MAPS);

	__uint(max_entries, 1);

	__uint(map_flags, 0);

	__uint(key_size, sizeof(int));

	/* must be sizeof(__u32) for map in map */

	__uint(value_size, sizeof(__u32));

	__type(key, int);

	__type(value, __u32);

} mim_hash SEC(".maps");



SEC("xdp")