Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61e021f3 authored by Daniel Borkmann's avatar Daniel Borkmann Committed by David S. Miller
Browse files

ebpf: move CONFIG_BPF_SYSCALL-only function declarations 



Masami noted that it would be better to hide the remaining CONFIG_BPF_SYSCALL-only
function declarations within the BPF header ifdef, w/o else path dummy alternatives
since these functions are not supposed to have a user outside of CONFIG_BPF_SYSCALL.

Suggested-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Reference: http://article.gmane.org/gmane.linux.kernel.api/8658


Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 77f0379f

include/linux/bpf.h

+9 −9
Original line number Diff line number Diff line
@@ -42,10 +42,6 @@ struct bpf_map_type_list { 
	enum bpf_map_type type;

};



void bpf_register_map_type(struct bpf_map_type_list *tl);

void bpf_map_put(struct bpf_map *map);

struct bpf_map *bpf_map_get(struct fd f);



/* function argument constraints */

enum bpf_arg_type {

	ARG_ANYTHING = 0,	/* any argument is ok */
@@ -126,9 +122,16 @@ struct bpf_prog_aux { 


#ifdef CONFIG_BPF_SYSCALL

void bpf_register_prog_type(struct bpf_prog_type_list *tl);

void bpf_register_map_type(struct bpf_map_type_list *tl);



void bpf_prog_put(struct bpf_prog *prog);

struct bpf_prog *bpf_prog_get(u32 ufd);

void bpf_prog_put(struct bpf_prog *prog);



struct bpf_map *bpf_map_get(struct fd f);

void bpf_map_put(struct bpf_map *map);



/* verify correctness of eBPF program */

int bpf_check(struct bpf_prog *fp, union bpf_attr *attr);

#else

static inline void bpf_register_prog_type(struct bpf_prog_type_list *tl)

{
@@ -142,10 +145,7 @@ static inline struct bpf_prog *bpf_prog_get(u32 ufd) 
static inline void bpf_prog_put(struct bpf_prog *prog)

{

}

#endif



/* verify correctness of eBPF program */

int bpf_check(struct bpf_prog *fp, union bpf_attr *attr);

#endif /* CONFIG_BPF_SYSCALL */



/* verifier prototypes for helper functions called from eBPF programs */

extern const struct bpf_func_proto bpf_map_lookup_elem_proto;