Merge branch 'bpf: Fix cookie values for kprobe multi'

Browse source

Jiri Olsa says:

====================

hi,
there's bug in kprobe_multi link that makes cookies misplaced when
using symbols to attach. The reason is that we sort symbols by name
but not adjacent cookie values. Current test did not find it because
bpf_fentry_test* are already sorted by name.

v3 changes:
  - fixed kprobe_multi bench test to filter out invalid entries
    from available_filter_functions

v2 changes:
  - rebased on top of bpf/master
  - checking if cookies are defined later in swap function [Andrii]
  - added acks

thanks,
jirka
====================

Signed-off-by: Alexei Starovoitov <ast@kernel.org>

...

This commit is contained in:

Alexei Starovoitov 2022-06-16 19:42:21 -07:00

parent 5e0b0a4c52 730067022c

commit a4a8b2eea4

5 changed files with 110 additions and 68 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

70

kernel/trace/bpf_trace.c

View file

13

kernel/trace/ftrace.c

View file

78

tools/testing/selftests/bpf/prog_tests/bpf_cookie.c

View file

3

tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c

View file

24

tools/testing/selftests/bpf/progs/kprobe_multi.c

View file