[PATCH][SAUCE][GROOVY] selftests/ftrace: check for do_sys_openat2 in user-memory test

Colin Ian King colin.king at canonical.com
Fri Oct 2 13:28:24 UTC 2020


I just sent this fix upstream, it is the 2nd iteration of a trivial fix.

On 02/10/2020 14:27, Colin King wrote:
> From: Colin Ian King <colin.king at canonical.com>
> 
> More recent libc implementations are now using openat/openat2 system
> calls so also add do_sys_openat2 to the tracing so that the test
> passes on these systems because do_sys_open may not be called.
> 
> Thanks to Masami Hiramatsu for the help on getting this fix to work
> correctly.
> 
> Signed-off-by: Colin Ian King <colin.king at canonical.com>
> ---
> 
> V2: write myevent2 using >> rather than >, also enable and disable
>     myevent2
> ---
>  .../selftests/ftrace/test.d/kprobe/kprobe_args_user.tc        | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_user.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_user.tc
> index a30a9c07290d..d25d01a19778 100644
> --- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_user.tc
> +++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_user.tc
> @@ -9,12 +9,16 @@ grep -A10 "fetcharg:" README | grep -q '\[u\]<offset>' || exit_unsupported
>  :;: "user-memory access syntax and ustring working on user memory";:
>  echo 'p:myevent do_sys_open path=+0($arg2):ustring path2=+u0($arg2):string' \
>  	> kprobe_events
> +echo 'p:myevent2 do_sys_openat2 path=+0($arg2):ustring path2=+u0($arg2):string' \
> +	>> kprobe_events
>  
>  grep myevent kprobe_events | \
>  	grep -q 'path=+0($arg2):ustring path2=+u0($arg2):string'
>  echo 1 > events/kprobes/myevent/enable
> +echo 1 > events/kprobes/myevent2/enable
>  echo > /dev/null
>  echo 0 > events/kprobes/myevent/enable
> +echo 0 > events/kprobes/myevent2/enable
>  
>  grep myevent trace | grep -q 'path="/dev/null" path2="/dev/null"'
>  
> 




More information about the kernel-team mailing list