| Message ID | 20241006195131.563006-2-wudevelops@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [bpf,v5,1/2] bpf: fix unpopulated name_len field in perf_event link info | expand |
On Mon, Oct 7, 2024 at 3:51 AM tyrone-wu <wudevelops@gmail.com> wrote: > > Fix `name_len` field assertions in `bpf_link_info.perf_event` for > kprobe/uprobe/tracepoint to validate correct name size instead of 0. > > Link: https://lore.kernel.org/bpf/CABVU1kXwQXhqQGe0RTrr7eegtM6SVW_KayZBy16-yb0Snztmtg@mail.gmail.com/ > Fixes: 23cf7aa539dc ("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> > --- > V4 -> V5: no change > > V3 -> V4: > Link: https://lore.kernel.org/bpf/Zv_PP6Gs5cq3W2Ey@krava/ > - Split patch into separate kernel and selftest change > > tools/testing/selftests/bpf/prog_tests/fill_link_info.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tools/testing/selftests/bpf/prog_tests/fill_link_info.c b/tools/testing/selftests/bpf/prog_tests/fill_link_info.c > index f3932941bbaa..59077f260404 100644 > --- a/tools/testing/selftests/bpf/prog_tests/fill_link_info.c > +++ b/tools/testing/selftests/bpf/prog_tests/fill_link_info.c > @@ -67,8 +67,8 @@ static int verify_perf_link_info(int fd, enum bpf_perf_event_type type, long add > > ASSERT_EQ(info.perf_event.kprobe.cookie, PERF_EVENT_COOKIE, "kprobe_cookie"); > > + ASSERT_EQ(info.perf_event.kprobe.name_len, strlen(KPROBE_FUNC) + 1, "name_len"); > if (!info.perf_event.kprobe.func_name) { > - ASSERT_EQ(info.perf_event.kprobe.name_len, 0, "name_len"); > info.perf_event.kprobe.func_name = ptr_to_u64(&buf); > info.perf_event.kprobe.name_len = sizeof(buf); > goto again; > @@ -79,8 +79,8 @@ static int verify_perf_link_info(int fd, enum bpf_perf_event_type type, long add > ASSERT_EQ(err, 0, "cmp_kprobe_func_name"); > break; > case BPF_PERF_EVENT_TRACEPOINT: > + ASSERT_EQ(info.perf_event.tracepoint.name_len, strlen(TP_NAME) + 1, "name_len"); > if (!info.perf_event.tracepoint.tp_name) { > - ASSERT_EQ(info.perf_event.tracepoint.name_len, 0, "name_len"); > info.perf_event.tracepoint.tp_name = ptr_to_u64(&buf); > info.perf_event.tracepoint.name_len = sizeof(buf); > goto again; > @@ -96,8 +96,8 @@ static int verify_perf_link_info(int fd, enum bpf_perf_event_type type, long add > case BPF_PERF_EVENT_URETPROBE: > ASSERT_EQ(info.perf_event.uprobe.offset, offset, "uprobe_offset"); > > + ASSERT_EQ(info.perf_event.uprobe.name_len, strlen(UPROBE_FILE) + 1, "name_len"); > if (!info.perf_event.uprobe.file_name) { > - ASSERT_EQ(info.perf_event.uprobe.name_len, 0, "name_len"); > info.perf_event.uprobe.file_name = ptr_to_u64(&buf); > info.perf_event.uprobe.name_len = sizeof(buf); > goto again; > -- > 2.43.0 >
diff --git a/tools/testing/selftests/bpf/prog_tests/fill_link_info.c b/tools/testing/selftests/bpf/prog_tests/fill_link_info.c index f3932941bbaa..59077f260404 100644 --- a/tools/testing/selftests/bpf/prog_tests/fill_link_info.c +++ b/tools/testing/selftests/bpf/prog_tests/fill_link_info.c @@ -67,8 +67,8 @@ static int verify_perf_link_info(int fd, enum bpf_perf_event_type type, long add ASSERT_EQ(info.perf_event.kprobe.cookie, PERF_EVENT_COOKIE, "kprobe_cookie"); + ASSERT_EQ(info.perf_event.kprobe.name_len, strlen(KPROBE_FUNC) + 1, "name_len"); if (!info.perf_event.kprobe.func_name) { - ASSERT_EQ(info.perf_event.kprobe.name_len, 0, "name_len"); info.perf_event.kprobe.func_name = ptr_to_u64(&buf); info.perf_event.kprobe.name_len = sizeof(buf); goto again; @@ -79,8 +79,8 @@ static int verify_perf_link_info(int fd, enum bpf_perf_event_type type, long add ASSERT_EQ(err, 0, "cmp_kprobe_func_name"); break; case BPF_PERF_EVENT_TRACEPOINT: + ASSERT_EQ(info.perf_event.tracepoint.name_len, strlen(TP_NAME) + 1, "name_len"); if (!info.perf_event.tracepoint.tp_name) { - ASSERT_EQ(info.perf_event.tracepoint.name_len, 0, "name_len"); info.perf_event.tracepoint.tp_name = ptr_to_u64(&buf); info.perf_event.tracepoint.name_len = sizeof(buf); goto again; @@ -96,8 +96,8 @@ static int verify_perf_link_info(int fd, enum bpf_perf_event_type type, long add case BPF_PERF_EVENT_URETPROBE: ASSERT_EQ(info.perf_event.uprobe.offset, offset, "uprobe_offset"); + ASSERT_EQ(info.perf_event.uprobe.name_len, strlen(UPROBE_FILE) + 1, "name_len"); if (!info.perf_event.uprobe.file_name) { - ASSERT_EQ(info.perf_event.uprobe.name_len, 0, "name_len"); info.perf_event.uprobe.file_name = ptr_to_u64(&buf); info.perf_event.uprobe.name_len = sizeof(buf); goto again;
Fix `name_len` field assertions in `bpf_link_info.perf_event` for kprobe/uprobe/tracepoint to validate correct name size instead of 0. Link: https://lore.kernel.org/bpf/CABVU1kXwQXhqQGe0RTrr7eegtM6SVW_KayZBy16-yb0Snztmtg@mail.gmail.com/ Fixes: 23cf7aa539dc ("selftests/bpf: Add selftest for fill_link_info") Signed-off-by: tyrone-wu <wudevelops@gmail.com> Acked-by: Jiri Olsa <jolsa@kernel.org> --- V4 -> V5: no change V3 -> V4: Link: https://lore.kernel.org/bpf/Zv_PP6Gs5cq3W2Ey@krava/ - Split patch into separate kernel and selftest change tools/testing/selftests/bpf/prog_tests/fill_link_info.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)