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

Commit 7803ba73 authored by Joe Stringer's avatar Joe Stringer Committed by Arnaldo Carvalho de Melo
Browse files

tools lib bpf: Add set/is helpers for all prog types 



These bpf_prog_types were exposed in the uapi but there were no
corresponding functions to set these types for programs in libbpf.

Signed-off-by: default avatarJoe Stringer <joe@ovn.org>
Acked-by: default avatarWang Nan <wangnan0@huawei.com>
Cc: Alexei Starovoitov <ast@fb.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: netdev@vger.kernel.org
Link: http://lkml.kernel.org/r/20170123011128.26534-4-joe@ovn.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent ed794073

tools/lib/bpf/libbpf.c

+5 −0
Original line number Diff line number Diff line
@@ -1448,8 +1448,13 @@ bool bpf_program__is_##NAME(struct bpf_program *prog) \ 
	return bpf_program__is_type(prog, TYPE);	\

}							\



BPF_PROG_TYPE_FNS(socket_filter, BPF_PROG_TYPE_SOCKET_FILTER);

BPF_PROG_TYPE_FNS(kprobe, BPF_PROG_TYPE_KPROBE);

BPF_PROG_TYPE_FNS(sched_cls, BPF_PROG_TYPE_SCHED_CLS);

BPF_PROG_TYPE_FNS(sched_act, BPF_PROG_TYPE_SCHED_ACT);

BPF_PROG_TYPE_FNS(tracepoint, BPF_PROG_TYPE_TRACEPOINT);

BPF_PROG_TYPE_FNS(xdp, BPF_PROG_TYPE_XDP);

BPF_PROG_TYPE_FNS(perf_event, BPF_PROG_TYPE_PERF_EVENT);



int bpf_map__fd(struct bpf_map *map)

{

tools/lib/bpf/libbpf.h

+10 −0
Original line number Diff line number Diff line
@@ -174,11 +174,21 @@ int bpf_program__nth_fd(struct bpf_program *prog, int n); 
/*

 * Adjust type of bpf program. Default is kprobe.

 */

int bpf_program__set_socket_filter(struct bpf_program *prog);

int bpf_program__set_tracepoint(struct bpf_program *prog);

int bpf_program__set_kprobe(struct bpf_program *prog);

int bpf_program__set_sched_cls(struct bpf_program *prog);

int bpf_program__set_sched_act(struct bpf_program *prog);

int bpf_program__set_xdp(struct bpf_program *prog);

int bpf_program__set_perf_event(struct bpf_program *prog);



bool bpf_program__is_socket_filter(struct bpf_program *prog);

bool bpf_program__is_tracepoint(struct bpf_program *prog);

bool bpf_program__is_kprobe(struct bpf_program *prog);

bool bpf_program__is_sched_cls(struct bpf_program *prog);

bool bpf_program__is_sched_act(struct bpf_program *prog);

bool bpf_program__is_xdp(struct bpf_program *prog);

bool bpf_program__is_perf_event(struct bpf_program *prog);



/*

 * We don't need __attribute__((packed)) now since it is