Commit ae51772b authored by Kumar Kartikeya Dwivedi's avatar Kumar Kartikeya Dwivedi Committed by Alexei Starovoitov
Browse files

bpf: Lose const-ness of map in map_check_btf() 



BPF hash map may now use the map_check_btf() callback to decide whether
to set a dtor on its bpf_mem_alloc or not. Unlike C++ where members can
opt out of const-ness using mutable, we must lose the const qualifier on
the callback such that we can avoid the ugly cast. Make the change and
adjust all existing users, and lose the comment in hashtab.c.

Signed-off-by: default avatarKumar Kartikeya Dwivedi <memxor@gmail.com>
Link: https://lore.kernel.org/r/20260227224806.646888-3-memxor@gmail.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 1df97a74

include/linux/bpf.h

+2 −2
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ struct bpf_map_ops { 
	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,

	int (*map_check_btf)(struct bpf_map *map,

			     const struct btf *btf,

			     const struct btf_type *key_type,

			     const struct btf_type *value_type);
@@ -656,7 +656,7 @@ static inline bool bpf_map_support_seq_show(const struct bpf_map *map) 
		map->ops->map_seq_show_elem;

}



int map_check_no_btf(const struct bpf_map *map,

int map_check_no_btf(struct bpf_map *map,

		     const struct btf *btf,

		     const struct btf_type *key_type,

		     const struct btf_type *value_type);

include/linux/bpf_local_storage.h

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ u32 bpf_local_storage_destroy(struct bpf_local_storage *local_storage); 
void bpf_local_storage_map_free(struct bpf_map *map,

				struct bpf_local_storage_cache *cache);



int bpf_local_storage_map_check_btf(const struct bpf_map *map,

int bpf_local_storage_map_check_btf(struct bpf_map *map,

				    const struct btf *btf,

				    const struct btf_type *key_type,

				    const struct btf_type *value_type);

kernel/bpf/arena.c

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ static long arena_map_update_elem(struct bpf_map *map, void *key, 
	return -EOPNOTSUPP;

}



static int arena_map_check_btf(const struct bpf_map *map, const struct btf *btf,

static int arena_map_check_btf(struct bpf_map *map, const struct btf *btf,

			       const struct btf_type *key_type, const struct btf_type *value_type)

{

	return 0;

kernel/bpf/arraymap.c

+1 −1
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ static void percpu_array_map_seq_show_elem(struct bpf_map *map, void *key, 
	rcu_read_unlock();

}



static int array_map_check_btf(const struct bpf_map *map,

static int array_map_check_btf(struct bpf_map *map,

			       const struct btf *btf,

			       const struct btf_type *key_type,

			       const struct btf_type *value_type)

kernel/bpf/bloom_filter.c

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static long bloom_map_update_elem(struct bpf_map *map, void *key, 
	return -EINVAL;

}



static int bloom_map_check_btf(const struct bpf_map *map,

static int bloom_map_check_btf(struct bpf_map *map,

			       const struct btf *btf,

			       const struct btf_type *key_type,

			       const struct btf_type *value_type)