Re: [PATCH perf/core 12/22] selftests/bpf: Reorg the uprobe_syscall test function

Andrii Nakryiko
2025-04-23T17:34:35Z

On Mon, Apr 21, 2025 at 2:46 PM Jiri Olsa <jolsa@kernel.org> wrote:
>
> Adding __test_uprobe_syscall with non x86_64 stub to execute all the tests,
> so we don't need to keep adding non x86_64 stub functions for new tests.
>
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> .../selftests/bpf/prog_tests/uprobe_syscall.c | 34 +++++++------------
> 1 file changed, 12 insertions(+), 22 deletions(-)
>

Acked-by: Andrii Nakryiko <andrii@kernel.org>

> diff --git a/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c b/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c
> index c397336fe1ed..2b00f16406c8 100644
> --- a/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c
> +++ b/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c
> @@ -350,29 +350,8 @@ static void test_uretprobe_shadow_stack(void)
>
> ARCH_PRCTL(ARCH_SHSTK_DISABLE, ARCH_SHSTK_SHSTK);
> }
> -#else
> -static void test_uretprobe_regs_equal(void)
> -{
> - test__skip();
> -}
> -
> -static void test_uretprobe_regs_change(void)
> -{
> - test__skip();
> -}
> -
> -static void test_uretprobe_syscall_call(void)
> -{
> - test__skip();
> -}
>
> -static void test_uretprobe_shadow_stack(void)
> -{
> - test__skip();
> -}
> -#endif
> -
> -void test_uprobe_syscall(void)
> +static void __test_uprobe_syscall(void)
> {
> if (test__start_subtest("uretprobe_regs_equal"))
> test_uretprobe_regs_equal();
> @@ -383,3 +362,14 @@ void test_uprobe_syscall(void)
> if (test__start_subtest("uretprobe_shadow_stack"))
> test_uretprobe_shadow_stack();
> }
> +#else
> +static void __test_uprobe_syscall(void)
> +{
> + test__skip();
> +}
> +#endif
> +
> +void test_uprobe_syscall(void)
> +{
> + __test_uprobe_syscall();
> +}
> --
> 2.49.0
>