1 files changed, 17 insertions, 3 deletions

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 95a7abd0ee92..ee5275e7d4df 100644
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -22,6 +22,8 @@ struct perf_event;
 struct bpf_prog;
 struct bpf_map;
 struct sock;
+struct seq_file;
+struct btf;
 
 /* map is generic key/value storage optionally accesible by eBPF programs */
 struct bpf_map_ops {
@@ -43,10 +45,14 @@ struct bpf_map_ops {
         void (*map_fd_put_ptr)(void *ptr);
         u32 (*map_gen_lookup)(struct bpf_map *map, struct bpf_insn *insn_buf);
         u32 (*map_fd_sys_lookup_elem)(void *ptr);
+        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,
+                             u32 key_type_id, u32 value_type_id);
 };
 
 struct bpf_map {
-        /* 1st cacheline with read-mostly members of which some
+        /* The first two cachelines with read-mostly members of which some
          * are also accessed in fast-path (e.g. ops, max_entries).
          */
         const struct bpf_map_ops *ops ____cacheline_aligned;
@@ -62,10 +68,13 @@ struct bpf_map {
         u32 pages;
         u32 id;
         int numa_node;
+        u32 btf_key_id;
+        u32 btf_value_id;
+        struct btf *btf;
         bool unpriv_array;
-        /* 7 bytes hole */
+        /* 55 bytes hole */
 
-        /* 2nd cacheline with misc members to avoid false sharing
+        /* The 3rd and 4th cacheline with misc members to avoid false sharing
          * particularly with refcounting.
          */
         struct user_struct *user ____cacheline_aligned;
@@ -100,6 +109,11 @@ static inline struct bpf_offloaded_map *map_to_offmap(struct bpf_map *map)
         return container_of(map, struct bpf_offloaded_map, map);
 }
 
+static inline bool bpf_map_support_seq_show(const struct bpf_map *map)
+{
+        return map->ops->map_seq_show_elem && map->ops->map_check_btf;
+}
+
 extern const struct bpf_map_ops bpf_map_offload_ops;
 
 /* function argument constraints */