Skip to content

bpf: Fixes for CONFIG_X86_KERNEL_IBT

Jiri Olsa bpf 5 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. v5 Latest6 patches 1 replyApplied 6/6
  2. v46 patches 6 repliesSuperseded
  3. v36 patches 5 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v26 patches23 repliesSuperseded
v15 patches6 repliesSuperseded

Changes in v5 from the cover letter

- updated uapi/linux/bpf.h headers with comment for bpf_get_func_ip returning 0 [Andrii]
- added acks

Patches in v5 All 6 applied

#Subject and filesSizeRepliesApplied
1/6kprobes: Add new KPROBE_FLAG_ON_FUNC_ENTRY kprobe flaginclude/linux/kprobes.h kernel/kprobes.c+6 -10 repliesApplied
2/6ftrace: Keep the resolved addr in kallsyms_callbackkernel/trace/ftrace.c+1 -20 repliesApplied
3/6bpf: Use given function address for trampoline ip argarch/x86/net/bpf_jit_comp.c+5 -60 repliesApplied
4/6bpf: Adjust kprobe_multi entry_ip for CONFIG_X86_KERNEL_IBTkernel/trace/bpf_trace.c tools/testing/selftests/bpf/progs/kprobe_multi.c+19 -50 repliesApplied
5/6bpf: Return value in kprobe get_func_ip only for entry addressinclude/uapi/linux/bpf.h kernel/trace/bpf_trace.c tools/include/uapi/linux/bpf.h +1 more+8 -30 repliesApplied
6/6selftests/bpf: Fix get_func_ip offset test for CONFIG_X86_KERNEL_IBTtools/testing/selftests/bpf/prog_tests/get_func_ip_test.c tools/testing/selftests/bpf/progs/get_func_ip_test.c+60 -220 repliesApplied

Reviews trailers per patch

5 of 6 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchMasami Hiramatsu (Google)Andrii NakryikoMartynas PumputisPeter Zijlstra (Intel)
SeriesA-b
1/6A-b
2/6R-b
3/6
4/6A-b
5/6A-b A-b
6/6A-b

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 v5 thread

Cover letter [PATCHv5 bpf-next 0/6] bpf: Fixes for CONFIG_X86_KERNEL_IBT

hi,
Martynas reported bpf_get_func_ip returning +4 address when CONFIG_X86_KERNEL_IBT option is enabled and I found there are some failing bpf tests when this option is enabled.

The CONFIG_X86_KERNEL_IBT option adds endbr instruction at the function entry, so the idea is to 'fix' entry ip for kprobe_multi and trampoline probes, because they are placed on the function entry.

v5 changes:
- updated uapi/linux/bpf.h headers with comment for bpf_get_func_ip returning 0 [Andrii]
- added acks

v4 changes:
- used get_kernel_nofault to read previous instruction [Peter]
- used movabs instruction in trampoline comment [Peter]
- renamed fentry_ip argument in kprobe_multi_link_handler [Peter]

v3 changes:
- using 'unused' bpf function to get IBT config option into selftest skeleton
- rebased to current bpf-next/master
- added ack/review from Masami

v2 changes:
- change kprobes get_func_ip to return zero for kprobes attached within the function body [Andrii]
- detect IBT config and properly test kprobe with offset [Andrii]

v1 changes:
- read previous instruction in kprobe_multi link handler and adjust entry_ip for CONFIG_X86_KERNEL_IBT option
- split first patch into 2 separate changes
- update changelogs

thanks,
jirka

---
Jiri Olsa (6):
kprobes: Add new KPROBE_FLAG_ON_FUNC_ENTRY kprobe flag
ftrace: Keep the resolved addr in kallsyms_callback
bpf: Use given function address for trampoline ip arg
bpf: Adjust kprobe_multi entry_ip for CONFIG_X86_KERNEL_IBT
bpf: Return value in kprobe get_func_ip only for entry address selftests/bpf: Fix get_func_ip offset test for CONFIG_X86_KERNEL_IBT

 arch/x86/net/bpf_jit_comp.c                               | 11 +++++------
 include/linux/kprobes.h                                   |  1 +
 include/uapi/linux/bpf.h                                  |  1 +
 kernel/kprobes.c                                          |  6 +++++-
 kernel/trace/bpf_trace.c                                  | 25 ++++++++++++++++++++++---
 kernel/trace/ftrace.c                                     |  3 +--
 tools/include/uapi/linux/bpf.h                            |  1 +
 tools/testing/selftests/bpf/prog_tests/get_func_ip_test.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
 tools/testing/selftests/bpf/progs/get_func_ip_test.c      | 25 +++++++++++++------------
 tools/testing/selftests/bpf/progs/kprobe_multi.c          |  4 +---
 10 files changed, 98 insertions(+), 38 deletions(-)