perf trace augmented_syscalls: Augment connect's 'sockaddr' arg
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: d5a7e6613b00d46a4971e8b69e18e2cfd7b00df3 Gitweb: https://git.kernel.org/tip/d5a7e6613b00d46a4971e8b69e18e2cfd7b00df3 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Tue, 28 Aug 2018 16:24:44 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 30 Aug 2018 15:52:20 -0300
perf trace augmented_syscalls: Augment connect's 'sockaddr' arg
As the first example of augmenting something other than a 'filename', augment the 'struct sockaddr' argument for the 'connect' syscall:
# perf trace -e tools/perf/examples/bpf/augmented_syscalls.c ssh -6 fedorapeople.org
0.000 ssh/29669 connect(fd: 3, uservaddr: { .family: LOCAL, path: /var/run/nscd/socket }, addrlen: 110)
0.042 ssh/29669 connect(fd: 3, uservaddr: { .family: LOCAL, path: /var/run/nscd/socket }, addrlen: 110)
1.329 ssh/29669 connect(fd: 3, uservaddr: { .family: LOCAL, path: /var/run/nscd/socket }, addrlen: 110)
1.362 ssh/29669 connect(fd: 3, uservaddr: { .family: LOCAL, path: /var/run/nscd/socket }, addrlen: 110)
1.458 ssh/29669 connect(fd: 3, uservaddr: { .family: LOCAL, path: /var/run/nscd/socket }, addrlen: 110)
1.478 ssh/29669 connect(fd: 3, uservaddr: { .family: LOCAL, path: /var/run/nscd/socket }, addrlen: 110)
1.683 ssh/29669 connect(fd: 3<socket:[125942]>, uservaddr: { .family: INET, port: 53, addr: 192.168.43.1 }, addrlen: 16)
4.710 ssh/29669 connect(fd: 3<socket:[125942]>, uservaddr: { .family: INET6, port: 22, addr: 2610:28:3090:3001:5054:ff:fea7:9474 }, addrlen: 28)
[email protected]: Permission denied (publickey).
#This is still just augmenting the syscalls:sys_enter_connect part, later we'll wire this up to augment the enter+exit combo, like in the tradicional 'perf trace' and 'strace' outputs.
Cc Adrian Hunter <[email protected]>
Cc David Ahern <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Wang Nan <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-trace.c | 12 +----- tools/perf/examples/bpf/augmented_syscalls.c | 34 +++++++++++++++- tools/perf/trace/beauty/Build | 1 + tools/perf/trace/beauty/beauty.h | 5 +++ tools/perf/trace/beauty/sockaddr.c | 58 ++++++++++++++++++++++++++++ 5 files changed, 99 insertions(+), 11 deletions(-)
tools/perf/builtin-trace.c +2 -10
@@ -498,16 +498,6 @@ static const char *clockid[] = { };static DEFINE_STRARRAY (clockid); -static const char *socket_families[] = { -"UNSPEC" ,"LOCAL" ,"INET" ,"AX25" ,"IPX" ,"APPLETALK" ,"NETROM" , -"BRIDGE" ,"ATMPVC" ,"X25" ,"INET6" ,"ROSE" ,"DECnet" ,"NETBEUI" , -"SECURITY" ,"KEY" ,"NETLINK" ,"PACKET" ,"ASH" ,"ECONET" ,"ATMSVC" , -"RDS" ,"SNA" ,"IRDA" ,"PPPOX" ,"WANPIPE" ,"LLC" ,"IB" ,"CAN" ,"TIPC" , -"BLUETOOTH" ,"IUCV" ,"RXRPC" ,"ISDN" ,"PHONET" ,"IEEE802154" ,"CAIF" , -"ALG" ,"NFC" ,"VSOCK" , -}; -static DEFINE_STRARRAY (socket_families); -static size_t syscall_arg__scnprintf_access_mode (char *bf,size_t size,struct syscall_arg *arg) {
@@ -645,6 +635,8 @@ static struct syscall_fmt { [4] = { .name = "tls", .scnprintf = SCA_HEX, }, }, }, { .name = "close", .arg = { [0] = { .scnprintf = SCA_CLOSE_FD, /* fd */ }, }, }, + { .name = "connect", + .arg = { [1] = { .scnprintf = SCA_SOCKADDR, /* servaddr */ }, }, }, { .name = "epoll_ctl", .arg = { [1] = STRARRAY(op, epoll_ctl_ops), }, }, { .name = "eventfd2",
tools/perf/examples/bpf/augmented_syscalls.c +33 -1
@@ -19,6 +19,7 @@*/ #include <stdio.h> +#include <linux/socket.h> struct bpf_map SEC("maps") __augmented_syscalls__ = { .type = BPF_MAP_TYPE_PERF_EVENT_ARRAY,
@@ -33,7 +34,7 @@ struct augmented_filename {char value[256 ]; }; -#define augmented_filename_syscall_enter (syscall) \ +#define augmented_filename_syscall_enter (syscall) \ struct augmented_enter_##syscall##_args { \ struct syscall_enter_##syscall##_args args; \ struct augmented_filename filename; \
@@ -94,4 +95,35 @@ struct syscall_enter_newstat_args {augmented_filename_syscall_enter (newstat); +struct sockaddr ; + +struct syscall_enter_connect_args { +unsigned long long common_tp_fields; +long syscall_nr; +long fd; +struct sockaddr *addr_ptr; +unsigned long addrlen; +}; + +struct augmented_enter_connect_args { +struct syscall_enter_connect_args args; +struct sockaddr_storage addr; +}; + +int syscall_enter (connect )(struct syscall_enter_connect_args *args) +{ +struct augmented_enter_connect_args augmented_args; +unsigned long addrlen =sizeof (augmented_args.addr); + +probe_read (&augmented_args.args,sizeof (augmented_args.args), args); +#ifdef FIXME_CLANG_OPTIMIZATION_THAT_ACCESSES_USER_CONTROLLED_ADDRLEN_DESPITE_THIS_CHECK +if (addrlen > augmented_args.args.addrlen) + addrlen = augmented_args.args.addrlen; +#endif +probe_read (&augmented_args.addr, addrlen, args->addr_ptr); +perf_event_output (args, &__augmented_syscalls__,BPF_F_CURRENT_CPU , &augmented_args, +sizeof (augmented_args) -sizeof (augmented_args.addr) + addrlen); +return 0 ; +} +license (GPL );
tools/perf/trace/beauty/Build +1 -0
@@ -7,5 +7,6 @@ endif libperf-y += kcmp.o libperf-y += pkey_alloc.o libperf-y += prctl.o +libperf-y += sockaddr.o libperf-y += socket.o libperf-y += statx.o
tools/perf/trace/beauty/beauty.h +5 -0
@@ -30,6 +30,8 @@ struct thread;size_t pid__scnprintf_fd (struct trace *trace,pid_t pid,int fd,char *bf,size_t size); +extern struct strarray strarray__socket_families; +/** * augmented_arg: extra payload for syscall pointer arguments
@@ -135,6 +137,9 @@ size_t syscall_arg__scnprintf_prctl_arg2(char *bf, size_t size, struct syscall_asize_t syscall_arg__scnprintf_prctl_arg3 (char *bf,size_t size,struct syscall_arg *arg);#define SCA_PRCTL_ARG3 syscall_arg__scnprintf_prctl_arg3 +size_t syscall_arg__scnprintf_sockaddr (char *bf,size_t size,struct syscall_arg *arg); +#define SCA_SOCKADDR syscall_arg__scnprintf_sockaddr +size_t syscall_arg__scnprintf_socket_protocol (char *bf,size_t size,struct syscall_arg *arg);#define SCA_SK_PROTO syscall_arg__scnprintf_socket_protocol
tools/perf/trace/beauty/sockaddr.c new file +58 -0
58 lines not on this page · raw message