diff mbox series

[v2,bpf-next,3/7] bpf: declare __bpf_free_used_maps() unconditionally

Message ID 20210108220930.482456-4-andrii@kernel.org
State Superseded
Headers show
Series Support kernel module ksym variables | expand

Commit Message

Andrii Nakryiko Jan. 8, 2021, 10:09 p.m. UTC 
__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.

Reported-by: kernel test robot <lkp@intel.com>
Fixes: a2ea07465c8d ("bpf: Fix missing prog untrack in release_maps")
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
---
 include/linux/bpf.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Yonghong Song Jan. 11, 2021, 4:03 a.m. UTC | #1 
On 1/8/21 2:09 PM, Andrii Nakryiko wrote:
> __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.

> 

> Reported-by: kernel test robot <lkp@intel.com>

> Fixes: a2ea07465c8d ("bpf: Fix missing prog untrack in release_maps")

> Signed-off-by: Andrii Nakryiko <andrii@kernel.org>


Acked-by: Yonghong Song <yhs@fb.com>
diff mbox series

Patch

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index ef9309604b3e..6e585dbc10df 100644
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -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);