perf/urgent fixes
Arnaldo Carvalho de Melo
maintainerHi Ingo,
Please consider pulling,
- Arnaldo
Test results at the end of this message, as usual.
The following changes since commit b130a699c07155a1d6ef7d971a5f3bf0e3818d5a:
Merge tag 'perf-urgent-for-mingo-4.14-20170912' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent (2017-09-13 09:25:10 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-urgent-for-mingo-4.14-20170928
for you to fetch changes up to 5357413f5c067f60933e4b8d79d483fbe62b2bb5:
perf test: Fix vmlinux failure on s390x part 2 (2017-09-28 13:01:42 -0300)
----------------------------------------------------------------
perf/urgent fixes:
- Fix syscalltbl build failure (Akemi Yagi)
- Fix attr.exclude_kernel setting for default cycles:p, this time for !root with kernel.perf_event_paranoid = -1 (Arnaldo Carvalho de Melo)
- Sync kernel ABI headers with tooling headers (Ingo Molnar)
- Remove misleading debug messages with --call-graph option (Mengting Zhang)
- Revert vmlinux symbol resolution patches for s390x (Thomas Richter)
----------------------------------------------------------------
Akemi Yagi (1):
perf tools: Fix syscalltbl build failure
Arnaldo Carvalho de Melo (2):
perf tools: Get all of tools/{arch,include}/ in the MANIFEST perf evsel: Fix attr.exclude_kernel setting for default cycles:p
Ingo Molnar (1):
tools include: Sync kernel ABI headers with tooling headers
Mengting Zhang (1):
perf report: Fix debug messages with --call-graph option
Thomas Richter (2):
perf test: Fix vmlinux failure on s390x
perf test: Fix vmlinux failure on s390x part 2tools/arch/s390/include/uapi/asm/kvm.h | 6 ++ tools/arch/x86/include/asm/cpufeatures.h | 2 + tools/arch/x86/include/asm/disabled-features.h | 4 +- tools/include/asm-generic/hugetlb_encode.h | 34 ++++++++++ tools/include/uapi/asm-generic/mman-common.h | 14 +---- tools/include/uapi/drm/drm.h | 22 +++++++ tools/include/uapi/drm/i915_drm.h | 51 ++++++++++++++- tools/include/uapi/linux/bpf.h | 32 ++++++---- tools/include/uapi/linux/kvm.h | 3 +- tools/include/uapi/linux/mman.h | 24 ++++++- tools/perf/MANIFEST | 87 +------------------------- tools/perf/arch/s390/util/Build | 1 - tools/perf/arch/s390/util/sym-handling.c | 29 --------- tools/perf/util/callchain.c | 35 ++++++----- tools/perf/util/evsel.c | 7 ++- tools/perf/util/symbol-elf.c | 8 +-- tools/perf/util/symbol.h | 3 - tools/perf/util/syscalltbl.c | 2 +- 18 files changed, 195 insertions(+), 169 deletions(-) create mode 100644 tools/include/asm-generic/hugetlb_encode.h delete mode 100644 tools/perf/arch/s390/util/sym-handling.c
Test results:
The first ones are container (docker) based builds of tools/perf with and without libelf support. Where clang is available, it is also used to build perf with/without libelf.
The objtool and samples/bpf/ builds are disabled now that I'm switching from using the sources in a local volume to fetching them from a http server to build it inside the container, to make it easier to build in a container cluster. Those will come back later.
Several are cross builds, the ones with -x-ARCH and the android one, and those may not have all the features built, due to lack of multi-arch devel packages, available and being used so far on just a few, like debian:experimental-x-{arm64,mipsel}.
The 'perf test' one will perform a variety of tests exercising tools/perf/util/, tools/lib/{bpf,traceevent,etc}, as well as run perf commands with a variety of command line event specifications to then intercept the sys_perf_event syscall to check that the perf_event_attr fields are set up as expected, among a variety of other unit tests.
Then there is the 'make -C tools/perf build-test' ones, that build tools/perf/ with a variety of feature sets, exercising the build with an incomplete set of features as well as with a complete one. It is planned to have it run on each of the containers mentioned above, using some container orchestration infrastructure. Get in contact if interested in helping having this in place.
# dm 1 alpine:3.4: Ok 2 alpine:3.5: Ok 3 alpine:3.6: Ok 4 alpine:edge: Ok 5 android-ndk:r12b-arm: Ok 6 android-ndk:r15c-arm: Ok 7 centos:5: Ok 8 centos:6: Ok 9 centos:7: Ok 10 debian:7: Ok 11 debian:8: Ok 12 debian:9: Ok 13 debian:experimental: Ok 14 debian:experimental-x-arm64: Ok 15 debian:experimental-x-mips: Ok 16 debian:experimental-x-mips64: Ok 17 debian:experimental-x-mipsel: Ok 18 fedora:20: Ok 19 fedora:21: Ok 20 fedora:22: Ok 21 fedora:23: Ok 22 fedora:24: Ok 23 fedora:24-x-ARC-uClibc: FAIL
This is being investigated:
util/db-export.c: In function 'db_export__sample':util/db-export.c:429:1: internal compiler error: in change_address_1, at emit-rtl.c:2150
}
^
Please submit a full bug report,
with preprocessed source if appropriate.
See <https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/issues> for instructions.
24 fedora:25: Ok
25 fedora:26: Ok
26 fedora:rawhide: Ok
27 mageia:5: Ok
28 opensuse:42.1: Ok
29 opensuse:42.2: Ok
30 opensuse:42.3: Ok
31 opensuse:tumbleweed: Ok
32 oraclelinux:6: Ok
33 oraclelinux:7: Ok
34 ubuntu:12.04.5: Ok
35 ubuntu:14.04.4: Ok
36 ubuntu:14.04.4-x-linaro-arm64: Ok
37 ubuntu:15.10: Ok
38 ubuntu:16.04: Ok
39 ubuntu:16.04-x-arm: Ok
40 ubuntu:16.04-x-arm64: Ok
41 ubuntu:16.04-x-powerpc: Ok
42 ubuntu:16.04-x-powerpc64: Ok
43 ubuntu:16.04-x-powerpc64el: Ok
44 ubuntu:16.04-x-s390: Ok
45 ubuntu:16.10: Ok
46 ubuntu:17.04: Ok
47 ubuntu:17.10: Ok
# uname -a Linux jouet 4.13.0+ #3 SMP Mon Sep 25 11:51:22 -03 2017 x86_64 x86_64 x86_64 GNU/Linux # perf test 1: vmlinux symtab matches kallsyms : Ok 2: Detect openat syscall event : Ok 3: Detect openat syscall event on all cpus : Ok 4: Read samples using the mmap interface : Ok 5: Test data source output : Ok 6: Parse event definition strings : Ok 7: Simple expression parser : Ok 8: PERF_RECORD_* events & perf_sample fields : Ok 9: Parse perf pmu format : Ok 10: DSO data read : Ok 11: DSO data cache : Ok 12: DSO data reopen : Ok 13: Roundtrip evsel->name : Ok 14: Parse sched tracepoints fields : Ok 15: syscalls:sys_enter_openat event fields : Ok 16: Setup struct perf_event_attr : Ok 17: Match and link multiple hists : Ok 18: 'import perf' in python : Ok 19: Breakpoint overflow signal handler : Ok 20: Breakpoint overflow sampling : Ok 21: Number of exit events of a simple workload : Ok 22: Software clock events period values : Ok 23: Object code reading : Ok 24: Sample parsing : Ok 25: Use a dummy software event to keep tracking : Ok 26: Parse with no sample_id_all bit set : Ok 27: Filter hist entries : Ok 28: Lookup mmap thread : Ok 29: Share thread mg : Ok 30: Sort output of hist entries : Ok 31: Cumulate child hist entries : Ok 32: Track with sched_switch : Ok 33: Filter fds with revents mask in a fdarray : Ok 34: Add fd to a fdarray, making it autogrow : Ok 35: kmod_path__parse : Ok 36: Thread map : Ok 37: LLVM search and compile : 37.1: Basic BPF llvm compile : Ok 37.2: kbuild searching : Ok 37.3: Compile source for BPF prologue generation : Ok 37.4: Compile source for BPF relocation : Ok 38: Session topology : Ok 39: BPF filter : 39.1: Basic BPF filtering : Ok 39.2: BPF pinning : Ok 39.3: BPF prologue generation : Ok 39.4: BPF relocation checker : Ok 40: Synthesize thread map : Ok 41: Remove thread map : Ok 42: Synthesize cpu map : Ok 43: Synthesize stat config : Ok 44: Synthesize stat : Ok 45: Synthesize stat round : Ok 46: Synthesize attr update : Ok 47: Event times : Ok 48: Read backward ring buffer : Ok 49: Print cpu map : Ok 50: Probe SDT events : Ok 51: is_printable_array : Ok 52: Print bitmap : Ok 53: perf hooks : Ok 54: builtin clang support : Skip (not compiled in) 55: unit_number__scnprintf : Ok 56: x86 rdpmc : Ok 57: Convert perf time to TSC : Ok 58: DWARF unwind : Ok 59: x86 instruction decoder - new instructions : Ok 60: Intel cqm nmi context read : Skip 61: Use vfs_getname probe to get syscall args filenames : Ok 62: probe libc's inet_pton & backtrace it with ping : Ok 63: Check open filename arg using perf trace + vfs_getname: Ok 64: Add vfs_getname probe to get syscall args filenames : Ok #
$ make -C tools/perf build-test
make: Entering directory '/home/acme/git/linux/tools/perf'
- tarpkg: ./tests/perf-targz-src-pkg .
make_minimal_O: && make NO_LIBPERL=1 NO_LIBPYTHON=1 NO_NEWT=1 NO_GTK2=1 NO_DEMANGLE=1 NO_LIBELF=1 NO_LIBUNWIND=1 NO_BACKTRACE=1 NO_LIBNUMA=1 NO_LIBAUDIT=1 NO_LIBBIONIC=1 NO_LIBDW_DWARF_UNWIND=1 NO_AUXTRACE=1 NO_LIBBPF=1 NO_LIBCRYPTO=1 NO_SDT=1 NO_JVMTI=1
make_pure_O: && make
make_no_libnuma_O: && make NO_LIBNUMA=1
make_no_auxtrace_O: && make NO_AUXTRACE=1
make_clean_all_O: && make clean all
make_no_libdw_dwarf_unwind_O: && make NO_LIBDW_DWARF_UNWIND=1
make_no_ui_O: && make NO_NEWT=1 NO_SLANG=1 NO_GTK2=1
make_tags_O: && make tags
make_debug_O: && make DEBUG=1
make_no_libperl_O: && make NO_LIBPERL=1
make_no_libbpf_O: && make NO_LIBBPF=1
make_no_newt_O: && make NO_NEWT=1
make_no_libpython_O: && make NO_LIBPYTHON=1
make_no_backtrace_O: && make NO_BACKTRACE=1
make_with_clangllvm_O: && make LIBCLANGLLVM=1
make_no_libaudit_O: && make NO_LIBAUDIT=1
make_no_scripts_O: && make NO_LIBPYTHON=1 NO_LIBPERL=1
make_no_demangle_O: && make NO_DEMANGLE=1
make_util_map_o_O: && make util/map.o
make_static_O: && make LDFLAGS=-static
make_no_libunwind_O: && make NO_LIBUNWIND=1
make_no_gtk2_O: && make NO_GTK2=1
make_no_libbionic_O: && make NO_LIBBIONIC=1
make_install_prefix_slash_O: && make install prefix=/tmp/krava/
make_no_slang_O: && make NO_SLANG=1
make_perf_o_O: && make perf.o
make_doc_O: && make doc
make_install_bin_O: && make install-bin
make_with_babeltrace_O: && make LIBBABELTRACE=1
make_install_O: && make install
make_install_prefix_O: && make install prefix=/tmp/krava
make_help_O: && make help
make_util_pmu_bison_o_O: && make util/pmu-bison.o
make_no_libelf_O: && make NO_LIBELF=1
OK
make: Leaving directory '/home/acme/git/linux/tools/perf'
$Arnaldo Carvalho de Melo
maintainerPATCH 1/7 perf tools: Get all of tools/{arch,include}/ in the MANIFEST
From: Arnaldo Carvalho de Melo <[email protected]>
Now that I'm switching the container builds from using a local volume pointing to the kernel repository with the perf sources, instead getting a detached tarball to be able to use a container cluster, some places broke because I forgot to put some of the required files in tools/perf/MANIFEST, namely some bitsperlong.h files.
So, to fix it do the same as for tools/build/ and pack the whole tools/arch/ directory.
--- tools/perf/MANIFEST | 87 ++--------------------------------------------------- 1 file changed, 2 insertions(+), 85 deletions(-)
tools/perf/MANIFEST +2 -85
@@ -1,34 +1,8 @@ tools/perf -tools/arch/alpha/include/asm/barrier.h -tools/arch/arm/include/asm/barrier.h -tools/arch/arm64/include/asm/barrier.h -tools/arch/ia64/include/asm/barrier.h -tools/arch/mips/include/asm/barrier.h -tools/arch/powerpc/include/asm/barrier.h -tools/arch/s390/include/asm/barrier.h -tools/arch/sh/include/asm/barrier.h -tools/arch/sparc/include/asm/barrier.h -tools/arch/sparc/include/asm/barrier_32.h -tools/arch/sparc/include/asm/barrier_64.h -tools/arch/tile/include/asm/barrier.h -tools/arch/x86/include/asm/barrier.h -tools/arch/x86/include/asm/cmpxchg.h -tools/arch/x86/include/asm/cpufeatures.h -tools/arch/x86/include/asm/disabled-features.h -tools/arch/x86/include/asm/required-features.h -tools/arch/x86/include/uapi/asm/svm.h -tools/arch/x86/include/uapi/asm/vmx.h -tools/arch/x86/include/uapi/asm/kvm.h -tools/arch/x86/include/uapi/asm/kvm_perf.h -tools/arch/x86/lib/memcpy_64.S -tools/arch/x86/lib/memset_64.S -tools/arch/s390/include/uapi/asm/kvm_perf.h -tools/arch/s390/include/uapi/asm/sie.h -tools/arch/xtensa/include/asm/barrier.h +tools/arch tools/scripts tools/build -tools/arch/x86/include/asm/atomic.h -tools/arch/x86/include/asm/rmwcc.h +tools/include tools/lib/traceevent tools/lib/api tools/lib/bpf
@@ -42,60 +16,3 @@ tools/lib/find_bit.c tools/lib/bitmap.c tools/lib/str_error_r.c tools/lib/vsprintf.c -tools/include/asm/alternative-asm.h -tools/include/asm/atomic.h -tools/include/asm/barrier.h -tools/include/asm/bug.h -tools/include/asm-generic/atomic-gcc.h -tools/include/asm-generic/barrier.h -tools/include/asm-generic/bitops/arch_hweight.h -tools/include/asm-generic/bitops/atomic.h -tools/include/asm-generic/bitops/const_hweight.h -tools/include/asm-generic/bitops/__ffs.h -tools/include/asm-generic/bitops/__ffz.h -tools/include/asm-generic/bitops/__fls.h -tools/include/asm-generic/bitops/find.h -tools/include/asm-generic/bitops/fls64.h -tools/include/asm-generic/bitops/fls.h -tools/include/asm-generic/bitops/hweight.h -tools/include/asm-generic/bitops.h -tools/include/linux/atomic.h -tools/include/linux/bitops.h -tools/include/linux/compiler.h -tools/include/linux/compiler-gcc.h -tools/include/linux/coresight-pmu.h -tools/include/linux/bug.h -tools/include/linux/filter.h -tools/include/linux/hash.h -tools/include/linux/kernel.h -tools/include/linux/list.h -tools/include/linux/log2.h -tools/include/uapi/asm-generic/fcntl.h -tools/include/uapi/asm-generic/ioctls.h -tools/include/uapi/asm-generic/mman-common.h -tools/include/uapi/asm-generic/mman.h -tools/include/uapi/drm/drm.h -tools/include/uapi/drm/i915_drm.h -tools/include/uapi/linux/bpf.h -tools/include/uapi/linux/bpf_common.h -tools/include/uapi/linux/fcntl.h -tools/include/uapi/linux/hw_breakpoint.h -tools/include/uapi/linux/kvm.h -tools/include/uapi/linux/mman.h -tools/include/uapi/linux/perf_event.h -tools/include/uapi/linux/sched.h -tools/include/uapi/linux/stat.h -tools/include/uapi/linux/vhost.h -tools/include/uapi/sound/asound.h -tools/include/linux/poison.h -tools/include/linux/rbtree.h -tools/include/linux/rbtree_augmented.h -tools/include/linux/refcount.h -tools/include/linux/string.h -tools/include/linux/stringify.h -tools/include/linux/types.h -tools/include/linux/err.h -tools/include/linux/bitmap.h -tools/include/linux/time64.h -tools/arch/*/include/uapi/asm/mman.h -tools/arch/*/include/uapi/asm/perf_regs.h
Signature · 1 line
2.13.5
Arnaldo Carvalho de Melo
maintainerPATCH 2/7 tools include: Sync kernel ABI headers with tooling headers
In reply to Arnaldo Carvalho de MeloFrom: Ingo Molnar <[email protected]>
Time for a sync with ABI/uapi headers with the upcoming v4.14 kernel.
None of the ABI changes require any source code level changes to our existing in-kernel tooling code:
- tools/arch/s390/include/uapi/asm/kvm.h:
New KVM_S390_VM_TOD_EXT ABI, not used by in-kernel tooling.
- tools/arch/x86/include/asm/cpufeatures.h:
tools/arch/x86/include/asm/disabled-features.h:
New PCID, SME and VGIF x86 CPU feature bits defined.
- tools/include/asm-generic/hugetlb_encode.h:
tools/include/uapi/asm-generic/mman-common.h:
tools/include/uapi/linux/mman.h:
Two new madvise() flags, plus a hugetlb system call mmap flags restructuring/extension changes.
- tools/include/uapi/drm/drm.h:
tools/include/uapi/drm/i915_drm.h:
New drm_syncobj_create flags definitions, new drm_syncobj_wait and drm_syncobj_array ABIs. DRM_I915_PERF_* calls and a new I915_PARAM_HAS_EXEC_FENCE_ARRAY ABI for the Intel driver.
- tools/include/uapi/linux/bpf.h:
New bpf_sock fields (::mark and ::priority), new XDP_REDIRECT action, new kvm_ppc_smmu_info fields (::data_keys, instr_keys)
--- tools/arch/s390/include/uapi/asm/kvm.h | 6 +++ tools/arch/x86/include/asm/cpufeatures.h | 2 + tools/arch/x86/include/asm/disabled-features.h | 4 +- tools/include/asm-generic/hugetlb_encode.h | 34 +++++++++++++++++ tools/include/uapi/asm-generic/mman-common.h | 14 ++----- tools/include/uapi/drm/drm.h | 22 +++++++++++ tools/include/uapi/drm/i915_drm.h | 51 +++++++++++++++++++++++++- tools/include/uapi/linux/bpf.h | 32 ++++++++++------ tools/include/uapi/linux/kvm.h | 3 +- tools/include/uapi/linux/mman.h | 24 +++++++++++- 10 files changed, 164 insertions(+), 28 deletions(-) create mode 100644 tools/include/asm-generic/hugetlb_encode.h
tools/arch/s390/include/uapi/asm/kvm.h +6 -0
@@ -88,6 +88,12 @@ struct kvm_s390_io_adapter_req {/* kvm attributes for KVM_S390_VM_TOD */ #define KVM_S390_VM_TOD_LOW 0#define KVM_S390_VM_TOD_HIGH 1 +#define KVM_S390_VM_TOD_EXT 2 + +struct kvm_s390_vm_tod_clock { +__u8 epoch_idx; +__u64 tod; +};/* kvm attributes for KVM_S390_VM_CPU_MODEL */ /* processor related attributes are r/w */
tools/arch/x86/include/asm/cpufeatures.h +2 -0
@@ -196,6 +196,7 @@#define X86_FEATURE_HW_PSTATE ( 7*32+ 8)/* AMD HW-PState */ #define X86_FEATURE_PROC_FEEDBACK ( 7*32+ 9)/* AMD ProcFeedbackInterface */ +#define X86_FEATURE_SME ( 7*32+10)/* AMD Secure Memory Encryption */ #define X86_FEATURE_INTEL_PPIN ( 7*32+14)/* Intel Processor Inventory Number */ #define X86_FEATURE_INTEL_PT ( 7*32+15)/* Intel Processor Trace */
@@ -287,6 +288,7 @@#define X86_FEATURE_PFTHRESHOLD (15*32+12)/* pause filter threshold */ #define X86_FEATURE_AVIC (15*32+13)/* Virtual Interrupt Controller */ #define X86_FEATURE_V_VMSAVE_VMLOAD (15*32+15)/* Virtual VMSAVE VMLOAD */ +#define X86_FEATURE_VGIF (15*32+16)/* Virtual GIF */ /* Intel-defined CPU features, CPUID level 0x00000007:0 (ecx), word 16 */ #define X86_FEATURE_AVX512VBMI (16*32+ 1)/* AVX512 Vector Bit Manipulation instructions*/
tools/arch/x86/include/asm/disabled-features.h +3 -1
@@ -21,11 +21,13 @@# define DISABLE_K6_MTRR (1<<(X86_FEATURE_K6_MTRR & 31))# define DISABLE_CYRIX_ARR (1<<(X86_FEATURE_CYRIX_ARR & 31))# define DISABLE_CENTAUR_MCR (1<<(X86_FEATURE_CENTAUR_MCR & 31)) +# define DISABLE_PCID 0#else # define DISABLE_VME 0# define DISABLE_K6_MTRR 0# define DISABLE_CYRIX_ARR 0# define DISABLE_CENTAUR_MCR 0 +# define DISABLE_PCID (1<<(X86_FEATURE_PCID & 31))#endif /* CONFIG_X86_64 */ #ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS
@@ -49,7 +51,7 @@#define DISABLED_MASK1 0#define DISABLED_MASK2 0#define DISABLED_MASK3 (DISABLE_CYRIX_ARR|DISABLE_CENTAUR_MCR|DISABLE_K6_MTRR) -#define DISABLED_MASK4 0 +#define DISABLED_MASK4 (DISABLE_PCID)#define DISABLED_MASK5 0#define DISABLED_MASK6 0#define DISABLED_MASK7 0
tools/include/asm-generic/hugetlb_encode.h new file +34 -0
@@ -0,0 +1,34 @@ +#ifndef _ASM_GENERIC_HUGETLB_ENCODE_H_ +#define _ASM_GENERIC_HUGETLB_ENCODE_H_ + +/* +* Several system calls take a flag to request "hugetlb" huge pages. +* Without further specification, these system calls will use the +* system's default huge page size. If a system supports multiple +* huge page sizes, the desired huge page size can be specified in +* bits [26:31] of the flag arguments. The value in these 6 bits +* will encode the log2 of the huge page size. +* +* The following definitions are associated with this huge page size +* encoding in flag arguments. System call specific header files +* that use this encoding should include this file. They can then +* provide definitions based on these with their own specific prefix. +* for example: +* #define MAP_HUGE_SHIFT HUGETLB_FLAG_ENCODE_SHIFT +*/ + +#define HUGETLB_FLAG_ENCODE_SHIFT 26 +#define HUGETLB_FLAG_ENCODE_MASK 0x3f + +#define HUGETLB_FLAG_ENCODE_64KB (16 << HUGETLB_FLAG_ENCODE_SHIFT) +#define HUGETLB_FLAG_ENCODE_512KB (19 << HUGETLB_FLAG_ENCODE_SHIFT) +#define HUGETLB_FLAG_ENCODE_1MB (20 << HUGETLB_FLAG_ENCODE_SHIFT) +#define HUGETLB_FLAG_ENCODE_2MB (21 << HUGETLB_FLAG_ENCODE_SHIFT) +#define HUGETLB_FLAG_ENCODE_8MB (23 << HUGETLB_FLAG_ENCODE_SHIFT) +#define HUGETLB_FLAG_ENCODE_16MB (24 << HUGETLB_FLAG_ENCODE_SHIFT) +#define HUGETLB_FLAG_ENCODE_256MB (28 << HUGETLB_FLAG_ENCODE_SHIFT) +#define HUGETLB_FLAG_ENCODE_1GB (30 << HUGETLB_FLAG_ENCODE_SHIFT) +#define HUGETLB_FLAG_ENCODE_2GB (31 << HUGETLB_FLAG_ENCODE_SHIFT) +#define HUGETLB_FLAG_ENCODE_16GB (34 << HUGETLB_FLAG_ENCODE_SHIFT) + +#endif /* _ASM_GENERIC_HUGETLB_ENCODE_H_ */
tools/include/uapi/asm-generic/mman-common.h +3 -11
@@ -58,20 +58,12 @@overrides the coredump filter bits */ #define MADV_DODUMP 17/* Clear the MADV_DONTDUMP flag */ +#define MADV_WIPEONFORK 18/* Zero memory on fork, child only */ +#define MADV_KEEPONFORK 19/* Undo MADV_WIPEONFORK */ +/* compatibility flags */ #define MAP_FILE 0 -/* -* When MAP_HUGETLB is set bits [26:31] encode the log2 of the huge page size. -* This gives us 6 bits, which is enough until someone invents 128 bit address -* spaces. -* -* Assume these are all power of twos. -* When 0 use the default page size. -*/ -#define MAP_HUGE_SHIFT 26 -#define MAP_HUGE_MASK 0x3f -#define PKEY_DISABLE_ACCESS 0x1#define PKEY_DISABLE_WRITE 0x2#define PKEY_ACCESS_MASK (PKEY_DISABLE_ACCESS |\
tools/include/uapi/drm/drm.h +22 -0
@@ -700,6 +700,7 @@ struct drm_prime_handle {struct drm_syncobj_create {__u32 handle; +#define DRM_SYNCOBJ_CREATE_SIGNALED (1 << 0)__u32 flags; };
@@ -718,6 +719,24 @@ struct drm_syncobj_handle {__u32 pad; }; +#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL (1 << 0) +#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT (1 << 1) +struct drm_syncobj_wait { +__u64 handles; +/* absolute timeout */ +__s64 timeout_nsec; +__u32 count_handles; +__u32 flags; +__u32 first_signaled;/* only valid when not waiting all */ +__u32 pad; +}; + +struct drm_syncobj_array { +__u64 handles; +__u32 count_handles; +__u32 pad; +}; +#if defined(__cplusplus) }#endif
@@ -840,6 +859,9 @@ extern "C" {#define DRM_IOCTL_SYNCOBJ_DESTROY DRM_IOWR(0xC0, struct drm_syncobj_destroy)#define DRM_IOCTL_SYNCOBJ_HANDLE_TO_FD DRM_IOWR(0xC1, struct drm_syncobj_handle)#define DRM_IOCTL_SYNCOBJ_FD_TO_HANDLE DRM_IOWR(0xC2, struct drm_syncobj_handle) +#define DRM_IOCTL_SYNCOBJ_WAIT DRM_IOWR(0xC3, struct drm_syncobj_wait) +#define DRM_IOCTL_SYNCOBJ_RESET DRM_IOWR(0xC4, struct drm_syncobj_array) +#define DRM_IOCTL_SYNCOBJ_SIGNAL DRM_IOWR(0xC5, struct drm_syncobj_array)/** * Device specific ioctls should only be in their respective headers
tools/include/uapi/drm/i915_drm.h +49 -2
93 lines not on this page · raw message
tools/include/uapi/linux/bpf.h +20 -12
@@ -143,12 +143,6 @@ enum bpf_attach_type {#define MAX_BPF_ATTACH_TYPE __MAX_BPF_ATTACH_TYPE -enum bpf_sockmap_flags { -BPF_SOCKMAP_UNSPEC , -BPF_SOCKMAP_STRPARSER , - __MAX_BPF_SOCKMAP_FLAG -}; -/* If BPF_F_ALLOW_OVERRIDE flag is used in BPF_PROG_ATTACH command * to the given target_fd cgroup the descendent cgroup will be able to * override effective bpf program that was inherited from this cgroup
@@ -368,9 +362,20 @@ union bpf_attr {* int bpf_redirect(ifindex, flags) * redirect to another netdev * @ifindex: ifindex of the net device -* @flags: bit 0 - if set, redirect to ingress instead of egress -* other bits - reserved -* Return: TC_ACT_REDIRECT +* @flags: +* cls_bpf: +* bit 0 - if set, redirect to ingress instead of egress +* other bits - reserved +* xdp_bpf: +* all bits - reserved +* Return: cls_bpf: TC_ACT_REDIRECT on success or TC_ACT_SHOT on error +* xdp_bfp: XDP_REDIRECT on success or XDP_ABORT on error +* int bpf_redirect_map(map, key, flags) +* redirect to endpoint in map +* @map: pointer to dev map +* @key: index in map to lookup +* @flags: -- +* Return: XDP_REDIRECT on success or XDP_ABORT on error * * u32 bpf_get_route_realm(skb) * retrieve a dst's tclassid
@@ -632,7 +637,7 @@ union bpf_attr {FN (skb_adjust_room), \FN (redirect_map), \FN (sk_redirect_map), \ -FN (sock_map_update), +FN (sock_map_update), \/* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call
@@ -753,20 +758,23 @@ struct bpf_sock {__u32 family;__u32 type;__u32 protocol; +__u32 mark; +__u32 priority; };#define XDP_PACKET_HEADROOM 256/* User return codes for XDP prog type. * A valid XDP program must return one of these defined values. All other -* return codes are reserved for future use. Unknown return codes will result -* in packet drop. +* return codes are reserved for future use. Unknown return codes will +* result in packet drops and a warning via bpf_warn_invalid_xdp_action(). */ enum xdp_action {XDP_ABORTED =0 ,XDP_DROP ,XDP_PASS ,XDP_TX , +XDP_REDIRECT , };/* user accessible metadata for XDP packet hook
tools/include/uapi/linux/kvm.h +2 -1
@@ -711,7 +711,8 @@ struct kvm_ppc_one_seg_page_size {struct kvm_ppc_smmu_info {__u64 flags;__u32 slb_size; -__u32 pad; +__u16 data_keys;/* # storage keys supported for data */ +__u16 instr_keys;/* # storage keys supported for instructions */ struct kvm_ppc_one_seg_page_size sps[KVM_PPC_PAGE_SIZES_MAX_SZ ]; };
tools/include/uapi/linux/mman.h +23 -1
@@ -1,7 +1,8 @@#ifndef _UAPI_LINUX_MMAN_H#define _UAPI_LINUX_MMAN_H -#include <uapi/asm/mman.h> +#include <asm/mman.h> +#include <asm-generic/hugetlb_encode.h> #define MREMAP_MAYMOVE 1#define MREMAP_FIXED 2
@@ -10,4 +11,25 @@#define OVERCOMMIT_ALWAYS 1#define OVERCOMMIT_NEVER 2 +/* +* Huge page size encoding when MAP_HUGETLB is specified, and a huge page +* size other than the default is desired. See hugetlb_encode.h. +* All known huge page size encodings are provided here. It is the +* responsibility of the application to know which sizes are supported on +* the running system. See mmap(2) man page for details. +*/ +#define MAP_HUGE_SHIFT HUGETLB_FLAG_ENCODE_SHIFT +#define MAP_HUGE_MASK HUGETLB_FLAG_ENCODE_MASK + +#define MAP_HUGE_64KB HUGETLB_FLAG_ENCODE_64KB +#define MAP_HUGE_512KB HUGETLB_FLAG_ENCODE_512KB +#define MAP_HUGE_1MB HUGETLB_FLAG_ENCODE_1MB +#define MAP_HUGE_2MB HUGETLB_FLAG_ENCODE_2MB +#define MAP_HUGE_8MB HUGETLB_FLAG_ENCODE_8MB +#define MAP_HUGE_16MB HUGETLB_FLAG_ENCODE_16MB +#define MAP_HUGE_256MB HUGETLB_FLAG_ENCODE_256MB +#define MAP_HUGE_1GB HUGETLB_FLAG_ENCODE_1GB +#define MAP_HUGE_2GB HUGETLB_FLAG_ENCODE_2GB +#define MAP_HUGE_16GB HUGETLB_FLAG_ENCODE_16GB +#endif /* _UAPI_LINUX_MMAN_H */
Signature · 1 line
2.13.5
Arnaldo Carvalho de Melo
maintainerPATCH 3/7 perf evsel: Fix attr.exclude_kernel setting for default cycles:p
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
Yet another fix for probing the max attr.precise_ip setting: it is not enough settting attr.exclude_kernel for !root users, as they _can_ profile the kernel if the kernel.perf_event_paranoid sysctl is set to -1, so check that as well.
Testing it:
As non root:
$ sysctl kernel.perf_event_paranoid kernel.perf_event_paranoid = 2 $ perf record sleep 1 $ perf evlist -v cycles:uppp: ..., exclude_kernel: 1, ... precise_ip: 3, ...
Now as non-root, but with kernel.perf_event_paranoid set set to the most permissive value, -1:
$ sysctl kernel.perf_event_paranoid kernel.perf_event_paranoid = -1 $ perf record sleep 1 $ perf evlist -v cycles:ppp: ..., exclude_kernel: 0, ... precise_ip: 3, ... $
I.e. non-root, default kernel.perf_event_paranoid: :uppp modifier = not allowed to sample the kernel,
non-root, most permissible kernel.perf_event_paranoid: :ppp = allowed to sample the kernel.
In both cases, use the highest available precision: attr.precise_ip = 3.
--- tools/perf/util/evsel.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
tools/perf/util/evsel.c +6 -1
@@ -271,12 +271,17 @@ struct perf_evsel *perf_evsel__new_idx(struct perf_event_attr *attr, int idx)return evsel; } +static bool perf_event_can_profile_kernel (void ) +{ +return geteuid () ==0 ||perf_event_paranoid () ==-1 ; +} +struct perf_evsel *perf_evsel__new_cycles (bool precise) {struct perf_event_attr attr = { .type =PERF_TYPE_HARDWARE , .config =PERF_COUNT_HW_CPU_CYCLES , - .exclude_kernel =geteuid () !=0 , + .exclude_kernel = !perf_event_can_profile_kernel (), };struct perf_evsel *evsel;
Signature · 1 line
2.13.5
Arnaldo Carvalho de Melo
maintainerPATCH 4/7 perf report: Fix debug messages with --call-graph option
In reply to Arnaldo Carvalho de MeloFrom: Mengting Zhang <[email protected]>
With --call-graph option, perf report can display call chains using type, min percent threshold, optional print limit and order. And the default call-graph parameter is 'graph,0.5,caller,function,percent'.
Before this patch, 'perf report --call-graph' shows incorrect debug messages as below:
# perf report --call-graph Invalid callchain mode: 0.5 Invalid callchain order: 0.5 Invalid callchain sort key: 0.5 Invalid callchain config key: 0.5 Invalid callchain mode: caller Invalid callchain mode: function Invalid callchain order: function Invalid callchain mode: percent Invalid callchain order: percent Invalid callchain sort key: percent
That is because in function __parse_callchain_report_opt(),each field of the call-graph parameter is passed to parse_callchain_{mode,order, sort_key,value} in turn until it meets the matching value.
For example, the order field "caller" is passed to parse_callchain_mode() firstly and obviously it doesn't match any mode field. Therefore parse_callchain_mode() will shows the debug message "Invalid callchain mode: caller", which could confuse users.
The patch fixes this issue by moving the warning out of the function parse_callchain_{mode,order,sort_key,value}.
--- tools/perf/util/callchain.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-)
tools/perf/util/callchain.c +21 -14
@@ -65,8 +65,6 @@ static int parse_callchain_mode(const char *value) callchain_param.mode =CHAIN_FOLDED ;return 0 ; } - -pr_err ("Invalid callchain mode: %s\n" , value);return -1 ; }
@@ -82,8 +80,6 @@ static int parse_callchain_order(const char *value) callchain_param.order_set = true;return 0 ; } - -pr_err ("Invalid callchain order: %s\n" , value);return -1 ; }
@@ -105,8 +101,6 @@ static int parse_callchain_sort_key(const char *value) callchain_param.branch_callstack =1 ;return 0 ; } - -pr_err ("Invalid callchain sort key: %s\n" , value);return -1 ; }
@@ -124,8 +118,6 @@ static int parse_callchain_value(const char *value) callchain_param.value =CCVAL_COUNT ;return 0 ; } - -pr_err ("Invalid callchain config key: %s\n" , value);return -1 ; }
@@ -319,12 +311,27 @@ int perf_callchain_config(const char *var, const char *value)return ret; } -if (!strcmp (var,"print-type" )) -return parse_callchain_mode (value); -if (!strcmp (var,"order" )) -return parse_callchain_order (value); -if (!strcmp (var,"sort-key" )) -return parse_callchain_sort_key (value); +if (!strcmp (var,"print-type" )){ +int ret; + ret =parse_callchain_mode (value); +if (ret ==-1 ) +pr_err ("Invalid callchain mode: %s\n" , value); +return ret; + } +if (!strcmp (var,"order" )){ +int ret; + ret =parse_callchain_order (value); +if (ret ==-1 ) +pr_err ("Invalid callchain order: %s\n" , value); +return ret; + } +if (!strcmp (var,"sort-key" )){ +int ret; + ret =parse_callchain_sort_key (value); +if (ret ==-1 ) +pr_err ("Invalid callchain sort key: %s\n" , value); +return ret; + }if (!strcmp (var,"threshold" )) { callchain_param.min_percent =strtod (value, &endptr);if (value == endptr) {
Signature · 1 line
2.13.5
Arnaldo Carvalho de Melo
maintainerPATCH 5/7 perf tools: Fix syscalltbl build failure
In reply to Arnaldo Carvalho de MeloFrom: Akemi Yagi <[email protected]>
The build of kernel v4.14-rc1 for i686 fails on RHEL 6 with the error in tools/perf:
util/syscalltbl.c:157: error: expected ';', ',' or ')' before '__maybe_unused'
mv: cannot stat `util/.syscalltbl.o.tmp': No such file or directory
Fix it by placing/moving:
#include <linux/compiler.h>
outside of #ifdef HAVE_SYSCALL_TABLE block.
--- tools/perf/util/syscalltbl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/syscalltbl.c +1 -1
@@ -15,9 +15,9 @@#include "syscalltbl.h" #include <stdlib.h> +#include <linux/compiler.h> #ifdef HAVE_SYSCALL_TABLE -#include <linux/compiler.h> #include <string.h> #include "string2.h" #include "util.h"
Signature · 1 line
2.13.5
Arnaldo Carvalho de Melo
maintainerPATCH 6/7 perf test: Fix vmlinux failure on s390x
In reply to Arnaldo Carvalho de MeloFrom: Thomas Richter <[email protected]>
On s390x perf test 1 failed. It turned out that commit 4a084ecfc821 ("perf report: Fix module symbol adjustment for s390x") was incorrect. The previous implementation in dso__load_sym() is also suitable for s390x.
Therefore this patch undoes commit 4a084ecfc821.
LPU-Reference: [email protected]
--- tools/perf/arch/s390/util/sym-handling.c | 8 -------- tools/perf/util/symbol-elf.c | 8 +------- tools/perf/util/symbol.h | 3 --- 3 files changed, 1 insertion(+), 18 deletions(-)
tools/perf/arch/s390/util/sym-handling.c +0 -8
@@ -18,12 +18,4 @@ bool elf__needs_adjust_symbols(GElf_Ehdr ehdr)return false; return ehdr.e_type == ET_REL || ehdr.e_type == ET_DYN; } - -void arch__adjust_sym_map_offset (GElf_Sym *sym, -GElf_Shdr *shdr__maybe_unused , -struct map *map) -{ -if (map->type ==MAP__FUNCTION ) - sym->st_value += map->start; -}#endif
tools/perf/util/symbol-elf.c +1 -7
@@ -810,12 +810,6 @@ static u64 ref_reloc(struct kmap *kmap)void __weak arch__sym_update (struct symbol *s__maybe_unused ,GElf_Sym *sym__maybe_unused ) { } -void __weak arch__adjust_sym_map_offset (GElf_Sym *sym,GElf_Shdr *shdr, -struct map *map__maybe_unused ) -{ - sym->st_value -= shdr->sh_addr - shdr->sh_offset; -} -int dso__load_sym (struct dso *dso,struct map *map,struct symsrc *syms_ss,struct symsrc *runtime_ss,int kmodule) {
@@ -996,7 +990,7 @@ int dso__load_sym(struct dso *dso, struct map *map, struct symsrc *syms_ss,/* Adjust symbol to map to file offset */ if (adjust_kernel_syms) -arch__adjust_sym_map_offset (&sym, &shdr, map); + sym.st_value -= shdr.sh_addr - shdr.sh_offset; if (strcmp(section_name, (curr_dso->short_name +
tools/perf/util/symbol.h +0 -3
@@ -344,9 +344,6 @@ int setup_intlist(struct intlist **list, const char *list_str,#ifdef HAVE_LIBELF_SUPPORT bool elf__needs_adjust_symbols (GElf_Ehdr ehdr);void arch__sym_update (struct symbol *s,GElf_Sym *sym); -void arch__adjust_sym_map_offset (GElf_Sym *sym, -GElf_Shdr *shdr__maybe_unused , -struct map *map__maybe_unused );#endif #define SYMBOL_A 0
Signature · 1 line
2.13.5
Arnaldo Carvalho de Melo
maintainerPATCH 7/7 perf test: Fix vmlinux failure on s390x part 2
In reply to Arnaldo Carvalho de MeloFrom: Thomas Richter <[email protected]>
On s390x perf test 1 failed. It turned out that commit cf6383f73cf2 ("perf report: Fix kernel symbol adjustment for s390x") was incorrect.
The previous implementation in dso__load_sym() is also suitable for s390x.
Therefore this patch undoes commit cf6383f73cf2
LPU-Reference: [email protected]
--- tools/perf/arch/s390/util/Build | 1 - tools/perf/arch/s390/util/sym-handling.c | 21 --------------------- 2 files changed, 22 deletions(-) delete mode 100644 tools/perf/arch/s390/util/sym-handling.c
tools/perf/arch/s390/util/Build +0 -1
@@ -1,5 +1,4 @@ libperf-y += header.o -libperf-y += sym-handling.o libperf-y += kvm-stat.o libperf-$(CONFIG_DWARF) += dwarf-regs.o
tools/perf/arch/s390/util/sym-handling.c deleted +0 -21
@@ -1,21 +0,0 @@ -/* -* Architecture specific ELF symbol handling and relocation mapping. -* -* Copyright 2017 IBM Corp. -* Author(s): Thomas Richter <[email protected]> -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. -*/ - -#include "symbol.h" - -#ifdef HAVE_LIBELF_SUPPORT -bool elf__needs_adjust_symbols (GElf_Ehdr ehdr) -{ -if (ehdr.e_type ==ET_EXEC ) -return false; -return ehdr.e_type ==ET_REL || ehdr.e_type ==ET_DYN ; -} -#endif
Signature · 1 line
2.13.5
Quoted 67 lines · Arnaldo Carvalho de Melo
Hi Ingo,
Please consider pulling,
- Arnaldo
Test results at the end of this message, as usual.
The following changes since commit
b130a699c07155a1d6ef7d971a5f3bf0e3818d5a:Merge tag 'perf-urgent-for-mingo-4.14-20170912' of
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linuxinto perf/urgent (2017-09-13 09:25:10 +0200)are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.gittags/perf-urgent-for-mingo-4.14-20170928for you to fetch changes up to
5357413f5c067f60933e4b8d79d483fbe62b2bb5:perf test: Fix vmlinux failure on s390x part 2 (2017-09-28 13:01:42 -0300)
----------------------------------------------------------------
perf/urgent fixes:- Fix syscalltbl build failure (Akemi Yagi)
- Fix attr.exclude_kernel setting for default cycles:p, this time for !root with kernel.perf_event_paranoid = -1 (Arnaldo Carvalho de Melo)
- Sync kernel ABI headers with tooling headers (Ingo Molnar)
- Remove misleading debug messages with --call-graph option (Mengting Zhang)
- Revert vmlinux symbol resolution patches for s390x (Thomas Richter)
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>----------------------------------------------------------------
Akemi Yagi (1):
perf tools: Fix syscalltbl build failureArnaldo Carvalho de Melo (2):
perf tools: Get all oftools/{arch,include}/in the MANIFEST perf evsel: Fix attr.exclude_kernel setting for default cycles:pIngo Molnar (1):
tools include: Sync kernel ABI headers with tooling headersMengting Zhang (1):
perf report: Fix debug messages with --call-graph optionThomas Richter (2):
perf test: Fix vmlinux failure on s390x perf test: Fix vmlinux failure on s390x part 2tools/arch/s390/include/uapi/asm/kvm.h | 6 ++ tools/arch/x86/include/asm/cpufeatures.h | 2 + tools/arch/x86/include/asm/disabled-features.h | 4 +- tools/include/asm-generic/hugetlb_encode.h | 34 ++++++++++ tools/include/uapi/asm-generic/mman-common.h | 14 +---- tools/include/uapi/drm/drm.h | 22 +++++++ tools/include/uapi/drm/i915_drm.h | 51 ++++++++++++++- tools/include/uapi/linux/bpf.h | 32 ++++++---- tools/include/uapi/linux/kvm.h | 3 +- tools/include/uapi/linux/mman.h | 24 ++++++- tools/perf/MANIFEST | 87 +------------------------- tools/perf/arch/s390/util/Build | 1 - tools/perf/arch/s390/util/sym-handling.c | 29 ---------
Quoted 8 lines
tools/perf/util/callchain.c | 35 ++++++----- tools/perf/util/evsel.c | 7 ++- tools/perf/util/symbol-elf.c | 8 +-- tools/perf/util/symbol.h | 3 - tools/perf/util/syscalltbl.c | 2 +- 18 files changed, 195 insertions(+), 169 deletions(-) create mode 100644 tools/include/asm-generic/hugetlb_encode.h delete mode 100644 tools/perf/arch/s390/util/sym-handling.c
Pulled, thanks a lot Arnaldo!
Ingo