| From: |
| Jiri Olsa <jolsa-AT-kernel.org> |
| To: |
| Alexei Starovoitov <ast-AT-kernel.org>, Daniel Borkmann <daniel-AT-iogearbox.net>, Andrii Nakryiko <andrii-AT-kernel.org> |
| Subject: |
| [PATCHv4 bpf-next 00/28] bpf: Add multi uprobe link |
| Date: |
| Thu, 20 Jul 2023 13:35:22 +0200 |
| Message-ID: |
| <20230720113550.369257-1-jolsa@kernel.org> |
| Cc: |
| bpf-AT-vger.kernel.org, Martin KaFai Lau <kafai-AT-fb.com>, Song Liu <songliubraving-AT-fb.com>, Yonghong Song <yhs-AT-fb.com>, John Fastabend <john.fastabend-AT-gmail.com>, KP Singh <kpsingh-AT-chromium.org>, Stanislav Fomichev <sdf-AT-google.com>, Hao Luo <haoluo-AT-google.com> |
| Archive-link: |
| Article |
hi,
this patchset is adding support to attach multiple uprobes and usdt probes
through new uprobe_multi link.
The current uprobe is attached through the perf event and attaching many
uprobes takes a lot of time because of that.
The main reason is that we need to install perf event for each probed function
and profile shows perf event installation (perf_install_in_context) as culprit.
The new uprobe_multi link just creates raw uprobes and attaches the bpf
program to them without perf event being involved.
In addition to being faster we also save file descriptors. For the current
uprobe attach we use extra perf event fd for each probed function. The new
link just need one fd that covers all the functions we are attaching to.
v4 changes:
- fixed path leak in bpf_uprobe_multi_link_attach error path [Andrii]
- move libbpf_elf.h to libbpf_internal.h [Andrii]
- many fixes for new elf helpers [Andrii]
- fixes in bpf_program__attach_uprobe_multi [Andrii]
- changed uprobe multi link detection [Andrii]
- changed uprobe multi link detection in usdt code [Andrii]
- moved get_time_ns to testing_helpers.h [Andrii]
- moved bench/usdt test code just to uprobe_multi [Andrii]
- added special progs object for uprobe bench program [Andrii]
- moved BPF_F_KPROBE_MULTI_RETURN macro to enum [Andrii]
- fixed error found by CI [David]
- several minor changes [Andrii]
- added acks
There's support for bpftrace [2] and tetragon [1].
Also available at:
https://git.kernel.org/pub/scm/linux/kernel/git/jolsa/per...
uprobe_multi
thanks,
jirka
[1] https://github.com/cilium/tetragon/pull/936
[2] https://github.com/iovisor/bpftrace/compare/master...olsa...
[3] https://lore.kernel.org/bpf/20230628115329.248450-1-laoar...
---
Jiri Olsa (28):
bpf: Switch BPF_F_KPROBE_MULTI_RETURN macro to enum
bpf: Add attach_type checks under bpf_prog_attach_check_attach_type
bpf: Add multi uprobe link
bpf: Add cookies support for uprobe_multi link
bpf: Add pid filter support for uprobe_multi link
bpf: Add bpf_get_func_ip helper support for uprobe link
libbpf: Add uprobe_multi attach type and link names
libbpf: Move elf_find_func_offset* functions to elf object
libbpf: Add elf_open/elf_close functions
libbpf: Add elf symbol iterator
libbpf: Add elf_resolve_syms_offsets function
libbpf: Add elf_resolve_pattern_offsets function
libbpf: Add bpf_link_create support for multi uprobes
libbpf: Add bpf_program__attach_uprobe_multi function
libbpf: Add support for u[ret]probe.multi[.s] program sections
libbpf: Add uprobe multi link detection
libbpf: Add uprobe multi link support to bpf_program__attach_usdt
selftests/bpf: Move get_time_ns to testing_helpers.h
selftests/bpf: Add uprobe_multi skel test
selftests/bpf: Add uprobe_multi api test
selftests/bpf: Add uprobe_multi link test
selftests/bpf: Add uprobe_multi test program
selftests/bpf: Add uprobe_multi bench test
selftests/bpf: Add uprobe_multi usdt test code
selftests/bpf: Add uprobe_multi usdt bench test
selftests/bpf: Add uprobe_multi cookie test
selftests/bpf: Add uprobe_multi pid filter tests
selftests/bpf: Add extra link to uprobe_multi tests
include/linux/trace_events.h | 6 ++
include/uapi/linux/bpf.h | 22 ++++-
kernel/bpf/syscall.c | 122 ++++++++++++--------------
kernel/trace/bpf_trace.c | 346 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
tools/include/uapi/linux/bpf.h | 22 ++++-
tools/lib/bpf/Build | 2 +-
tools/lib/bpf/bpf.c | 11 +++
tools/lib/bpf/bpf.h | 11 ++-
tools/lib/bpf/elf.c | 440 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
tools/lib/bpf/libbpf.c | 388 ++++++++++++++++++++++++++++++++++++++++++---------------------------------------
tools/lib/bpf/libbpf.h | 51 +++++++++++
tools/lib/bpf/libbpf.map | 1 +
tools/lib/bpf/libbpf_internal.h | 21 +++++
tools/lib/bpf/usdt.c | 116 ++++++++++++++++--------
tools/testing/selftests/bpf/Makefile | 5 ++
tools/testing/selftests/bpf/bench.h | 9 --
tools/testing/selftests/bpf/prog_tests/bpf_cookie.c | 78 +++++++++++++++++
tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c | 8 --
tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c | 414 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
tools/testing/selftests/bpf/progs/uprobe_multi.c | 101 +++++++++++++++++++++
tools/testing/selftests/bpf/progs/uprobe_multi_bench.c | 15 ++++
tools/testing/selftests/bpf/progs/uprobe_multi_usdt.c | 16 ++++
tools/testing/selftests/bpf/testing_helpers.h | 10 +++
tools/testing/selftests/bpf/uprobe_multi.c | 91 +++++++++++++++++++
24 files changed, 1990 insertions(+), 316 deletions(-)
create mode 100644 tools/lib/bpf/elf.c
create mode 100644 tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c
create mode 100644 tools/testing/selftests/bpf/progs/uprobe_multi.c
create mode 100644 tools/testing/selftests/bpf/progs/uprobe_multi_bench.c
create mode 100644 tools/testing/selftests/bpf/progs/uprobe_multi_usdt.c
create mode 100644 tools/testing/selftests/bpf/uprobe_multi.c