Skip to contentSkip to conversation

bpf: Fix fill_link_info and add selftest

PATCH Applied Yafang Shao 2 participants 4 messages Aug 13, 2023 – Aug 16, 2023

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

v6 cover bpf: Fix fill_link_info and add selftest

Patch #1: Fix an error in fill_link_info reported by Dan Patch #2: Add selftest for #1

v5->v6:
- Fix BPF CI failure on aarch64

v4->v5:
- Comments from Yonghong
- Replace 'offset' with '0'
- Set err=-1 for default case
- Only check return value of verify_kmulti_link_info
- Comments from Jiri
- Avoid retprobe argument
- Use bpf_fentry_test* instead
- Rename verify_kmulti_user_buffer
- Define some variables as global value to simplify the code

v3->v4:
- Comments from Yonghong
- re-word the kptr comment
- Avoid unnecessary switch statement
- No need to check the return value of bpf_link__fd()
- offset is always 0
- Return directly when test_fill_link_info__open_and_load() fails
- Cleanup skel when load_kallsyms_refresh() fails

v2->v3:
- Comments from Jiri
- Verify wrong arguments as soon as possible
- Use CONFIG_X86_KERNEL_IBT
- No need to make the test serial
- Add test case for kprobe_multi

v1->v2:
- Fix BPF CI failure due to the enabled ENDBDR

Yafang Shao (2):
bpf: Fix uninitialized symbol in bpf_perf_link_fill_kprobe() selftests/bpf: Add selftest for fill_link_info

 kernel/bpf/syscall.c                               |   4 +-
 tools/testing/selftests/bpf/DENYLIST.aarch64       |   3 +
 .../selftests/bpf/prog_tests/fill_link_info.c      | 342 +++++++++++++++++++++
 .../selftests/bpf/progs/test_fill_link_info.c      |  42 +++
 4 files changed, 389 insertions(+), 2 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/prog_tests/fill_link_info.c
 create mode 100644 tools/testing/selftests/bpf/progs/test_fill_link_info.c
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH v6 1/2 bpf: Fix uninitialized symbol in bpf_perf_link_fill_kprobe()

The patch 1b715e1b0ec5: "bpf: Support ->fill_link_info for perf_event" from Jul 9, 2023, leads to the following Smatch static checker warning:

kernel/bpf/syscall.c:3416 bpf_perf_link_fill_kprobe()
error: uninitialized symbol 'type'.

That can happens when uname is NULL. So fix it by verifying the uname when we really need to fill it.

---
 kernel/bpf/syscall.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/bpf/syscall.c +2 -2
index 7f4e8c3..166390f 100644
@@ -3378,14 +3378,14 @@ static int bpf_perf_link_fill_common(const struct perf_event *event,
 
 	if (!ulen ^ !uname)
 		return -EINVAL;
-	if (!uname)
-		return 0;
 
 	err = bpf_get_perf_event_info(event, &prog_id, fd_type, &buf,
 				      probe_offset, probe_addr);
 	if (err)
 		return err;
 
+	if (!uname)
+		return 0;
 	if (buf) {
 		len = strlen(buf);
 		err = bpf_copy_to_user(uname, buf, ulen, len);
Signature · 1 line
1.8.3.1
#2 lore raw

PATCH v6 2/2 selftests/bpf: Add selftest for fill_link_info

In reply to Yafang Shao

Add selftest for the fill_link_info of uprobe, kprobe and tracepoint. The result:

  $ tools/testing/selftests/bpf/test_progs --name=fill_link_info
  #79/1    fill_link_info/kprobe_link_info:OK
  #79/2    fill_link_info/kretprobe_link_info:OK
  #79/3    fill_link_info/kprobe_invalid_ubuff:OK
  #79/4    fill_link_info/tracepoint_link_info:OK
  #79/5    fill_link_info/uprobe_link_info:OK
  #79/6    fill_link_info/uretprobe_link_info:OK
  #79/7    fill_link_info/kprobe_multi_link_info:OK
  #79/8    fill_link_info/kretprobe_multi_link_info:OK
  #79/9    fill_link_info/kprobe_multi_invalid_ubuff:OK
  #79      fill_link_info:OK
  Summary: 1/9 PASSED, 0 SKIPPED, 0 FAILED

The test case for kprobe_multi won't be run on aarch64, as it is not supported.

---
 tools/testing/selftests/bpf/DENYLIST.aarch64       |   3 +
 .../selftests/bpf/prog_tests/fill_link_info.c      | 342 +++++++++++++++++++++
 .../selftests/bpf/progs/test_fill_link_info.c      |  42 +++
 3 files changed, 387 insertions(+)
 create mode 100644 tools/testing/selftests/bpf/prog_tests/fill_link_info.c
 create mode 100644 tools/testing/selftests/bpf/progs/test_fill_link_info.c
tools/testing/selftests/bpf/DENYLIST.aarch64 +3 -0
index 3b61e8b..7f768d3 100644
@@ -12,3 +12,6 @@ kprobe_multi_test/skel_api                       # libbpf: failed to load BPF sk
 module_attach                                    # prog 'kprobe_multi': failed to auto-attach: -95
 fentry_test/fentry_many_args                     # fentry_many_args:FAIL:fentry_many_args_attach unexpected error: -524
 fexit_test/fexit_many_args                       # fexit_many_args:FAIL:fexit_many_args_attach unexpected error: -524
+fill_link_info/kprobe_multi_link_info            # bpf_program__attach_kprobe_multi_opts unexpected error: -95
+fill_link_info/kretprobe_multi_link_info         # bpf_program__attach_kprobe_multi_opts unexpected error: -95
+fill_link_info/kprobe_multi_invalid_ubuff        # bpf_program__attach_kprobe_multi_opts unexpected error: -95
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +342 -0

342 lines not on this page · raw message

tools/testing/selftests/bpf/progs/test_fill_link_info.c new file +42 -0

42 lines not on this page · raw message

Signature · 1 line
1.8.3.1
#3 lore raw
In reply to Yafang Shao
This series was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:

Hello:

This series was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:

Quoted 17 lines · On Sun, 13 Aug 2023 14:18:58 +0000 you wrote:

Patch #1: Fix an error in fill_link_info reported by Dan Patch #2: Add selftest for #1

v5->v6:
- Fix BPF CI failure on aarch64

v4->v5:
- Comments from Yonghong
- Replace 'offset' with '0'
- Set err=-1 for default case
- Only check return value of verify_kmulti_link_info
- Comments from Jiri
- Avoid retprobe argument
- Use bpf_fentry_test* instead
- Rename verify_kmulti_user_buffer
- Define some variables as global value to simplify the code

Quoted 1 line

[...]

Here is the summary with links:
- [v6,bpf-next,1/2] bpf: Fix uninitialized symbol in bpf_perf_link_fill_kprobe()

    https://git.kernel.org/bpf/bpf-next/c/0aa35162d2a1
  - [v6,bpf-next,2/2] selftests/bpf: Add selftest for fill_link_info
    https://git.kernel.org/bpf/bpf-next/c/23cf7aa539dc

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html