Commit 713eee84 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf-tools-2020-08-14' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux 

Pull more perf tools updates from Arnaldo Carvalho de Melo:
 "Fixes:
   - Fixes for 'perf bench numa'.

   - Always memset source before memcpy in 'perf bench mem'.

   - Quote CC and CXX for their arguments to fix build in environments
     using those variables to pass more than just the compiler names.

   - Fix module symbol processing, addressing regression detected via
     "perf test".

   - Allow multiple probes in record+script_probe_vfs_getname.sh 'perf
     test' entry.

  Improvements:
   - Add script to autogenerate socket family name id->string table from
     copy of kernel header, used so far in 'perf trace'.

   - 'perf ftrace' improvements to provide similar options for this
     utility so that one can go from 'perf record', 'perf trace', etc to
     'perf ftrace' just by changing the name of the subcommand.

   - Prefer new "sched:sched_waking" trace event when it exists in 'perf
     sched' post processing.

   - Update POWER9 metrics to utilize other metrics.

   - Fall back to querying debuginfod if debuginfo not found locally.

  Miscellaneous:
   - Sync various kvm headers with kernel sources"

* tag 'perf-tools-2020-08-14' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux: (40 commits)
  perf ftrace: Make option description initials all capital letters
  perf build-ids: Fall back to debuginfod query if debuginfo not found
  perf bench numa: Remove dead code in parse_nodes_opt()
  perf stat: Update POWER9 metrics to utilize other metrics
  perf ftrace: Add change log
  perf: ftrace: Add set_tracing_options() to set all trace options
  perf ftrace: Add option --tid to filter by thread id
  perf ftrace: Add option -D/--delay to delay tracing
  perf: ftrace: Allow set graph depth by '--graph-opts'
  perf ftrace: Add support for trace option tracing_thresh
  perf ftrace: Add option 'verbose' to show more info for graph tracer
  perf ftrace: Add support for tracing option 'irq-info'
  perf ftrace: Add support for trace option funcgraph-irqs
  perf ftrace: Add support for trace option sleep-time
  perf ftrace: Add support for tracing option 'func_stack_trace'
  perf tools: Add general function to parse sublevel options
  perf ftrace: Add option '--inherit' to trace children processes
  perf ftrace: Show trace column header
  perf ftrace: Add option '-m/--buffer-size' to set per-cpu buffer size
  perf ftrace: Factor out function write_tracing_file_int()
  ...
parents 50f6c7db 492e4edb

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -13566,6 +13566,7 @@ F: arch/*/kernel/perf_event*.c 
F:	include/linux/perf_event.h

F:	include/uapi/linux/perf_event.h

F:	kernel/events/*

F:	tools/lib/perf/

F:	tools/perf/









PERFORMANCE EVENTS SUBSYSTEM ARM64 PMU EVENTS
































tools/arch/s390/include/uapi/asm/kvm.h



+5
−2






























Original line number
Diff line number
Diff line







@@ -231,11 +231,13 @@ struct kvm_guest_debug_arch {







#define KVM_SYNC_GSCB   (1UL << 9)









#define KVM_SYNC_BPBC   (1UL << 10)









#define KVM_SYNC_ETOKEN (1UL << 11)









#define KVM_SYNC_DIAG318 (1UL << 12)



















#define KVM_SYNC_S390_VALID_FIELDS \









	(KVM_SYNC_PREFIX | KVM_SYNC_GPRS | KVM_SYNC_ACRS | KVM_SYNC_CRS | \









	 KVM_SYNC_ARCH0 | KVM_SYNC_PFAULT | KVM_SYNC_VRS | KVM_SYNC_RICCB | \









	 KVM_SYNC_FPRS | KVM_SYNC_GSCB | KVM_SYNC_BPBC | KVM_SYNC_ETOKEN)









	 KVM_SYNC_FPRS | KVM_SYNC_GSCB | KVM_SYNC_BPBC | KVM_SYNC_ETOKEN | \









	 KVM_SYNC_DIAG318)



















/* length and alignment of the sdnx as a power of two */









#define SDNXC 8








@@ -264,7 +266,8 @@ struct kvm_sync_regs {







	__u8 reserved2 : 7;









	__u8 padding1[51];	/* riccb needs to be 64byte aligned */









	__u8 riccb[64];		/* runtime instrumentation controls block */









	__u8 padding2[192];	/* sdnx needs to be 256byte aligned */









	__u64 diag318;		/* diagnose 0x318 info */









	__u8 padding2[184];	/* sdnx needs to be 256byte aligned */









	union {









		__u8 sdnx[SDNXL];  /* state description annex */









		struct {
































tools/build/Makefile.feature



+3
−2






























Original line number
Diff line number
Diff line







@@ -8,7 +8,7 @@ endif

















feature_check = $(eval $(feature_check_code))









define feature_check_code









  feature-$(1) := $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CC=$(CC) CXX=$(CXX) CFLAGS="$(EXTRA_CFLAGS) $(FEATURE_CHECK_CFLAGS-$(1))" CXXFLAGS="$(EXTRA_CXXFLAGS) $(FEATURE_CHECK_CXXFLAGS-$(1))" LDFLAGS="$(LDFLAGS) $(FEATURE_CHECK_LDFLAGS-$(1))" -C $(feature_dir) $(OUTPUT_FEATURES)test-$1.bin >/dev/null 2>/dev/null && echo 1 || echo 0)









  feature-$(1) := $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CC="$(CC)" CXX="$(CXX)" CFLAGS="$(EXTRA_CFLAGS) $(FEATURE_CHECK_CFLAGS-$(1))" CXXFLAGS="$(EXTRA_CXXFLAGS) $(FEATURE_CHECK_CXXFLAGS-$(1))" LDFLAGS="$(LDFLAGS) $(FEATURE_CHECK_LDFLAGS-$(1))" -C $(feature_dir) $(OUTPUT_FEATURES)test-$1.bin >/dev/null 2>/dev/null && echo 1 || echo 0)









endef



















feature_set = $(eval $(feature_set_code))








@@ -98,7 +98,8 @@ FEATURE_TESTS_EXTRA :=                  \







         llvm-version                   \









         clang                          \









         libbpf                         \









         libpfm4









         libpfm4                        \









         libdebuginfod



















FEATURE_TESTS ?= $(FEATURE_TESTS_BASIC)










































tools/build/feature/Makefile



+4
−0






























Original line number
Diff line number
Diff line







@@ -26,6 +26,7 @@ FILES=                                          \







         test-libelf-gelf_getnote.bin           \









         test-libelf-getshdrstrndx.bin          \









         test-libelf-mmap.bin                   \









         test-libdebuginfod.bin                 \









         test-libnuma.bin                       \









         test-numa_num_possible_cpus.bin        \









         test-libperl.bin                       \








@@ -157,6 +158,9 @@ $(OUTPUT)test-libelf-gelf_getnote.bin:







$(OUTPUT)test-libelf-getshdrstrndx.bin:









	$(BUILD) -lelf



















$(OUTPUT)test-libdebuginfod.bin:









	$(BUILD) -ldebuginfod



















$(OUTPUT)test-libnuma.bin:









	$(BUILD) -lnuma










































tools/build/feature/test-libdebuginfod.c
0 → 100644



+8
−0






























Original line number
Diff line number
Diff line









// SPDX-License-Identifier: GPL-2.0









#include <elfutils/debuginfod.h>



















int main(void)









{









	debuginfod_client* c = debuginfod_begin();









	return (long)c;









}
































































CRA Git | Maintained and supported by SUSTech CRA and CCSE