Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

bpf: Make internal bpf API independent of CONFIG_BPF_SYSCALL #ifdefs

Socket filter code and other subsystems with upcoming eBPF
support should not need to deal with the fact that we have
CONFIG_BPF_SYSCALL defined or not.

Having the bpf syscall as a config option is a nice thing and
I'd expect it to stay that way for expert users (I presume one
day the default setting of it might change, though), but code
making use of it should not care if it's actually enabled or
not.

Instead, hide this via header files and let the rest deal with it.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Alexei Starovoitov <ast@plumgrid.com>
Reviewed-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1427312966-8434-2-git-send-email-ast@plumgrid.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Daniel Borkmann and committed by
Ingo Molnar
4e537f7f 223aa646

+17 -5
+17 -5
include/linux/bpf.h
··· 113 113 enum bpf_prog_type type; 114 114 }; 115 115 116 - void bpf_register_prog_type(struct bpf_prog_type_list *tl); 117 - 118 116 struct bpf_prog; 119 117 120 118 struct bpf_prog_aux { ··· 127 129 }; 128 130 129 131 #ifdef CONFIG_BPF_SYSCALL 132 + void bpf_register_prog_type(struct bpf_prog_type_list *tl); 133 + 130 134 void bpf_prog_put(struct bpf_prog *prog); 131 - #else 132 - static inline void bpf_prog_put(struct bpf_prog *prog) {} 133 - #endif 134 135 struct bpf_prog *bpf_prog_get(u32 ufd); 136 + #else 137 + static inline void bpf_register_prog_type(struct bpf_prog_type_list *tl) 138 + { 139 + } 140 + 141 + static inline struct bpf_prog *bpf_prog_get(u32 ufd) 142 + { 143 + return ERR_PTR(-EOPNOTSUPP); 144 + } 145 + 146 + static inline void bpf_prog_put(struct bpf_prog *prog) 147 + { 148 + } 149 + #endif 150 + 135 151 /* verify correctness of eBPF program */ 136 152 int bpf_check(struct bpf_prog *fp, union bpf_attr *attr); 137 153