Commit 2872e9ac authored by Andrey Ignatov's avatar Andrey Ignatov Committed by Daniel Borkmann
Browse files

bpf: Set map_btf_{name, id} for all map types 



Set map_btf_name and map_btf_id for all map types so that map fields can
be accessed by bpf programs.

Signed-off-by: default avatarAndrey Ignatov <rdna@fb.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Acked-by: default avatarMartin KaFai Lau <kafai@fb.com>
Link: https://lore.kernel.org/bpf/a825f808f22af52b018dbe82f1c7d29dab5fc978.1592600985.git.rdna@fb.com
parent 41c48f3a

kernel/bpf/arraymap.c

+15 −0
Original line number Diff line number Diff line
@@ -515,6 +515,7 @@ const struct bpf_map_ops array_map_ops = { 
	.map_btf_id = &array_map_btf_id,

};



static int percpu_array_map_btf_id;

const struct bpf_map_ops percpu_array_map_ops = {

	.map_alloc_check = array_map_alloc_check,

	.map_alloc = array_map_alloc,
@@ -525,6 +526,8 @@ const struct bpf_map_ops percpu_array_map_ops = { 
	.map_delete_elem = array_map_delete_elem,

	.map_seq_show_elem = percpu_array_map_seq_show_elem,

	.map_check_btf = array_map_check_btf,

	.map_btf_name = "bpf_array",

	.map_btf_id = &percpu_array_map_btf_id,

};



static int fd_array_map_alloc_check(union bpf_attr *attr)
@@ -871,6 +874,7 @@ static void prog_array_map_free(struct bpf_map *map) 
	fd_array_map_free(map);

}



static int prog_array_map_btf_id;

