Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1562313

[PATCH perf/core 4/6] tools lib bpf: Add set/is helpers for all prog types

Show all headers | View raw

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: Joe Stringer <joe@ovn.org>
---
 tools/lib/bpf/libbpf.c |  5 +++++
 tools/lib/bpf/libbpf.h | 10 ++++++++++
 2 files changed, 15 insertions(+)

diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index aa2a04bfd494..e9a177d5ab15 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -1442,8 +1442,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)
 {
diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h
index a5a8b86a06fe..2188ccdc0e2d 100644
--- a/tools/lib/bpf/libbpf.h
+++ b/tools/lib/bpf/libbpf.h
@@ -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
-- 
2.11.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH perf/core 0/6] Libbpf improvements Joe Stringer <joe@ovn.org> - 2017-01-19 01:00 +0100
  [PATCH perf/core 2/6] tools lib bpf: Fix grammar in map_idx warning Joe Stringer <joe@ovn.org> - 2017-01-19 01:00 +0100
    Re: [PATCH perf/core 2/6] tools lib bpf: Fix grammar in map_idx  warning "Wangnan (F)" <wangnan0@huawei.com> - 2017-01-19 11:20 +0100
  [PATCH perf/core 4/6] tools lib bpf: Add set/is helpers for all prog types Joe Stringer <joe@ovn.org> - 2017-01-19 01:00 +0100
  [PATCH perf/core 5/6] tools lib bpf: Add libbpf_get_error() Joe Stringer <joe@ovn.org> - 2017-01-19 01:10 +0100
  [PATCH perf/core 1/6] tools lib bpf: Fix map offsets in relocation Joe Stringer <joe@ovn.org> - 2017-01-19 01:10 +0100
    Re: [PATCH perf/core 1/6] tools lib bpf: Fix map offsets in  relocation "Wangnan (F)" <wangnan0@huawei.com> - 2017-01-19 07:10 +0100
    [PATCH -improve] tools lib bpf: Fix map offsets in relocation Wang Nan <wangnan0@huawei.com> - 2017-01-19 11:00 +0100
  [PATCH perf/core 3/6] tools lib bpf: Define prog_type fns with macro Joe Stringer <joe@ovn.org> - 2017-01-19 01:10 +0100
  [PATCH perf/core 6/6] tools lib bpf: Add bpf_object__pin() Joe Stringer <joe@ovn.org> - 2017-01-19 01:10 +0100
    Re: [PATCH perf/core 6/6] tools lib bpf: Add bpf_object__pin() "Wangnan (F)" <wangnan0@huawei.com> - 2017-01-19 11:30 +0100
      Re: [PATCH perf/core 6/6] tools lib bpf: Add bpf_object__pin() Joe Stringer <joe@ovn.org> - 2017-01-20 01:00 +0100
  Re: [PATCH perf/core 0/6] Libbpf improvements "Wangnan (F)" <wangnan0@huawei.com> - 2017-01-19 11:30 +0100
    Re: [PATCH perf/core 0/6] Libbpf improvements Joe Stringer <joe@ovn.org> - 2017-01-23 02:20 +0100

csiph-web