lkml.org 
[lkml]   [2015]   [Apr]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] bpf: Make internal bpf API independent of CONFIG_BPF_SYSCALL #ifdefs
    Commit-ID:  4e537f7fbdce5e8ae7c33ebaa8a1956c7727d5a7
    Gitweb: http://git.kernel.org/tip/4e537f7fbdce5e8ae7c33ebaa8a1956c7727d5a7
    Author: Daniel Borkmann <daniel@iogearbox.net>
    AuthorDate: Wed, 25 Mar 2015 12:49:18 -0700
    Committer: Ingo Molnar <mingo@kernel.org>
    CommitDate: Thu, 2 Apr 2015 13:25:49 +0200

    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>
    ---
    include/linux/bpf.h | 20 ++++++++++++++++----
    1 file changed, 16 insertions(+), 4 deletions(-)

    diff --git a/include/linux/bpf.h b/include/linux/bpf.h
    index bbfceb7..c2e2111 100644
    --- a/include/linux/bpf.h
    +++ b/include/linux/bpf.h
    @@ -113,8 +113,6 @@ struct bpf_prog_type_list {
    enum bpf_prog_type type;
    };

    -void bpf_register_prog_type(struct bpf_prog_type_list *tl);
    -
    struct bpf_prog;

    struct bpf_prog_aux {
    @@ -129,11 +127,25 @@ struct bpf_prog_aux {
    };

    #ifdef CONFIG_BPF_SYSCALL
    +void bpf_register_prog_type(struct bpf_prog_type_list *tl);
    +
    void bpf_prog_put(struct bpf_prog *prog);
    +struct bpf_prog *bpf_prog_get(u32 ufd);
    #else
    -static inline void bpf_prog_put(struct bpf_prog *prog) {}
    +static inline void bpf_register_prog_type(struct bpf_prog_type_list *tl)
    +{
    +}
    +
    +static inline struct bpf_prog *bpf_prog_get(u32 ufd)
    +{
    + return ERR_PTR(-EOPNOTSUPP);
    +}
    +
    +static inline void bpf_prog_put(struct bpf_prog *prog)
    +{
    +}
    #endif
    -struct bpf_prog *bpf_prog_get(u32 ufd);
    +
    /* verify correctness of eBPF program */
    int bpf_check(struct bpf_prog *fp, union bpf_attr *attr);


    \
     
     \ /
      Last update: 2015-04-02 15:01    [W:3.159 / U:1.576 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site