Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b2b234b authored by Roman Gushchin's avatar Roman Gushchin Committed by Alexei Starovoitov
Browse files

bpf: pass struct btf pointer to the map_check_btf() callback 



If key_type or value_type are of non-trivial data types
(e.g. structure or typedef), it's not possible to check them without
the additional information, which can't be obtained without a pointer
to the btf structure.

So, let's pass btf pointer to the map_check_btf() callbacks.

Signed-off-by: default avatarRoman Gushchin <guro@fb.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarMartin KaFai Lau <kafai@fb.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent a0517a0f

include/linux/bpf.h

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ struct bpf_prog; 
struct bpf_map;

struct sock;

struct seq_file;

struct btf;

struct btf_type;



/* map is generic key/value storage optionally accesible by eBPF programs */
@@ -52,6 +53,7 @@ struct bpf_map_ops { 
	void (*map_seq_show_elem)(struct bpf_map *map, void *key,

				  struct seq_file *m);

	int (*map_check_btf)(const struct bpf_map *map,

			     const struct btf *btf,

			     const struct btf_type *key_type,

			     const struct btf_type *value_type);

};
@@ -126,6 +128,7 @@ static inline bool bpf_map_support_seq_show(const struct bpf_map *map) 
}



int map_check_no_btf(const struct bpf_map *map,

		     const struct btf *btf,

		     const struct btf_type *key_type,

		     const struct btf_type *value_type);

kernel/bpf/arraymap.c

+1 −0
Original line number Diff line number Diff line
@@ -382,6 +382,7 @@ static void percpu_array_map_seq_show_elem(struct bpf_map *map, void *key, 
}



static int array_map_check_btf(const struct bpf_map *map,

			       const struct btf *btf,

			       const struct btf_type *key_type,

			       const struct btf_type *value_type)

{

kernel/bpf/lpm_trie.c

+1 −0
Original line number Diff line number Diff line
@@ -728,6 +728,7 @@ static int trie_get_next_key(struct bpf_map *map, void *_key, void *_next_key) 
}



static int trie_check_btf(const struct bpf_map *map,

			  const struct btf *btf,

			  const struct btf_type *key_type,

			  const struct btf_type *value_type)

{

kernel/bpf/syscall.c

+2 −1
Original line number Diff line number Diff line
@@ -456,6 +456,7 @@ static int bpf_obj_name_cpy(char *dst, const char *src) 
}



int map_check_no_btf(const struct bpf_map *map,

		     const struct btf *btf,

		     const struct btf_type *key_type,

		     const struct btf_type *value_type)

{
@@ -478,7 +479,7 @@ static int map_check_btf(const struct bpf_map *map, const struct btf *btf, 
		return -EINVAL;



	if (map->ops->map_check_btf)

		ret = map->ops->map_check_btf(map, key_type, value_type);

		ret = map->ops->map_check_btf(map, btf, key_type, value_type);



	return ret;

}