Commit f3cf7fa9 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf trace beauty: Use the autogenerated protocol family table 



That helps us not to lose new protocol families when they are
introduced, replacing that hardcoded, dated family->string table.

To recap what this allows us to do:

  # perf trace -e syscalls:sys_enter_socket/max-stack=10/ --filter=family==INET --max-events=1
     0.000 fetchmail/41097 syscalls:sys_enter_socket(family: INET, type: DGRAM|CLOEXEC|NONBLOCK, protocol: IP)
                                       __GI___socket (inlined)
                                       reopen (/usr/lib64/libresolv-2.31.so)
                                       send_dg (/usr/lib64/libresolv-2.31.so)
                                       __res_context_send (/usr/lib64/libresolv-2.31.so)
                                       __GI___res_context_query (inlined)
                                       __GI___res_context_search (inlined)
                                       _nss_dns_gethostbyname4_r (/usr/lib64/libnss_dns-2.31.so)
                                       gaih_inet.constprop.0 (/usr/lib64/libc-2.31.so)
                                       __GI_getaddrinfo (inlined)
                                       [0x15cb2] (/usr/bin/fetchmail)
  #

More work is still needed to allow for the more natura strace-like
syscall name usage instead of the trace event name:

  # perf trace -e socket/max-stack=10,family==INET/ --max-events=1

I.e. to allow for modifiers to follow the syscall name and for logical
expressions to be accepted as filters to use with that syscall, be it as
trace event filters or BPF based ones.

Using -v we can see how the trace event filter is built:

  # perf trace -v -e syscalls:sys_enter_socket/call-graph=dwarf/ --filter=family==INET --max-events=2
  <SNIP>
  New filter for syscalls:sys_enter_socket: (family==0x2) && (common_pid != 41384 && common_pid != 2836)
  <SNIP>

  $ tools/perf/trace/beauty/socket.sh | grep -w 2
	[2] = "INET",
  $

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 58277f50

tools/perf/Makefile.perf

+9 −0
Original line number Diff line number Diff line
@@ -418,6 +418,7 @@ export INSTALL SHELL_PATH 


SHELL = $(SHELL_PATH)



beauty_linux_dir := $(srctree)/tools/perf/trace/beauty/include/linux/

linux_uapi_dir := $(srctree)/tools/include/uapi/linux

asm_generic_uapi_dir := $(srctree)/tools/include/uapi/asm-generic

arch_asm_uapi_dir := $(srctree)/tools/arch/$(SRCARCH)/include/uapi/asm/
@@ -501,6 +502,12 @@ socket_ipproto_tbl := $(srctree)/tools/perf/trace/beauty/socket_ipproto.sh 
$(socket_ipproto_array): $(linux_uapi_dir)/in.h $(socket_ipproto_tbl)

	$(Q)$(SHELL) '$(socket_ipproto_tbl)' $(linux_uapi_dir) > $@



socket_arrays := $(beauty_outdir)/socket_arrays.c

socket_tbl := $(srctree)/tools/perf/trace/beauty/socket.sh



$(socket_arrays): $(beauty_linux_dir)/socket.h $(socket_tbl)

	$(Q)$(SHELL) '$(socket_tbl)' $(beauty_linux_dir) > $@



vhost_virtio_ioctl_array := $(beauty_ioctl_outdir)/vhost_virtio_ioctl_array.c

vhost_virtio_hdr_dir := $(srctree)/tools/include/uapi/linux

vhost_virtio_ioctl_tbl := $(srctree)/tools/perf/trace/beauty/vhost_virtio_ioctl.sh
@@ -697,6 +704,7 @@ prepare: $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h archheaders $(drm_ioc 
	$(kcmp_type_array) \

	$(kvm_ioctl_array) \

	$(socket_ipproto_array) \

	$(socket_arrays) \

	$(vhost_virtio_ioctl_array) \

	$(madvise_behavior_array) \

	$(mmap_flags_array) \
@@ -1006,6 +1014,7 @@ clean:: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clea 
		$(OUTPUT)$(kvm_ioctl_array) \

		$(OUTPUT)$(kcmp_type_array) \

		$(OUTPUT)$(socket_ipproto_array) \

		$(OUTPUT)$(socket_arrays) \

		$(OUTPUT)$(vhost_virtio_ioctl_array) \

		$(OUTPUT)$(perf_ioctl_array) \

		$(OUTPUT)$(prctl_option_array) \

tools/perf/check-headers.sh

+3 −0
Original line number Diff line number Diff line
@@ -128,6 +128,9 @@ check arch/x86/lib/insn.c '-I "^#include [\"<]\(../include/\)*asm/in 
# diff non-symmetric files

check_2 tools/perf/arch/x86/entry/syscalls/syscall_64.tbl arch/x86/entry/syscalls/syscall_64.tbl



# These will require a beauty_check when we get some more like that

check_2 tools/perf/trace/beauty/include/linux/socket.h include/linux/socket.h



# check duplicated library files

check_2 tools/perf/util/hashmap.h tools/lib/bpf/hashmap.h

check_2 tools/perf/util/hashmap.c tools/lib/bpf/hashmap.c

tools/perf/trace/beauty/sockaddr.c

+1 −8
Original line number Diff line number Diff line
@@ -7,14 +7,7 @@ 
#include <sys/un.h>

#include <arpa/inet.h>



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",

};

#include "trace/beauty/generated/socket_arrays.c"

DEFINE_STRARRAY(socket_families, "PF_");



static size_t af_inet__scnprintf(struct sockaddr *sa, char *bf, size_t size)