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: Roman Gushchin <guro@fb.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Martin KaFai Lau <kafai@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 0c992b86eb2c4e80aab9469837d5db39b91f4532..e734f163bd0b9ae05c199fde7bd4e3dc1bfed542 100644 (file)
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -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);
 

diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c
index 24583da9ffd18127c3fcd7297b77f12ee988e67d..25632a75d630781e0753eb2545bb75d98afb6ccb 100644 (file)
--- a/kernel/bpf/arraymap.c
+++ b/kernel/bpf/arraymap.c
@@ -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)
 {

diff --git a/kernel/bpf/lpm_trie.c b/kernel/bpf/lpm_trie.c
index bfd4882e1106c699b62217eef0c2cc92f31077c6..abf1002080dfb1bc72c25e167eee425fc64da2af 100644 (file)
--- a/kernel/bpf/lpm_trie.c
+++ b/kernel/bpf/lpm_trie.c
@@ -728,6 +728,7 @@ free_stack:
 }
 
 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)
 {

diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 5745c78376214d972b45fadcf7d48822151a0af9..70fb11106fc2c29731f1364764928375bcbad39c 100644 (file)
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -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;
 }