Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bpf: Add multi uprobe link #5440

Closed
wants to merge 29 commits into from
Closed

bpf: Add multi uprobe link #5440

wants to merge 29 commits into from

Conversation

kernel-patches-daemon-bpf[bot]
Copy link

Pull request for series with
subject: bpf: Add multi uprobe link
version: 1
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=770918

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: fb213ec
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=770918
version: 1

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 74bdfab
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=770918
version: 1

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: e99688e
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=770918
version: 1

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 81584c2
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=770918
version: 1

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 1110865
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=770918
version: 1

@kernel-patches-daemon-bpf
Copy link
Author

At least one diff in series https://patchwork.kernel.org/project/netdevbpf/list/?series=770918 expired. Closing PR.

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 87dc2bb
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=772473
version: 1

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 87dc2bb
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=772473
version: 1

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 648880e
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=772473
version: 1

@olsajiri
libbpf: Add elf symbol iterator
bbeb6da 
Adding elf symbol iterator object (and some functions) that follow
open-coded iterator pattern and some functions to ease up iterating
elf object symbols.

The idea is to iterate single symbol section with:

  struct elf_sym_iter iter;
  struct elf_sym *sym;

  if (elf_sym_iter_new(&iter, elf, binary_path, SHT_DYNSYM))
        goto error;

  while ((sym = elf_sym_iter_next(&iter))) {
        ...
  }

I considered opening the elf inside the iterator and iterate all symbol
sections, but then it gets more complicated wrt user checks for when
the next section is processed.

Plus side is the we don't need 'exit' function, because caller/user is
in charge of that.

The returned iterated symbol object from elf_sym_iter_next function
is placed inside the struct elf_sym_iter, so no extra allocation or
argument is needed.

Suggested-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
@olsajiri
libbpf: Add elf_resolve_syms_offsets function
49391c1 
Adding elf_resolve_syms_offsets function that looks up
offsets for symbols specified in syms array argument.

Offsets are returned in allocated array with the 'cnt' size,
that needs to be released by the caller.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
@olsajiri
libbpf: Add elf_resolve_pattern_offsets function
174c644 
Adding elf_resolve_pattern_offsets function that looks up
offsets for symbols specified by pattern argument.

The 'pattern' argument allows wildcards (*?' supported).

Offsets are returned in allocated array together with its
size and needs to be released by the caller.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
@olsajiri
libbpf: Add bpf_link_create support for multi uprobes
e20fb9c 
Adding new uprobe_multi struct to bpf_link_create_opts object
to pass multiple uprobe data to link_create attr uapi.

Acked-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
@olsajiri
libbpf: Add bpf_program__attach_uprobe_multi function
4d53409 
Adding bpf_program__attach_uprobe_multi function that
allows to attach multiple uprobes with uprobe_multi link.

The user can specify uprobes with direct arguments:

  binary_path/func_pattern/pid

or with struct bpf_uprobe_multi_opts opts argument fields:

  const char **syms;
  const unsigned long *offsets;
  const unsigned long *ref_ctr_offsets;
  const __u64 *cookies;

User can specify 2 mutually exclusive set of inputs:

 1) use only path/func_pattern/pid arguments

 2) use path/pid with allowed combinations of:
    syms/offsets/ref_ctr_offsets/cookies/cnt

    - syms and offsets are mutually exclusive
    - ref_ctr_offsets and cookies are optional

Any other usage results in error.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
@olsajiri
libbpf: Add support for u[ret]probe.multi[.s] program sections
a05982d 
Adding support for several uprobe_multi program sections
to allow auto attach of multi_uprobe programs.

Acked-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
@olsajiri
libbpf: Add uprobe multi link detection
0eb6ba4 
Adding uprobe-multi link detection. It will be used later in
bpf_program__attach_usdt function to check and use uprobe_multi
link over standard uprobe links.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
@olsajiri
libbpf: Add uprobe multi link support to bpf_program__attach_usdt
1ed8729 
Adding support for usdt_manager_attach_usdt to use uprobe_multi
link to attach to usdt probes.

The uprobe_multi support is detected before the usdt program is
loaded and its expected_attach_type is set accordingly.

If uprobe_multi support is detected the usdt_manager_attach_usdt
gathers uprobes info and calls bpf_program__attach_uprobe to
create all needed uprobes.

If uprobe_multi support is not detected the old behaviour stays.

Also adding usdt.s program section for sleepable usdt probes.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
@olsajiri
selftests/bpf: Move get_time_ns to testing_helpers.h
85c8386 
We'd like to have single copy of get_time_ns used b bench and test_progs,
but we can't just include bench.h, because of conflicting 'struct env'
objects.

Moving get_time_ns to testing_helpers.h which is being included by both
bench and test_progs objects.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
@olsajiri
selftests/bpf: Add uprobe_multi skel test
476aa80 
Adding uprobe_multi test for skeleton load/attach functions,
to test skeleton auto attach for uprobe_multi link.

Test that bpf_get_func_ip works properly for uprobe_multi
attachment.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
@olsajiri
selftests/bpf: Add uprobe_multi api test
691738c 
Adding uprobe_multi test for bpf_program__attach_uprobe_multi
attach function.

Testing attachment using glob patterns and via bpf_uprobe_multi_opts
paths/syms fields.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
@olsajiri
selftests/bpf: Add uprobe_multi link test
8e6b52b 
Adding uprobe_multi test for bpf_link_create attach function.

Testing attachment using the struct bpf_link_create_opts.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
@olsajiri
selftests/bpf: Add uprobe_multi test program
8b8b2db 
Adding uprobe_multi test program that defines 50k uprobe_multi_func_*
functions and will serve as attach point for uprobe_multi bench test
in following patch.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
@olsajiri
selftests/bpf: Add uprobe_multi bench test
44d238b 
Adding test that attaches 50k uprobes in uprobe_multi binary.

