Skip to content

Commit 4538a38

Browse files
ver-nyanAlexei Starovoitov
authored andcommitted
selftests/bpf: fix perf_event link info name_len assertion
Fix `name_len` field assertions in `bpf_link_info.perf_event` for kprobe/uprobe/tracepoint to validate correct name size instead of 0. Fixes: 23cf7aa ("selftests/bpf: Add selftest for fill_link_info") Signed-off-by: Tyrone Wu <wudevelops@gmail.com> Acked-by: Jiri Olsa <jolsa@kernel.org> Acked-by: Yafang Shao <laoar.shao@gmail.com> Link: https://lore.kernel.org/r/20241008164312.46269-2-wudevelops@gmail.com Signed-off-by: Alexei Starovoitov <ast@kernel.org>
1 parent 4deecdd commit 4538a38

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,9 @@ static int verify_perf_link_info(int fd, enum bpf_perf_event_type type, long add
6767

6868
ASSERT_EQ(info.perf_event.kprobe.cookie, PERF_EVENT_COOKIE, "kprobe_cookie");
6969

70+
ASSERT_EQ(info.perf_event.kprobe.name_len, strlen(KPROBE_FUNC) + 1,
71+
"name_len");
7072
if (!info.perf_event.kprobe.func_name) {
71-
ASSERT_EQ(info.perf_event.kprobe.name_len, 0, "name_len");
7273
info.perf_event.kprobe.func_name = ptr_to_u64(&buf);
7374
info.perf_event.kprobe.name_len = sizeof(buf);
7475
goto again;
@@ -79,8 +80,9 @@ static int verify_perf_link_info(int fd, enum bpf_perf_event_type type, long add
7980
ASSERT_EQ(err, 0, "cmp_kprobe_func_name");
8081
break;
8182
case BPF_PERF_EVENT_TRACEPOINT:
83+
ASSERT_EQ(info.perf_event.tracepoint.name_len, strlen(TP_NAME) + 1,
84+
"name_len");
8285
if (!info.perf_event.tracepoint.tp_name) {
83-
ASSERT_EQ(info.perf_event.tracepoint.name_len, 0, "name_len");
8486
info.perf_event.tracepoint.tp_name = ptr_to_u64(&buf);
8587
info.perf_event.tracepoint.name_len = sizeof(buf);
8688
goto again;
@@ -96,8 +98,9 @@ static int verify_perf_link_info(int fd, enum bpf_perf_event_type type, long add
9698
case BPF_PERF_EVENT_URETPROBE:
9799
ASSERT_EQ(info.perf_event.uprobe.offset, offset, "uprobe_offset");
98100

101+
ASSERT_EQ(info.perf_event.uprobe.name_len, strlen(UPROBE_FILE) + 1,
102+
"name_len");
99103
if (!info.perf_event.uprobe.file_name) {
100-
ASSERT_EQ(info.perf_event.uprobe.name_len, 0, "name_len");
101104
info.perf_event.uprobe.file_name = ptr_to_u64(&buf);
102105
info.perf_event.uprobe.name_len = sizeof(buf);
103106
goto again;

0 commit comments

Comments
 (0)