perf augmented_raw_syscalls: Reduce perf_event_output() boilerplate
A message that is not in the archive (sent off-list or not yet received): [email protected]
The following commit has been merged into the perf/core branch of tip:
Commit-ID: e051c2f69850e571cb408b555aaffb00c07dbb05 Gitweb: https://git.kernel.org/tip/e051c2f69850e571cb408b555aaffb00c07dbb05 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Fri, 23 Aug 2019 15:54:02 -03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Mon, 26 Aug 2019 11:58:29 -03:00
perf augmented_raw_syscalls: Reduce perf_event_output() boilerplate
Add a augmented__output() helper to reduce the boilerplate of sending the augmented tracepoint to the PERF_EVENT_ARRAY BPF map associated with the bpf-output event used to communicate with the userspace perf trace tool.
Cc Adrian Hunter <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/examples/bpf/augmented_raw_syscalls.c | 24 +++++++-------- 1 file changed, 12 insertions(+), 12 deletions(-)
tools/perf/examples/bpf/augmented_raw_syscalls.c +12 -12
@@ -87,6 +87,12 @@ static inline struct augmented_args_payload *augmented_args_payload(void)return bpf_map_lookup_elem (&augmented_args_tmp, &key); } +static inline int augmented__output (void *ctx,struct augmented_args_payload *args,int len) +{ +/* If perf_event_output fails, return non-zero so that it gets recorded unaugmented */ +return perf_event_output (ctx, &__augmented_syscalls__,BPF_F_CURRENT_CPU , args, len); +} +static inline unsigned int augmented_arg__read_str (struct augmented_arg *augmented_arg,const void *arg,unsigned int arg_len) {
@@ -142,8 +148,7 @@ int sys_enter_connect(struct syscall_enter_args *args)probe_read (&augmented_args->saddr, socklen, sockaddr_arg); -/* If perf_event_output fails, return non-zero so that it gets recorded unaugmented */ -return perf_event_output (args, &__augmented_syscalls__,BPF_F_CURRENT_CPU , augmented_args, len + socklen); +return augmented__output (args, augmented_args, len + socklen); }SEC ("!syscalls:sys_enter_sendto" )
@@ -162,8 +167,7 @@ int sys_enter_sendto(struct syscall_enter_args *args)probe_read (&augmented_args->saddr, socklen, sockaddr_arg); -/* If perf_event_output fails, return non-zero so that it gets recorded unaugmented */ -return perf_event_output (args, &__augmented_syscalls__,BPF_F_CURRENT_CPU , augmented_args, len + socklen); +return augmented__output (args, augmented_args, len + socklen); }SEC ("!syscalls:sys_enter_open" )
@@ -178,8 +182,7 @@ int sys_enter_open(struct syscall_enter_args *args) len +=augmented_arg__read_str (&augmented_args->arg, filename_arg,sizeof (augmented_args->arg.value)); -/* If perf_event_output fails, return non-zero so that it gets recorded unaugmented */ -return perf_event_output (args, &__augmented_syscalls__,BPF_F_CURRENT_CPU , augmented_args, len); +return augmented__output (args, augmented_args, len); }SEC ("!syscalls:sys_enter_openat" )
@@ -194,8 +197,7 @@ int sys_enter_openat(struct syscall_enter_args *args) len +=augmented_arg__read_str (&augmented_args->arg, filename_arg,sizeof (augmented_args->arg.value)); -/* If perf_event_output fails, return non-zero so that it gets recorded unaugmented */ -return perf_event_output (args, &__augmented_syscalls__,BPF_F_CURRENT_CPU , augmented_args, len); +return augmented__output (args, augmented_args, len); }SEC ("!syscalls:sys_enter_rename" )
@@ -212,8 +214,7 @@ int sys_enter_rename(struct syscall_enter_args *args) oldpath_len =augmented_arg__read_str (&augmented_args->arg, oldpath_arg,sizeof (augmented_args->arg.value)); len += oldpath_len +augmented_arg__read_str ((void *)(&augmented_args->arg) + oldpath_len, newpath_arg,sizeof (augmented_args->arg.value)); -/* If perf_event_output fails, return non-zero so that it gets recorded unaugmented */ -return perf_event_output (args, &__augmented_syscalls__,BPF_F_CURRENT_CPU , augmented_args, len); +return augmented__output (args, augmented_args, len); }SEC ("!syscalls:sys_enter_renameat" )
@@ -230,8 +231,7 @@ int sys_enter_renameat(struct syscall_enter_args *args) oldpath_len =augmented_arg__read_str (&augmented_args->arg, oldpath_arg,sizeof (augmented_args->arg.value)); len += oldpath_len +augmented_arg__read_str ((void *)(&augmented_args->arg) + oldpath_len, newpath_arg,sizeof (augmented_args->arg.value)); -/* If perf_event_output fails, return non-zero so that it gets recorded unaugmented */ -return perf_event_output (args, &__augmented_syscalls__,BPF_F_CURRENT_CPU , augmented_args, len); +return augmented__output (args, augmented_args, len); }SEC ("raw_syscalls:sys_enter" )