]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
selftests/bpf: Fix kprobe multi stacktrace_ips test
authorJiri Olsa <jolsa@kernel.org>
Mon, 26 Jan 2026 21:18:34 +0000 (22:18 +0100)
committerAndrii Nakryiko <andrii@kernel.org>
Fri, 30 Jan 2026 21:40:08 +0000 (13:40 -0800)
We now include the attached function in the stack trace,
fixing the test accordingly.

Fixes: c9e208fa93cd ("selftests/bpf: Add stacktrace ips test for kprobe_multi/kretprobe_multi")
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20260126211837.472802-4-jolsa@kernel.org
tools/testing/selftests/bpf/prog_tests/stacktrace_ips.c

index c9efdd2a5b18a5fff8e44b11b3ff4b53313d39c3..c93718dafd9b630349852b30b96a9b271020d2c6 100644 (file)
@@ -74,11 +74,20 @@ static void test_stacktrace_ips_kprobe_multi(bool retprobe)
 
        load_kallsyms();
 
-       check_stacktrace_ips(bpf_map__fd(skel->maps.stackmap), skel->bss->stack_key, 4,
-                            ksym_get_addr("bpf_testmod_stacktrace_test_3"),
-                            ksym_get_addr("bpf_testmod_stacktrace_test_2"),
-                            ksym_get_addr("bpf_testmod_stacktrace_test_1"),
-                            ksym_get_addr("bpf_testmod_test_read"));
+       if (retprobe) {
+               check_stacktrace_ips(bpf_map__fd(skel->maps.stackmap), skel->bss->stack_key, 4,
+                                    ksym_get_addr("bpf_testmod_stacktrace_test_3"),
+                                    ksym_get_addr("bpf_testmod_stacktrace_test_2"),
+                                    ksym_get_addr("bpf_testmod_stacktrace_test_1"),
+                                    ksym_get_addr("bpf_testmod_test_read"));
+       } else {
+               check_stacktrace_ips(bpf_map__fd(skel->maps.stackmap), skel->bss->stack_key, 5,
+                                    ksym_get_addr("bpf_testmod_stacktrace_test"),
+                                    ksym_get_addr("bpf_testmod_stacktrace_test_3"),
+                                    ksym_get_addr("bpf_testmod_stacktrace_test_2"),
+                                    ksym_get_addr("bpf_testmod_stacktrace_test_1"),
+                                    ksym_get_addr("bpf_testmod_test_read"));
+       }
 
 cleanup:
        stacktrace_ips__destroy(skel);