public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Joe Stringer <joe@ovn.org>,
	Alexei Starovoitov <ast@fb.com>,
	Daniel Borkmann <daniel@iogearbox.net>,
	netdev@vger.kernel.org,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 16/23] tools lib bpf: Add set/is helpers for all prog types
Date: Wed, 25 Jan 2017 10:53:43 -0300	[thread overview]
Message-ID: <20170125135350.22983-17-acme@kernel.org> (raw)
In-Reply-To: <20170125135350.22983-1-acme@kernel.org>

From: Joe Stringer <joe@ovn.org>

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>
Acked-by: Wang 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: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 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 371cb40a2304..406838fa9c4f 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -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)
 {
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.9.3

  parent reply	other threads:[~2017-01-25 13:57 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-25 13:53 [GIT PULL 00/23] perf/core improvements and fixes Arnaldo Carvalho de Melo
2017-01-25 13:53 ` [PATCH 01/23] perf unwind: Fix looking up dwarf unwind stack info Arnaldo Carvalho de Melo
2017-01-25 13:53 ` [PATCH 02/23] perf hists browser: Put hist_entry folding logic into single function Arnaldo Carvalho de Melo
2017-01-25 13:53 ` [PATCH 03/23] perf hists browser: Add e/c hotkeys to expand/collapse callchain for current entry Arnaldo Carvalho de Melo
2017-01-25 13:53 ` [PATCH 04/23] perf c2c report: Display Total records column in offset view Arnaldo Carvalho de Melo
2017-01-25 13:53 ` [PATCH 05/23] perf c2c report: Coalesce by default only by pid,iaddr Arnaldo Carvalho de Melo
2017-01-25 13:53 ` [PATCH 06/23] perf tools: Add probing for the XED disassembler library Arnaldo Carvalho de Melo
2017-01-25 13:53 ` [PATCH 07/23] perf tools: Add one liner warning for disabled features Arnaldo Carvalho de Melo
2017-01-25 13:53 ` [PATCH 08/23] perf tools: Add disassembler for x86 using the XED library Arnaldo Carvalho de Melo
2017-01-25 13:53 ` [PATCH 09/23] perf script: Add support for printing assembler Arnaldo Carvalho de Melo
2017-01-25 13:53 ` [PATCH 10/23] perf script: Add "brstackasm" output for branch stacks Arnaldo Carvalho de Melo
2017-01-25 13:53 ` [PATCH 11/23] perf probe: Fix wrong register name for arm64 Arnaldo Carvalho de Melo
2017-01-25 13:53 ` [PATCH 12/23] perf probe: Delete an unnecessary check in try_to_find_absolute_address() Arnaldo Carvalho de Melo
2017-01-25 13:53 ` [PATCH 13/23] perf probe: Delete an unnecessary assignment " Arnaldo Carvalho de Melo
2017-01-25 13:53 ` [PATCH 14/23] tools lib bpf: Fix map offsets in relocation Arnaldo Carvalho de Melo
2017-01-25 13:53 ` [PATCH 15/23] tools lib bpf: Define prog_type fns with macro Arnaldo Carvalho de Melo
2017-01-25 13:53 ` Arnaldo Carvalho de Melo [this message]
2017-01-25 13:53 ` [PATCH 17/23] tools lib bpf: Add libbpf_get_error() Arnaldo Carvalho de Melo
2017-01-25 13:53 ` [PATCH 18/23] perf scripting perl: Do not die() when not founding event for a type Arnaldo Carvalho de Melo
2017-01-25 13:53 ` [PATCH 19/23] perf tools: Propagate perf_config() errors Arnaldo Carvalho de Melo
2017-01-25 13:53 ` [PATCH 20/23] perf util: Save pid-cmdline mapping into tracing header Arnaldo Carvalho de Melo
2017-01-25 13:53 ` [PATCH 21/23] perf util: Add more debug message on failure path Arnaldo Carvalho de Melo
2017-01-25 13:53 ` [PATCH 22/23] perf ftrace: Introduce new 'ftrace' tool Arnaldo Carvalho de Melo
2017-01-25 13:53 ` [PATCH 23/23] perf ftrace: Make 'function_graph' be the default tracer Arnaldo Carvalho de Melo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170125135350.22983-17-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=acme@redhat.com \
    --cc=ast@fb.com \
    --cc=daniel@iogearbox.net \
    --cc=joe@ovn.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox