Skip to content

bpf: Add multi uprobe link

Jiri Olsa bpf 7 versions – Applied

Status from this message: This series was applied to bpf/bpf-next.git (master)

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v7 Latest28 patches 8 repliesApplied 28/28
  2. v628 patches 2 repliesSuperseded
  3. v528 patches 6 repliesSuperseded
Earlier versions · 4
VersionPostedPatchesRepliesStatus
v428 patches7 repliesSuperseded
v326 patches46 repliesSuperseded
v224 patches36 repliesSuperseded
v120 patches31 repliesSuperseded

Changes in v7 from the cover letter

- fixed task release on error path and re-org the error path to be more straightforward [Yonghong]
- re-organized uprobe_prog_run locking to follow general pattern and removed might_fault check as it's not needed in uprobe/task context [Yonghong]

Patches in v7 All 28 applied

#Subject and filesSizeRepliesApplied
1/28bpf: Switch BPF_F_KPROBE_MULTI_RETURN macro to enuminclude/uapi/linux/bpf.h tools/include/uapi/linux/bpf.h+6 -21 replyApplied
2/28bpf: Add attach_type checks under bpf_prog_attach_check_attach_typekernel/bpf/syscall.c+52 -681 replyApplied
3/28bpf: Add multi uprobe linkinclude/linux/trace_events.h include/uapi/linux/bpf.h kernel/bpf/syscall.c +2 more+282 -31 replyApplied
4/28bpf: Add cookies support for uprobe_multi linkinclude/uapi/linux/bpf.h kernel/bpf/syscall.c kernel/trace/bpf_trace.c +1 more+44 -53 repliesApplied
5/28bpf: Add pid filter support for uprobe_multi linkinclude/uapi/linux/bpf.h kernel/bpf/syscall.c kernel/trace/bpf_trace.c +1 more+36 -11 replyApplied
6/28bpf: Add bpf_get_func_ip helper support for uprobe linkkernel/trace/bpf_trace.c+30 -31 replyApplied
7/28libbpf: Add uprobe_multi attach type and link namestools/lib/bpf/libbpf.c+2 -00 repliesApplied
8/28libbpf: Move elf_find_func_offset* functions to elf objecttools/lib/bpf/Build tools/lib/bpf/elf.c tools/lib/bpf/libbpf.c +1 more+202 -1860 repliesApplied
9/28libbpf: Add elf_open/elf_close functionstools/lib/bpf/elf.c tools/lib/bpf/libbpf_internal.h tools/lib/bpf/usdt.c+57 -420 repliesApplied
10/28libbpf: Add elf symbol iteratortools/lib/bpf/elf.c+115 -640 repliesApplied
11/28libbpf: Add elf_resolve_syms_offsets functiontools/lib/bpf/elf.c tools/lib/bpf/libbpf_internal.h+112 -00 repliesApplied
12/28libbpf: Add elf_resolve_pattern_offsets functiontools/lib/bpf/elf.c tools/lib/bpf/libbpf.c tools/lib/bpf/libbpf_internal.h+67 -10 repliesApplied
13/28libbpf: Add bpf_link_create support for multi uprobestools/lib/bpf/bpf.c tools/lib/bpf/bpf.h+21 -10 repliesApplied
14/28libbpf: Add bpf_program__attach_uprobe_multi functiontools/lib/bpf/libbpf.c tools/lib/bpf/libbpf.h tools/lib/bpf/libbpf.map+166 -00 repliesApplied
15/28libbpf: Add support for u[ret]probe.multi[.s] program sectionstools/lib/bpf/libbpf.c+36 -00 repliesApplied
16/28libbpf: Add uprobe multi link detectiontools/lib/bpf/libbpf.c tools/lib/bpf/libbpf_internal.h+38 -00 repliesApplied
17/28libbpf: Add uprobe multi link support to bpf_program__attach_usdttools/lib/bpf/libbpf.c tools/lib/bpf/usdt.c+82 -170 repliesApplied
18/28selftests/bpf: Move get_time_ns to testing_helpers.htools/testing/selftests/bpf/bench.h tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c tools/testing/selftests/bpf/testing_helpers.h+10 -170 repliesApplied
19/28selftests/bpf: Add uprobe_multi skel testtools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c tools/testing/selftests/bpf/progs/uprobe_multi.c+167 -00 repliesApplied
20/28selftests/bpf: Add uprobe_multi api testtools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c+65 -00 repliesApplied
21/28selftests/bpf: Add uprobe_multi link testtools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c+69 -00 repliesApplied
22/28selftests/bpf: Add uprobe_multi test programtools/testing/selftests/bpf/Makefile tools/testing/selftests/bpf/uprobe_multi.c+72 -00 repliesApplied
23/28selftests/bpf: Add uprobe_multi bench testtools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c tools/testing/selftests/bpf/progs/uprobe_multi_bench.c+55 -00 repliesApplied
24/28selftests/bpf: Add uprobe_multi usdt test codetools/testing/selftests/bpf/uprobe_multi.c+25 -10 repliesApplied
25/28selftests/bpf: Add uprobe_multi usdt bench testtools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c tools/testing/selftests/bpf/progs/uprobe_multi_usdt.c+55 -00 repliesApplied
26/28selftests/bpf: Add uprobe_multi cookie testtools/testing/selftests/bpf/prog_tests/bpf_cookie.c+78 -00 repliesApplied
27/28selftests/bpf: Add uprobe_multi pid filter teststools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c tools/testing/selftests/bpf/progs/uprobe_multi.c+126 -120 repliesApplied
28/28selftests/bpf: Add extra link to uprobe_multi teststools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c tools/testing/selftests/bpf/progs/uprobe_multi.c+22 -00 repliesApplied

Reviews trailers per patch

11 of 28 patches have a Reviewed-by or Acked-by.

PatchYafang ShaoAndrii NakryikoOleg NesterovYonghong Song
1/28A-b A-b
2/28A-b A-b A-b
3/28A-b A-b A-b
4/28A-b A-b A-b
5/28R-b A-b
6/28A-b A-b
7/28A-b
8/28
9/28A-b
10/28A-b
11/28
12/28
13/28A-b
14/28
15/28A-b
16/28
17/28
18/28
19/28
20/28
21/28
22/28
23/28
24/28
25/28
26/28
27/28
28/28

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.

Read the v7 thread

Cover letter [PATCHv7 bpf-next 00/28] bpf: Add multi uprobe link

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.

v7 changes:
- fixed task release on error path and re-org the error path to be more straightforward [Yonghong]
- re-organized uprobe_prog_run locking to follow general pattern and removed might_fault check as it's not needed in uprobe/task context [Yonghong]

There's support for bpftrace [2] and tetragon [1].

Also available at:
https://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git
uprobe_multi

thanks,
jirka

[1] https://github.com/cilium/tetragon/pull/936
[2] https://github.com/iovisor/bpftrace/compare/master...olsajiri:bpftrace:uprobe_multi
[3] https://lore.kernel.org/bpf/[email protected]/
---
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                                       | 134 ++++++++++++++--------------
 kernel/trace/bpf_trace.c                                   | 342 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 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 | 415 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 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, 1992 insertions(+), 323 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