Skip to content

RFC bpf: Add tracing multi link

Jiri Olsa bpf llvm 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 RFC Latest17 patches 13 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/17bpf: Link shimlink directly in trampolineinclude/linux/bpf.h kernel/bpf/trampoline.c+6 -203 replies
2/17bpf: Replace bpf_tramp_links with bpf_tramp_progsarch/x86/net/bpf_jit_comp.c include/linux/bpf.h kernel/bpf/bpf_struct_ops.c +2 more+67 -570 replies
3/17bpf: Store trampoline progs in arraysinclude/linux/bpf.h kernel/bpf/bpf_struct_ops.c kernel/bpf/syscall.c +2 more+96 -770 replies
4/17bpf: Add multi tracing attach typesinclude/linux/bpf.h include/uapi/linux/bpf.h kernel/bpf/syscall.c +4 more+52 -50 replies
5/17bpf: Add bpf_tramp_id objectinclude/linux/bpf.h kernel/bpf/trampoline.c+50 -00 replies
6/17bpf: Pass image struct to reg/unreg/modify fentry functionskernel/bpf/trampoline.c+10 -60 replies
7/17bpf: Add support to postpone trampoline updateinclude/linux/bpf.h kernel/bpf/trampoline.c+78 -290 replies
8/17bpf: Factor bpf_trampoline_lookup functionkernel/bpf/trampoline.c+33 -120 replies
9/17bpf: Factor bpf_trampoline_put functionkernel/bpf/trampoline.c+11 -70 replies
10/17bpf: Add support to attach program to multiple trampolinesinclude/linux/bpf.h kernel/bpf/trampoline.c+394 -78 replies
11/17bpf: Add support to create tracing multi linkinclude/linux/trace_events.h include/uapi/linux/bpf.h kernel/bpf/syscall.c +2 more+257 -00 replies
12/17libbpf: Add btf__find_by_glob_kind functiontools/lib/bpf/btf.c tools/lib/bpf/btf.h tools/lib/bpf/libbpf.c +1 more+46 -10 replies
13/17libbpf: Add support to create tracing multi linktools/lib/bpf/bpf.c tools/lib/bpf/bpf.h tools/lib/bpf/libbpf.c +2 more+115 -00 replies
14/17selftests/bpf: Add fentry tracing multi func testtools/testing/selftests/bpf/Makefile tools/testing/selftests/bpf/prog_tests/tracing_multi.c tools/testing/selftests/bpf/progs/tracing_multi_check.c +1 more+185 -10 replies
15/17selftests/bpf: Add fexit tracing multi func testtools/testing/selftests/bpf/Makefile tools/testing/selftests/bpf/prog_tests/tracing_multi.c tools/testing/selftests/bpf/progs/tracing_multi_check.c +1 more+77 -10 replies
16/17selftests/bpf: Add fentry/fexit tracing multi func testtools/testing/selftests/bpf/Makefile tools/testing/selftests/bpf/prog_tests/tracing_multi.c tools/testing/selftests/bpf/progs/tracing_multi_fentry_fexit.c+60 -10 replies
17/17selftests/bpf: Add mixed tracing multi func testtools/testing/selftests/bpf/Makefile tools/testing/selftests/bpf/prog_tests/tracing_multi.c tools/testing/selftests/bpf/progs/tracing_multi_mixed.c+113 -10 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [RFC PATCH bpf-next 00/17] bpf: Add tracing multi link

hi,
this is another attempt to add batch attachment support for trampolines.

The patchset adds support to create 'multi' trampoline that is attached to set of functions represented by BTF IDs.

Previous post [0] tried to implement multi trampolines overlapping, but it turned out too complex, so I got back to simpler rules:
(we can discuss possible overlapping changes on top this change)

- multi trampoline can attach on top of existing single trampolines, which creates 2 types of function IDs:

1) single-IDs - functions that are attached within existing single trampolines
2) multi-IDs - functions that were 'not used' and are now taken by new 'multi' trampoline

- we allow overlapping of 2 'multi' trampolines if they are attached to same IDs
- we do now allow any other overlapping of 2 'multi' trampolines
- any new 'single' trampoline cannot attach to existing multi-IDs IDs

Maybe better explained on following example:

- you want to attach program P to functions A,B,C,D,E,F via bpf_trampoline_multi_attach

- D,E,F already have standard trampoline attached

- the bpf_trampoline_multi_attach will create new 'multi' trampoline which spans over A,B,C functions and attach program P to single trampolines D,E,F