After the attach is done we run the binary and make sure we
get proper amount of hits.

The resulting attach/detach times on my setup:

  test_bench_attach_uprobe:PASS:uprobe_multi__open 0 nsec
  test_bench_attach_uprobe:PASS:uprobe_multi__attach 0 nsec
  test_bench_attach_uprobe:PASS:uprobes_count 0 nsec
  test_bench_attach_uprobe: attached in   0.346s
  test_bench_attach_uprobe: detached in   0.419s
  #262/5   uprobe_multi_test/bench_uprobe:OK

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
@olsajiri
selftests/bpf: Add uprobe_multi usdt test code
d63e121 
Adding code in uprobe_multi test binary that defines 50k usdts
and will serve as attach point for uprobe_multi usdt bench test
in following patch.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
@olsajiri
selftests/bpf: Add uprobe_multi usdt bench test
ba1a20e 
Adding test that attaches 50k usdt probes in usdt_multi binary.

After the attach is done we run the binary and make sure we get
proper amount of hits.

With current uprobes:

  # perf stat --null ./test_progs -n 254/6
  #254/6   uprobe_multi_test/bench_usdt:OK
  #254     uprobe_multi_test:OK
  Summary: 1/1 PASSED, 0 SKIPPED, 0 FAILED

   Performance counter stats for './test_progs -n 254/6':

      1353.659680562 seconds time elapsed

With uprobe_multi link:

  # perf stat --null ./test_progs -n 254/6
  #254/6   uprobe_multi_test/bench_usdt:OK
  #254     uprobe_multi_test:OK
  Summary: 1/1 PASSED, 0 SKIPPED, 0 FAILED

   Performance counter stats for './test_progs -n 254/6':

         0.322046364 seconds time elapsed

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: acfadf2
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=774433
version: 1

@olsajiri
selftests/bpf: Add uprobe_multi cookie test
647fbd1 
Adding test for cookies setup/retrieval in uprobe_link uprobes
and making sure bpf_get_attach_cookie works properly.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
@olsajiri
selftests/bpf: Add uprobe_multi pid filter tests
e5bb28d 
Running api and link tests also with pid filter and checking
the probe gets executed only for specific pid.

Spawning extra process to trigger attached uprobes and checking
we get correct counts from executed programs.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
@olsajiri
selftests/bpf: Add extra link to uprobe_multi tests
72a1de9 
Attaching extra program to same functions system wide for api
and link tests.

This way we can test the pid filter works properly when there's
extra system wide consumer on the same uprobe that will trigger
the original uprobe handler.

We expect to have the same counts as before.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: d565183
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=774433
version: 1

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/netdevbpf/list/?series=774433
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: bpf: Switch BPF_F_KPROBE_MULTI_RETURN macro to enum
Using index info to reconstruct a base tree...
M	include/uapi/linux/bpf.h
M	tools/include/uapi/linux/bpf.h
Falling back to patching base and 3-way merge...
Auto-merging tools/include/uapi/linux/bpf.h
CONFLICT (content): Merge conflict in tools/include/uapi/linux/bpf.h
Auto-merging include/uapi/linux/bpf.h
CONFLICT (content): Merge conflict in include/uapi/linux/bpf.h
Patch failed at 0001 bpf: Switch BPF_F_KPROBE_MULTI_RETURN macro to enum
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch'

conflict:

diff --cc include/uapi/linux/bpf.h
index 8790b3962e4b,a4e55e5e84a7..000000000000
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@@ -1191,13 -1189,6 +1191,16 @@@ enum bpf_perf_event_type 
  enum {
  	BPF_F_KPROBE_MULTI_RETURN = (1U << 0)
  };
++<<<<<<< HEAD
 +
 +/* link_create.uprobe_multi.flags used in LINK_CREATE command for
 + * BPF_TRACE_UPROBE_MULTI attach type to create return probe.
 + */
 +enum {
 +	BPF_F_UPROBE_MULTI_RETURN = (1U << 0)
 +};
++=======
++>>>>>>> bpf: Switch BPF_F_KPROBE_MULTI_RETURN macro to enum
  
  /* link_create.netfilter.flags used in LINK_CREATE command for
   * BPF_PROG_TYPE_NETFILTER to enable IP packet defragmentation.
diff --cc tools/include/uapi/linux/bpf.h
index 8790b3962e4b,a4e55e5e84a7..000000000000
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@@ -1191,13 -1189,6 +1191,16 @@@ enum bpf_perf_event_type 
  enum {
  	BPF_F_KPROBE_MULTI_RETURN = (1U << 0)
  };
++<<<<<<< HEAD
 +
 +/* link_create.uprobe_multi.flags used in LINK_CREATE command for
 + * BPF_TRACE_UPROBE_MULTI attach type to create return probe.
 + */
 +enum {
 +	BPF_F_UPROBE_MULTI_RETURN = (1U << 0)
 +};
++=======
++>>>>>>> bpf: Switch BPF_F_KPROBE_MULTI_RETURN macro to enum
  
  /* link_create.netfilter.flags used in LINK_CREATE command for
   * BPF_PROG_TYPE_NETFILTER to enable IP packet defragmentation.

@kernel-patches-daemon-bpf
Copy link
Author

At least one diff in series https://patchwork.kernel.org/project/netdevbpf/list/?series=774433 irrelevant now. Closing PR.

@kernel-patches-daemon-bpf kernel-patches-daemon-bpf bot deleted the series/742796=>bpf-next branch August 21, 2023 23:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
accepted bpf-next V1
Projects
None yet
Milestone
No milestone
1 participant
@olsajiri