Skip to content

bpf: Add link_info support for uprobe multi link #657

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
Open
danielocfb wants to merge 6 commits into
base: bpf-next_base
Choose a base branch
from
Open

bpf: Add link_info support for uprobe multi link #657

danielocfb wants to merge 6 commits into from

Conversation

@danielocfb
Copy link
Owner

@danielocfb danielocfb commented Nov 9, 2023

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

@danielocfb
Copy link
Owner Author

danielocfb commented Nov 9, 2023

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

@danielocfb
Copy link
Owner Author

danielocfb commented Nov 9, 2023

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

@danielocfb danielocfb force-pushed the series/796571=>bpf-next branch from 6ec6e49 to 30160f4 Compare November 9, 2023 17:57
@danielocfb danielocfb force-pushed the bpf-next_base branch 2 times, most recently from 902178a to bc1b833 Compare November 9, 2023 18:41
@danielocfb
Copy link
Owner Author

danielocfb commented Nov 9, 2023

Upstream branch: 3815f89
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=799882
version: 1

@danielocfb danielocfb force-pushed the series/796571=>bpf-next branch from 30160f4 to 0bba472 Compare November 9, 2023 18:41
@danielocfb
Copy link
Owner Author

danielocfb commented Nov 9, 2023

Upstream branch: 3815f89
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=799882
version: 1

@danielocfb danielocfb force-pushed the series/796571=>bpf-next branch from 0bba472 to 202b850 Compare November 9, 2023 18:49
@danielocfb
Copy link
Owner Author

danielocfb commented Nov 9, 2023

Upstream branch: 6f101db
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=799882
version: 1

@danielocfb danielocfb force-pushed the series/796571=>bpf-next branch from 202b850 to 207907f Compare November 9, 2023 19:02
@danielocfb
Copy link
Owner Author

danielocfb commented Nov 9, 2023

Upstream branch: 6f101db
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=799882
version: 1

@danielocfb danielocfb force-pushed the series/796571=>bpf-next branch from 207907f to bdb891b Compare November 9, 2023 19:12
@danielocfb
Copy link
Owner Author

danielocfb commented Nov 9, 2023

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

@danielocfb danielocfb force-pushed the series/796571=>bpf-next branch from bdb891b to 53cffee Compare November 9, 2023 19:20
@danielocfb
Copy link
Owner Author

danielocfb commented Nov 9, 2023

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

@danielocfb danielocfb force-pushed the series/796571=>bpf-next branch from 53cffee to d9db658 Compare November 9, 2023 20:36
@danielocfb
Copy link
Owner Author

danielocfb commented Nov 9, 2023

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

@danielocfb danielocfb force-pushed the series/796571=>bpf-next branch from d9db658 to 4c5a3e3 Compare November 9, 2023 21:00
@danielocfb
Copy link
Owner Author

danielocfb commented Nov 9, 2023

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

@danielocfb danielocfb force-pushed the series/796571=>bpf-next branch from 4c5a3e3 to f4bd31b Compare November 9, 2023 21:15
@danielocfb
Copy link
Owner Author

danielocfb commented Nov 10, 2023

Upstream branch: 155addf
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=799882
version: 1

@danielocfb danielocfb force-pushed the series/796571=>bpf-next branch from f4bd31b to e02efad Compare November 10, 2023 04:47
@danielocfb
Copy link
Owner Author

danielocfb commented Nov 10, 2023

Upstream branch: 689b097
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=799882
version: 1

@danielocfb danielocfb force-pushed the series/796571=>bpf-next branch from e02efad to 8fb821c Compare November 10, 2023 15:59
@olsajiri @d-e-s-o
libbpf: Add st_type argument to elf_resolve_syms_offsets function
8045e79 
We need to get offsets for static variables in following changes,
so making elf_resolve_syms_offsets to take st_type value as argument
and passing it to elf_sym_iter_new.

Acked-by: Song Liu <[email protected]>
Signed-off-by: Jiri Olsa <[email protected]>
Acked-by: Andrii Nakryiko <[email protected]>
@olsajiri @d-e-s-o
bpf: Store ref_ctr_offsets values in bpf_uprobe array
848617b 
We will need to return ref_ctr_offsets values through link_info
interface in following change, so we need to keep them around.

Storing ref_ctr_offsets values directly into bpf_uprobe array.

Acked-by: Song Liu <[email protected]>
Signed-off-by: Jiri Olsa <[email protected]>
Acked-by: Andrii Nakryiko <[email protected]>
@olsajiri @d-e-s-o
bpf: Add link_info support for uprobe multi link
7918c07 
Adding support to get uprobe_link details through bpf_link_info
interface.

Adding new struct uprobe_multi to struct bpf_link_info to carry
the uprobe_multi link details.

The uprobe_multi.count is passed from user space to denote size
of array fields (offsets/ref_ctr_offsets/cookies). The actual
array size is stored back to uprobe_multi.count (allowing user
to find out the actual array size) and array fields are populated
up to the user passed size.

All the non-array fields (path/count/flags/pid) are always set.

Signed-off-by: Jiri Olsa <[email protected]>
@olsajiri @d-e-s-o
selftests/bpf: Use bpf_link__destroy in fill_link_info tests
c23ebff 
The fill_link_info test keeps skeleton open and just creates
various links. We are wrongly calling bpf_link__detach after
each test to close them, we need to call bpf_link__destroy.

Signed-off-by: Jiri Olsa <[email protected]>
Acked-by: Yafang Shao <[email protected]>
@olsajiri @d-e-s-o
selftests/bpf: Add link_info test for uprobe_multi link
6d80057 
Adding fill_link_info test for uprobe_multi link.

Setting up uprobes with bogus ref_ctr_offsets and cookie values
to test all the bpf_link_info::uprobe_multi fields.

Acked-by: Song Liu <[email protected]>
Signed-off-by: Jiri Olsa <[email protected]>
@danielocfb
Copy link
Owner Author

danielocfb commented Nov 10, 2023

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

@olsajiri @d-e-s-o
bpftool: Add support to display uprobe_multi links
6fbda3d 
Adding support to display details for uprobe_multi links,
both plain:

  # bpftool link -p
  ...
  24: uprobe_multi  prog 126
          uprobe.multi  path /home/jolsa/bpf/test_progs  func_cnt 3  pid 4143
          offset             ref_ctr_offset     cookies
          0xd1f88            0xf5d5a8           0xdead
          0xd1f8f            0xf5d5aa           0xbeef
          0xd1f96            0xf5d5ac           0xcafe

and json:

  # bpftool link -p
  [{
  ...
      },{
          "id": 24,
          "type": "uprobe_multi",
          "prog_id": 126,
          "retprobe": false,
          "path": "/home/jolsa/bpf/test_progs",
          "func_cnt": 3,
          "pid": 4143,
          "funcs": [{
                  "offset": 860040,
                  "ref_ctr_offset": 16111016,
                  "cookie": 57005
              },{
                  "offset": 860047,
                  "ref_ctr_offset": 16111018,
                  "cookie": 48879
              },{
                  "offset": 860054,
                  "ref_ctr_offset": 16111020,
                  "cookie": 51966
              }
          ]
      }
  ]

Acked-by: Song Liu <[email protected]>
Reviewed-by: Quentin Monnet <[email protected]>
Signed-off-by: Jiri Olsa <[email protected]>
@danielocfb danielocfb force-pushed the series/796571=>bpf-next branch from 8fb821c to 6fbda3d Compare November 10, 2023 17:08
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

bpf-next new V1-ci-fail V1

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@danielocfb @olsajiri