- another program can be attached to A,B,C,D,E,F multi trampoline

- A,B,C functions are now 'not attachable' by any trampoline until the above 'multi' trampoline is released

- D,E,F functions are still attachable by any new trampoline

Also now that we have trampoline helpers for function arguments, we can just simply use function declaration with maximum arguments for any multi trampoline or related single trampoline.

There are couple of things missing in this post (that I know of), which I'll add when we agree that this is the way to go:

- attaching by functions names
- cookies support
- find out better way of locking trampolines in bpf_trampoline_multi_attach and bpf_trampoline_multi_detach
- bpf_tramp_update_set logic of calling multiple times register_ftrace_direct_multi function can be replaced by calling single update ftrace function that I have prototype for, but I will send it out separately to ftrace for review
- arm trampoline code changes (won't compile now)
- tests for error paths

thanks,
jirka

[0] - https://lore.kernel.org/bpf/[email protected]/
---
Jiri Olsa (17):
bpf: Link shimlink directly in trampoline
bpf: Replace bpf_tramp_links with bpf_tramp_progs
bpf: Store trampoline progs in arrays
bpf: Add multi tracing attach types
bpf: Add bpf_tramp_id object
bpf: Pass image struct to reg/unreg/modify fentry functions
bpf: Add support to postpone trampoline update
bpf: Factor bpf_trampoline_lookup function
bpf: Factor bpf_trampoline_put function
bpf: Add support to attach program to multiple trampolines
bpf: Add support to create tracing multi link
libbpf: Add btf__find_by_glob_kind function
libbpf: Add support to create tracing multi link selftests/bpf: Add fentry tracing multi func test selftests/bpf: Add fexit tracing multi func test selftests/bpf: Add fentry/fexit tracing multi func test selftests/bpf: Add mixed tracing multi func test

 arch/x86/net/bpf_jit_comp.c                                    |  38 ++---
 include/linux/bpf.h                                            |  98 ++++++++----
 include/linux/trace_events.h                                   |   5 +
 include/uapi/linux/bpf.h                                       |   7 +
 kernel/bpf/bpf_struct_ops.c                                    |  30 ++--
 kernel/bpf/syscall.c                                           |  56 +++++--
 kernel/bpf/trampoline.c                                        | 723 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------
 kernel/bpf/verifier.c                                          |   8 +-
 kernel/trace/bpf_trace.c                                       | 240 +++++++++++++++++++++++++++++
 net/bpf/bpf_dummy_struct_ops.c                                 |  16 +-
 net/bpf/test_run.c                                             |   2 +
 tools/include/uapi/linux/bpf.h                                 |   7 +
 tools/lib/bpf/bpf.c                                            |   7 +
 tools/lib/bpf/bpf.h                                            |   4 +
 tools/lib/bpf/btf.c                                            |  41 +++++
 tools/lib/bpf/btf.h                                            |   3 +
 tools/lib/bpf/libbpf.c                                         |  91 ++++++++++-
 tools/lib/bpf/libbpf.h                                         |  14 ++
 tools/lib/bpf/libbpf.map                                       |   1 +
 tools/lib/bpf/libbpf_internal.h                                |   1 +
 tools/testing/selftests/bpf/Makefile                           |   9 +-
 tools/testing/selftests/bpf/prog_tests/tracing_multi.c         | 158 ++++++++++++++++++++
 tools/testing/selftests/bpf/progs/tracing_multi_check.c        | 158 ++++++++++++++++++++
 tools/testing/selftests/bpf/progs/tracing_multi_fentry.c       |  17 +++
 tools/testing/selftests/bpf/progs/tracing_multi_fentry_fexit.c |  28 ++++
 tools/testing/selftests/bpf/progs/tracing_multi_fexit.c        |  20 +++
 tools/testing/selftests/bpf/progs/tracing_multi_mixed.c        |  43 ++++++
 27 files changed, 1624 insertions(+), 201 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/prog_tests/tracing_multi.c
 create mode 100644 tools/testing/selftests/bpf/progs/tracing_multi_check.c
 create mode 100644 tools/testing/selftests/bpf/progs/tracing_multi_fentry.c
 create mode 100644 tools/testing/selftests/bpf/progs/tracing_multi_fentry_fexit.c
 create mode 100644 tools/testing/selftests/bpf/progs/tracing_multi_fexit.c
 create mode 100644 tools/testing/selftests/bpf/progs/tracing_multi_mixed.c