Skip to content

RFC bpf: Introduce kprobe multi wrapper attach

Jiri Olsa bpf 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v2 RFC Latest4 patches 8 repliesIn review

Changes in v2 from the cover letter

- adding 'kprobe.wrapper' program that is called both for entry and exit probe [Andrii]
- I kept the interface that adds new flag in attr.link_create.kprobe_multi.flags, because I don't see it breaking backward compatibility and it's much simpler than new attach type, I tried to discuss this in [1], but I'm ok to change that if it turns out to be a problem

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/4bpf: Add support for kprobe multi wrapper attachinclude/uapi/linux/bpf.h kernel/trace/bpf_trace.c tools/include/uapi/linux/bpf.h+22 -82 replies
2/4bpf: Add bpf_kprobe_multi_is_return kfunckernel/bpf/btf.c kernel/trace/bpf_trace.c+49 -34 replies
3/4libbpf: Add support for kprobe multi wrapper attachtools/lib/bpf/libbpf.c tools/lib/bpf/libbpf.h+38 -42 replies
4/4selftests/bpf: Add kprobe multi wrapper testtools/testing/selftests/bpf/bpf_kfuncs.h tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c tools/testing/selftests/bpf/progs/kprobe_multi_wrapper.c+151 -00 replies

Reviews trailers per patch

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

Read the v2 thread

Cover letter [PATCH RFCv2 bpf-next 0/4] bpf: Introduce kprobe multi wrapper attach

hi,
adding support to attach both entry and return bpf program on single kprobe multi link. The first RFC patchset is in [0].

Having entry together with return probe for given function is common use case for tetragon, bpftrace and most likely for others.

At the moment if we want both entry and return probe to execute bpf program we need to create two (entry and return probe) links. The link for return probe creates extra entry probe to setup the return probe. The extra entry probe execution could be omitted if we had a way to use just single link for both entry and exit probe.

In addition it's possible to control the execution of the return probe with the return value of the entry bpf program. If the entry program returns 0 the return probe is installed and executed, otherwise it's skip.

v2 changes:
- adding 'kprobe.wrapper' program that is called both for entry and exit probe [Andrii]
- I kept the interface that adds new flag in attr.link_create.kprobe_multi.flags, because I don't see it breaking backward compatibility and it's much simpler than new attach type, I tried to discuss this in [1], but I'm ok to change that if it turns out to be a problem

thanks,
jirka

[0] https://lore.kernel.org/bpf/[email protected]/
[1] https://lore.kernel.org/bpf/ZdhmKQ1_vpCJTS_U@krava/
---
Jiri Olsa (4):
bpf: Add support for kprobe multi wrapper attach
bpf: Add bpf_kprobe_multi_is_return kfunc
libbpf: Add support for kprobe multi wrapper attach selftests/bpf: Add kprobe multi wrapper test

 include/uapi/linux/bpf.h                                   |   3 ++-
 kernel/bpf/btf.c                                           |   3 +++
 kernel/trace/bpf_trace.c                                   |  71 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
 tools/include/uapi/linux/bpf.h                             |   3 ++-
 tools/lib/bpf/libbpf.c                                     |  38 ++++++++++++++++++++++++++++---
 tools/lib/bpf/libbpf.h                                     |   4 +++-
 tools/testing/selftests/bpf/bpf_kfuncs.h                   |   2 ++
 tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c |  49 ++++++++++++++++++++++++++++++++++++++++
 tools/testing/selftests/bpf/progs/kprobe_multi_wrapper.c   | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 9 files changed, 259 insertions(+), 14 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/kprobe_multi_wrapper.c