const struct bpf_map_ops prog_array_map_ops = {

	.map_alloc_check = fd_array_map_alloc_check,

	.map_alloc = prog_array_map_alloc,
@@ -886,6 +890,8 @@ const struct bpf_map_ops prog_array_map_ops = { 
	.map_fd_sys_lookup_elem = prog_fd_array_sys_lookup_elem,

	.map_release_uref = prog_array_map_clear,

	.map_seq_show_elem = prog_array_map_seq_show_elem,

	.map_btf_name = "bpf_array",

	.map_btf_id = &prog_array_map_btf_id,

};



static struct bpf_event_entry *bpf_event_entry_gen(struct file *perf_file,
@@ -964,6 +970,7 @@ static void perf_event_fd_array_release(struct bpf_map *map, 
	rcu_read_unlock();

}



static int perf_event_array_map_btf_id;

const struct bpf_map_ops perf_event_array_map_ops = {

	.map_alloc_check = fd_array_map_alloc_check,

	.map_alloc = array_map_alloc,
@@ -975,6 +982,8 @@ const struct bpf_map_ops perf_event_array_map_ops = { 
	.map_fd_put_ptr = perf_event_fd_array_put_ptr,

	.map_release = perf_event_fd_array_release,

	.map_check_btf = map_check_no_btf,

	.map_btf_name = "bpf_array",

	.map_btf_id = &perf_event_array_map_btf_id,

};



#ifdef CONFIG_CGROUPS
@@ -997,6 +1006,7 @@ static void cgroup_fd_array_free(struct bpf_map *map) 
	fd_array_map_free(map);

}



static int cgroup_array_map_btf_id;

const struct bpf_map_ops cgroup_array_map_ops = {

	.map_alloc_check = fd_array_map_alloc_check,

	.map_alloc = array_map_alloc,
@@ -1007,6 +1017,8 @@ const struct bpf_map_ops cgroup_array_map_ops = { 
	.map_fd_get_ptr = cgroup_fd_array_get_ptr,

	.map_fd_put_ptr = cgroup_fd_array_put_ptr,

	.map_check_btf = map_check_no_btf,

	.map_btf_name = "bpf_array",

	.map_btf_id = &cgroup_array_map_btf_id,

};

#endif
@@ -1080,6 +1092,7 @@ static u32 array_of_map_gen_lookup(struct bpf_map *map, 
	return insn - insn_buf;

}



static int array_of_maps_map_btf_id;

const struct bpf_map_ops array_of_maps_map_ops = {

	.map_alloc_check = fd_array_map_alloc_check,

	.map_alloc = array_of_map_alloc,
@@ -1092,4 +1105,6 @@ const struct bpf_map_ops array_of_maps_map_ops = { 
	.map_fd_sys_lookup_elem = bpf_map_fd_sys_lookup_elem,

	.map_gen_lookup = array_of_map_gen_lookup,

	.map_check_btf = map_check_no_btf,

	.map_btf_name = "bpf_array",

	.map_btf_id = &array_of_maps_map_btf_id,

};

kernel/bpf/bpf_struct_ops.c

+3 −0
Original line number Diff line number Diff line
@@ -611,6 +611,7 @@ static struct bpf_map *bpf_struct_ops_map_alloc(union bpf_attr *attr) 
	return map;

}



static int bpf_struct_ops_map_btf_id;

const struct bpf_map_ops bpf_struct_ops_map_ops = {

	.map_alloc_check = bpf_struct_ops_map_alloc_check,

	.map_alloc = bpf_struct_ops_map_alloc,
@@ -620,6 +621,8 @@ const struct bpf_map_ops bpf_struct_ops_map_ops = { 
	.map_delete_elem = bpf_struct_ops_map_delete_elem,

	.map_update_elem = bpf_struct_ops_map_update_elem,

	.map_seq_show_elem = bpf_struct_ops_map_seq_show_elem,

	.map_btf_name = "bpf_struct_ops_map",

	.map_btf_id = &bpf_struct_ops_map_btf_id,

};



/* "const void *" because some subsystem is

kernel/bpf/cpumap.c

+3 −0
Original line number Diff line number Diff line
@@ -543,6 +543,7 @@ static int cpu_map_get_next_key(struct bpf_map *map, void *key, void *next_key) 
	return 0;

}



static int cpu_map_btf_id;

const struct bpf_map_ops cpu_map_ops = {

	.map_alloc		= cpu_map_alloc,

	.map_free		= cpu_map_free,
@@ -551,6 +552,8 @@ const struct bpf_map_ops cpu_map_ops = { 
	.map_lookup_elem	= cpu_map_lookup_elem,

	.map_get_next_key	= cpu_map_get_next_key,

	.map_check_btf		= map_check_no_btf,

	.map_btf_name		= "bpf_cpu_map",

	.map_btf_id		= &cpu_map_btf_id,

};



static int bq_flush_to_queue(struct xdp_bulk_queue *bq)

kernel/bpf/devmap.c

+6 −0
Original line number Diff line number Diff line
@@ -747,6 +747,7 @@ static int dev_map_hash_update_elem(struct bpf_map *map, void *key, void *value, 
					 map, key, value, map_flags);

}



static int dev_map_btf_id;

const struct bpf_map_ops dev_map_ops = {

	.map_alloc = dev_map_alloc,

	.map_free = dev_map_free,
@@ -755,8 +756,11 @@ const struct bpf_map_ops dev_map_ops = { 
	.map_update_elem = dev_map_update_elem,

	.map_delete_elem = dev_map_delete_elem,

	.map_check_btf = map_check_no_btf,

	.map_btf_name = "bpf_dtab",

	.map_btf_id = &dev_map_btf_id,

};



static int dev_map_hash_map_btf_id;

const struct bpf_map_ops dev_map_hash_ops = {

	.map_alloc = dev_map_alloc,

	.map_free = dev_map_free,
@@ -765,6 +769,8 @@ const struct bpf_map_ops dev_map_hash_ops = { 
	.map_update_elem = dev_map_hash_update_elem,

	.map_delete_elem = dev_map_hash_delete_elem,

	.map_check_btf = map_check_no_btf,

	.map_btf_name = "bpf_dtab",

	.map_btf_id = &dev_map_hash_map_btf_id,

};



static void dev_map_hash_remove_netdev(struct bpf_dtab *dtab,

kernel/bpf/hashtab.c

+12 −0
Original line number Diff line number Diff line
@@ -1630,6 +1630,7 @@ const struct bpf_map_ops htab_map_ops = { 
	.map_btf_id = &htab_map_btf_id,

};



static int htab_lru_map_btf_id;

const struct bpf_map_ops htab_lru_map_ops = {

	.map_alloc_check = htab_map_alloc_check,

	.map_alloc = htab_map_alloc,
@@ -1642,6 +1643,8 @@ const struct bpf_map_ops htab_lru_map_ops = { 
	.map_gen_lookup = htab_lru_map_gen_lookup,

	.map_seq_show_elem = htab_map_seq_show_elem,

	BATCH_OPS(htab_lru),

	.map_btf_name = "bpf_htab",

	.map_btf_id = &htab_lru_map_btf_id,

};



/* Called from eBPF program */
@@ -1746,6 +1749,7 @@ static void htab_percpu_map_seq_show_elem(struct bpf_map *map, void *key, 
	rcu_read_unlock();

}



static int htab_percpu_map_btf_id;

const struct bpf_map_ops htab_percpu_map_ops = {

	.map_alloc_check = htab_map_alloc_check,

	.map_alloc = htab_map_alloc,
@@ -1756,8 +1760,11 @@ const struct bpf_map_ops htab_percpu_map_ops = { 
	.map_delete_elem = htab_map_delete_elem,

	.map_seq_show_elem = htab_percpu_map_seq_show_elem,

	BATCH_OPS(htab_percpu),

	.map_btf_name = "bpf_htab",

	.map_btf_id = &htab_percpu_map_btf_id,

};



static int htab_lru_percpu_map_btf_id;

const struct bpf_map_ops htab_lru_percpu_map_ops = {

	.map_alloc_check = htab_map_alloc_check,

	.map_alloc = htab_map_alloc,
@@ -1768,6 +1775,8 @@ const struct bpf_map_ops htab_lru_percpu_map_ops = { 
	.map_delete_elem = htab_lru_map_delete_elem,

	.map_seq_show_elem = htab_percpu_map_seq_show_elem,

	BATCH_OPS(htab_lru_percpu),

	.map_btf_name = "bpf_htab",

	.map_btf_id = &htab_lru_percpu_map_btf_id,

};



static int fd_htab_map_alloc_check(union bpf_attr *attr)
@@ -1890,6 +1899,7 @@ static void htab_of_map_free(struct bpf_map *map) 
	fd_htab_map_free(map);

}



static int htab_of_maps_map_btf_id;

const struct bpf_map_ops htab_of_maps_map_ops = {

	.map_alloc_check = fd_htab_map_alloc_check,

	.map_alloc = htab_of_map_alloc,
@@ -1902,4 +1912,6 @@ const struct bpf_map_ops htab_of_maps_map_ops = { 
	.map_fd_sys_lookup_elem = bpf_map_fd_sys_lookup_elem,

	.map_gen_lookup = htab_of_map_gen_lookup,

	.map_check_btf = map_check_no_btf,

	.map_btf_name = "bpf_htab",

	.map_btf_id = &htab_of_maps_map_btf_id,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE