diff options
author | Alexei Starovoitov <ast@kernel.org> | 2017-12-12 08:48:50 -0800 |
---|---|---|
committer | Alexei Starovoitov <ast@kernel.org> | 2017-12-12 08:49:14 -0800 |
commit | a23967c181cae80becb451b38ff2a1e01c05c37b (patch) | |
tree | e7cc1c25702aec28b2fb89842e4ccef512d9582f /kernel/module.c | |
parent | 63060c39161d3d61c771dee20a3cbdffaf83f1df (diff) | |
parent | d279f1f8c64711ca986c3121c8ec811b892932f0 (diff) | |
download | linux-a23967c181cae80becb451b38ff2a1e01c05c37b.tar.gz linux-a23967c181cae80becb451b38ff2a1e01c05c37b.tar.bz2 linux-a23967c181cae80becb451b38ff2a1e01c05c37b.zip |
Merge branch 'bpf-tracing-multiprog-tp-query'
Yonghong Song says:
====================
Commit e87c6bc3852b ("bpf: permit multiple bpf attachments
for a single perf event") added support to attach multiple
bpf programs to a single perf event. Given a perf event
(kprobe, uprobe, or kernel tracepoint), the perf ioctl interface
is used to query bpf programs attached to the same trace event.
There already exists a BPF_PROG_QUERY command for introspection
currently used by cgroup+bpf. We did have an implementation for
querying tracepoint+bpf through the same interface. However, it
looks cleaner to use ioctl() style of api here, since attaching
bpf prog to tracepoint/kuprobe is also done via ioctl.
Patch #1 had the core implementation and patch #2 added
a test case in tools bpf selftests suite.
Changelogs:
v3 -> v4:
- Fix a compilation error with newer gcc like 6.3.1 while
old gcc 4.8.5 is okay. I was using &uquery->ids to represent
the address to the ids array to make it explicit that the
address is passed, and this syntax is rightly rejected
by gcc 6.3.1.
v2 -> v3:
- Change uapi structure perf_event_query_bpf to be more
clearer based on Peter's suggestion, and adjust
other codes accordingly.
v1 -> v2:
- Rebase on top of net-next.
- Use existing bpf_prog_array_length function instead of
implementing the same functionality in function
bpf_prog_array_copy_info.
====================
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'kernel/module.c')
0 files changed, 0 insertions, 0 deletions