Hi Shuah,
Can you pick this? I confirmed this can be applied on v6.11-rc3.
On Thu, 13 Jun 2024 07:12:10 +0900
"Masami Hiramatsu (Google)" <mhiramat@xxxxxxxxxx> wrote:
> From: Masami Hiramatsu (Google) <mhiramat@xxxxxxxxxx>
>
> kprobe_args_{char,string}.tc are using available_filter_functions file
> which is provided by function tracer. Thus if function tracer is disabled,
> these tests are failed on recent kernels because tracefs_create_dir is
> not raised events by adding a dynamic event.
> Add available_filter_functions to requires line.
>
> Fixes: 7c1130ea5cae ("test: ftrace: Fix kprobe test for eventfs")
> Signed-off-by: Masami Hiramatsu (Google) <mhiramat@xxxxxxxxxx>
> ---
> .../ftrace/test.d/kprobe/kprobe_args_char.tc | 2 +-
> .../ftrace/test.d/kprobe/kprobe_args_string.tc | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_char.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_char.tc
> index e21c9c27ece4..77f4c07cdcb8 100644
> --- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_char.tc
> +++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_char.tc
> @@ -1,7 +1,7 @@
> #!/bin/sh
> # SPDX-License-Identifier: GPL-2.0
> # description: Kprobe event char type argument
> -# requires: kprobe_events
> +# requires: kprobe_events available_filter_functions
>
> case `uname -m` in
> x86_64)
> diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_string.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_string.tc
> index 93217d459556..39001073f7ed 100644
> --- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_string.tc
> +++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_string.tc
> @@ -1,7 +1,7 @@
> #!/bin/sh
> # SPDX-License-Identifier: GPL-2.0
> # description: Kprobe event string type argument
> -# requires: kprobe_events
> +# requires: kprobe_events available_filter_functions
>
> case `uname -m` in
> x86_64)
>
>
--
Masami Hiramatsu (Google) <mhiramat@xxxxxxxxxx>
