Commit 936f8946 authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Alexei Starovoitov
Browse files

bpf: Declare __bpf_free_used_maps() unconditionally 



__bpf_free_used_maps() is always defined in kernel/bpf/core.c, while
include/linux/bpf.h is guarding it behind CONFIG_BPF_SYSCALL. Move it out of
that guard region and fix compiler warning.

Fixes: a2ea0746 ("bpf: Fix missing prog untrack in release_maps")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarYonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20210112075520.4103414-4-andrii@kernel.org
parent 6943c2b0

include/linux/bpf.h

+3 −2
Original line number Diff line number Diff line
@@ -1206,8 +1206,6 @@ void bpf_prog_sub(struct bpf_prog *prog, int i); 
void bpf_prog_inc(struct bpf_prog *prog);

struct bpf_prog * __must_check bpf_prog_inc_not_zero(struct bpf_prog *prog);

void bpf_prog_put(struct bpf_prog *prog);

void __bpf_free_used_maps(struct bpf_prog_aux *aux,

			  struct bpf_map **used_maps, u32 len);



void bpf_prog_free_id(struct bpf_prog *prog, bool do_idr_lock);

void bpf_map_free_id(struct bpf_map *map, bool do_idr_lock);
@@ -1676,6 +1674,9 @@ static inline struct bpf_prog *bpf_prog_get_type(u32 ufd, 
	return bpf_prog_get_type_dev(ufd, type, false);

}



void __bpf_free_used_maps(struct bpf_prog_aux *aux,

			  struct bpf_map **used_maps, u32 len);



bool bpf_prog_get_ok(struct bpf_prog *, enum bpf_prog_type *, bool);



int bpf_prog_offload_compile(struct bpf_prog *prog);