Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

d8b91dde · Linus Torvalds <[email protected]> · 2018-01-30 11:15:14 -08:00

Pull perf updates from Ingo Molnar:
 "Kernel side changes:

   - Clean up the x86 instruction decoder (Masami Hiramatsu)

   - Add new uprobes optimization for PUSH instructions on x86 (Yonghong
     Song)

   - Add MSR_IA32_THERM_STATUS to the MSR events (Stephane Eranian)

   - Fix misc bugs, update documentation, plus various cleanups (Jiri
     Olsa)

  There's a large number of tooling side improvements:

   - Intel-PT/BTS improvements (Adrian Hunter)

   - Numerous 'perf trace' improvements (Arnaldo Carvalho de Melo)

   - Introduce an errno code to string facility (Hendrik Brueckner)

   - Various build system improvements (Jiri Olsa)

   - Add support for CoreSight trace decoding by making the perf tools
     use the external openCSD (Mathieu Poirier, Tor Jeremiassen)

   - Add ARM Statistical Profiling Extensions (SPE) support (Kim
     Phillips)

   - libtraceevent updates (Steven Rostedt)

   - Intel vendor event JSON updates (Andi Kleen)

   - Introduce 'perf report --mmaps' and 'perf report --tasks' to show
     info present in 'perf.data' (Jiri Olsa, Arnaldo Carvalho de Melo)

   - Add infrastructure to record first and last sample time to the
     perf.data file header, so that when processing all samples in a
     'perf record' session, such as when doing build-id processing, or
     when specifically requesting that that info be recorded, use that
     in 'perf report --time', that also got support for percent slices
     in addition to absolute ones.

     I.e. now it is possible to ask for the samples in the 10%-20% time
     slice of a perf.data file (Jin Yao)

   - Allow system wide 'perf stat --per-thread', sorting the result (Jin
     Yao)

     E.g.:

      [root@jouet ~]# perf stat --per-thread --metrics IPC
      ^C
       Performance counter stats for 'system wide':

                  make-22229  23,012,094,032  inst_retired.any   #  0.8 IPC
                   cc1-22419     692,027,497  inst_retired.any   #  0.8 IPC
                   gcc-22418     328,231,855  inst_retired.any   #  0.9 IPC
                   cc1-22509     220,853,647  inst_retired.any   #  0.8 IPC
                   gcc-22486     199,874,810  inst_retired.any   #  1.0 IPC
                    as-22466     177,896,365  inst_retired.any   #  0.9 IPC
                   cc1-22465     150,732,374  inst_retired.any   #  0.8 IPC
                   gcc-22508     112,555,593  inst_retired.any   #  0.9 IPC
                   cc1-22487     108,964,079  inst_retired.any   #  0.7 IPC
       qemu-system-x86-2697       21,330,550  inst_retired.any   #  0.3 IPC
       systemd-journal-551        20,642,951  inst_retired.any   #  0.4 IPC
       docker-containe-17651       9,552,892  inst_retired.any   #  0.5 IPC
       dockerd-current-9809        7,528,586  inst_retired.any   #  0.5 IPC
                  make-22153  12,504,194,380  inst_retired.any   #  0.8 IPC
               python2-22429  12,081,290,954  inst_retired.any   #  0.8 IPC
      <SNIP>
               python2-22429  15,026,328,103  cpu_clk_unhalted.thread
                   cc1-22419     826,660,193  cpu_clk_unhalted.thread
                   gcc-22418     365,321,295  cpu_clk_unhalted.thread
                   cc1-22509     279,169,362  cpu_clk_unhalted.thread
                   gcc-22486     210,156,950  cpu_clk_unhalted.thread
      <SNIP>

           5.638075538 seconds time elapsed

     [root@jouet ~]#

   - Improve shell auto-completion of perf events (Jin Yao)

   - 'perf probe' improvements (Masami Hiramatsu)

   - Improve PMU infrastructure to support amp64's ThunderX2
     implementation defined core events (Ganapatrao Kulkarni)

   - Various annotation related improvements and fixes (Thomas Richter)

   - Clarify usage of 'overwrite' and 'backward' in the evlist/mmap
     code, removing the 'overwrite' parameter from several functions as
     it was always used it as 'false' (Wang Nan)

   - Fix/improve 'perf record' reverse recording support (Wang Nan)

   - Improve command line options documentation (Sihyeon Jang)

   - Optimize sample parsing for ordering events, where we don't need to
     parse all the PERF_SAMPLE_ bits, just the ones leading to the
     timestamp needed to reorder events (Jiri Olsa)

   - Generalize the annotation code to support other source information
     besides objdump/DWARF obtained ones, starting with python scripts,
     that will is slated to be merged soon (Jiri Olsa)

   - ... and a lot more that I failed to list, see the shortlog and
     changelog for details"

* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (262 commits)
  perf trace beauty flock: Move to separate object file
  perf evlist: Remove fcntl.h from evlist.h
  perf trace beauty futex: Beautify FUTEX_BITSET_MATCH_ANY
  perf trace: Do not print from time delta for interrupted syscall lines
  perf trace: Add --print-sample
  perf bpf: Remove misplaced __maybe_unused attribute
  MAINTAINERS: Adding entry for CoreSight trace decoding
  perf tools: Add mechanic to synthesise CoreSight trace packets
  perf tools: Add full support for CoreSight trace decoding
  pert tools: Add queue management functionality
  perf tools: Add functionality to communicate with the openCSD decoder
  perf tools: Add support for decoding CoreSight trace data
  perf tools: Add decoder mechanic to support dumping trace data
  perf tools: Add processing of coresight metadata
  perf tools: Add initial entry point for decoder CoreSight traces
  perf tools: Integrating the CoreSight decoding library
  perf vendor events intel: Update IvyTown files to V20
  perf vendor events intel: Update IvyBridge files to V20
  perf vendor events intel: Update BroadwellDE events to V7
  perf vendor events intel: Update SkylakeX events to V1.06
  ...

Commit: d8b91dde38f4c43bd0bbbf17a90f735b16aaff2c
Parents: 5e7481a2 · e4c1091c

Merge commit. Changes below are compared with the first parent: 5e7481a2.

Changes

270 files changed · +18523 −15234

File	Status	Add	Del	Content
Documentation/process/kernel-enforcement-statement.rst	modified	+1	−0	View file
MAINTAINERS	modified	+2	−1	View file
arch/x86/events/msr.c	modified	+43	−27	View file
arch/x86/include/asm/uprobes.h	modified	+4	−0	View file
arch/x86/kernel/uprobes.c	modified	+103	−4	View file
arch/x86/tools/Makefile	modified	+6	−6	View file
arch/x86/tools/test_get_len.c → arch/x86/tools/insn_decoder_test.c	renamed	+25	−18	View file
arch/x86/tools/distill.awk → arch/x86/tools/objdump_reformat.awk	renamed	+2	−2	View file
include/uapi/linux/perf_event.h	modified	+7	−3	View file
kernel/events/callchain.c	modified	+0	−15	View file
kernel/events/core.c	modified	+39	−15	View file
kernel/events/internal.h	modified	+0	−4	View file
tools/arch/alpha/include/uapi/asm/errno.h	added	+128	−0	View file
tools/arch/mips/include/asm/errno.h	added	+17	−0	View file
tools/arch/mips/include/uapi/asm/errno.h	added	+130	−0	View file
tools/arch/parisc/include/uapi/asm/errno.h	added	+128	−0	View file
tools/arch/powerpc/include/uapi/asm/errno.h	added	+10	−0	View file
tools/arch/s390/include/uapi/asm/unistd.h	added	+412	−0	View file
tools/arch/sparc/include/uapi/asm/errno.h	added	+118	−0	View file
tools/arch/x86/include/asm/cpufeatures.h	modified	+3	−1	View file
tools/arch/x86/include/asm/disabled-features.h	modified	+7	−1	View file
tools/arch/x86/include/uapi/asm/errno.h	added	+1	−0	View file
tools/build/Makefile.feature	modified	+3	−1	View file
tools/build/feature/Makefile	modified	+10	−1	View file
tools/build/feature/test-all.c	modified	+10	−0	View file
tools/build/feature/test-libopencsd.c	added	+8	−0	View file
tools/build/feature/test-pthread-barrier.c	added	+12	−0	View file
tools/include/uapi/asm-generic/errno-base.h	added	+40	−0	View file
tools/include/uapi/asm-generic/errno.h	added	+123	−0	View file
tools/include/uapi/linux/perf_event.h	modified	+7	−3	View file
tools/lib/traceevent/event-parse.c	modified	+51	−11	View file
tools/lib/traceevent/event-plugin.c	modified	+9	−15	View file
tools/lib/traceevent/kbuffer-parse.c	modified	+2	−2	View file
tools/lib/traceevent/parse-filter.c	modified	+14	−8	View file
tools/perf/Build	modified	+2	−2	View file
tools/perf/Documentation/perf-buildid-cache.txt	modified	+3	−0	View file
tools/perf/Documentation/perf-evlist.txt	modified	+4	−0	View file
tools/perf/Documentation/perf-inject.txt	modified	+4	−0	View file
tools/perf/Documentation/perf-lock.txt	modified	+4	−0	View file
tools/perf/Documentation/perf-probe.txt	modified	+17	−1	View file
tools/perf/Documentation/perf-record.txt	modified	+3	−0	View file
tools/perf/Documentation/perf-report.txt	modified	+36	−1	View file
tools/perf/Documentation/perf-sched.txt	modified	+4	−0	View file
tools/perf/Documentation/perf-script.txt	modified	+46	−1	View file
tools/perf/Documentation/perf-timechart.txt	modified	+3	−1	View file
tools/perf/Documentation/perf-top.txt	modified	+6	−0	View file
tools/perf/Documentation/perf-trace.txt	modified	+14	−6	View file
tools/perf/Documentation/perf.data-file-format.txt	modified	+27	−0	View file
tools/perf/Documentation/tips.txt	modified	+2	−0	View file
tools/perf/Makefile.config	modified	+55	−10	View file
tools/perf/Makefile.perf	modified	+14	−3	View file
tools/perf/arch/arm/util/auxtrace.c	modified	+71	−6	View file
tools/perf/arch/arm/util/pmu.c	modified	+6	−0	View file
tools/perf/arch/arm64/util/Build	modified	+4	−1	View file
tools/perf/arch/arm64/util/arm-spe.c	added	+225	−0	View file
tools/perf/arch/arm64/util/header.c	added	+65	−0	View file
tools/perf/arch/arm64/util/sym-handling.c	added	+22	−0	View file
tools/perf/arch/common.c	modified	+3	−41	View file
tools/perf/arch/common.h	modified	+0	−1	View file
tools/perf/arch/powerpc/util/header.c	modified	+1	−1	View file
tools/perf/arch/powerpc/util/sym-handling.c	modified	+8	−0	View file
tools/perf/arch/s390/Makefile	modified	+21	−0	View file
tools/perf/arch/s390/annotate/instructions.c	modified	+2	−1	View file
tools/perf/arch/s390/entry/syscalls/mksyscalltbl	added	+36	−0	View file
tools/perf/arch/x86/tests/perf-time-to-tsc.c	modified	+1	−1	View file
tools/perf/arch/x86/util/header.c	modified	+2	−2	View file
tools/perf/arch/x86/util/unwind-libunwind.c	modified	+1	−1	View file
tools/perf/bench/futex-hash.c	modified	+12	−8	View file
tools/perf/bench/futex-lock-pi.c	modified	+14	−9	View file
tools/perf/bench/futex-requeue.c	modified	+13	−9	View file
tools/perf/bench/futex-wake-parallel.c	modified	+35	−11	View file
tools/perf/bench/futex-wake.c	modified	+11	−7	View file
tools/perf/builtin-buildid-cache.c	modified	+2	−2	View file
tools/perf/builtin-c2c.c	modified	+7	−9	View file
tools/perf/builtin-help.c	modified	+1	−1	View file
tools/perf/builtin-inject.c	modified	+1	−2	View file
tools/perf/builtin-kvm.c	modified	+8	−5	View file
tools/perf/builtin-record.c	modified	+49	−14	View file
tools/perf/builtin-report.c	modified	+267	−16	View file
tools/perf/builtin-script.c	modified	+229	−37	View file
tools/perf/builtin-stat.c	modified	+147	−83	View file
tools/perf/builtin-top.c	modified	+7	−3	View file
tools/perf/builtin-trace.c	modified	+67	−55	View file
tools/perf/check-headers.sh	modified	+10	−1	View file
tools/perf/perf-completion.sh	modified	+43	−4	View file
tools/perf/perf.c	modified	+2	−2	View file
tools/perf/pmu-events/arch/arm64/cavium/thunderx2-imp-def.json	added	+62	−0	View file
tools/perf/pmu-events/arch/arm64/mapfile.csv	added	+15	−0	View file
tools/perf/pmu-events/arch/powerpc/mapfile.csv	modified	+2	−10	View file
tools/perf/pmu-events/arch/powerpc/power9/cache.json	modified	+0	−5	View file
tools/perf/pmu-events/arch/powerpc/power9/frontend.json	modified	+1	−6	View file
tools/perf/pmu-events/arch/powerpc/power9/marked.json	modified	+6	−21	View file
tools/perf/pmu-events/arch/powerpc/power9/other.json	modified	+73	−203	View file
tools/perf/pmu-events/arch/powerpc/power9/pipeline.json	modified	+7	−7	View file
tools/perf/pmu-events/arch/powerpc/power9/pmc.json	modified	+1	−1	View file
tools/perf/pmu-events/arch/powerpc/power9/translation.json	modified	+0	−5	View file
tools/perf/pmu-events/arch/x86/broadwell/cache.json	modified	+378	−177	View file
tools/perf/pmu-events/arch/x86/broadwell/floating-point.json	modified	+51	−57	View file
tools/perf/pmu-events/arch/x86/broadwell/frontend.json	modified	+69	−69	View file
tools/perf/pmu-events/arch/x86/broadwell/memory.json	modified	+205	−5	View file
tools/perf/pmu-events/arch/x86/broadwell/other.json	modified	+10	−10	View file
tools/perf/pmu-events/arch/x86/broadwell/pipeline.json	modified	+613	−603	View file
tools/perf/pmu-events/arch/x86/broadwell/virtual-memory.json	modified	+75	−75	View file
tools/perf/pmu-events/arch/x86/broadwellde/cache.json	modified	+212	−177	View file
tools/perf/pmu-events/arch/x86/broadwellde/floating-point.json	modified	+51	−57	View file
tools/perf/pmu-events/arch/x86/broadwellde/frontend.json	modified	+69	−69	View file
tools/perf/pmu-events/arch/x86/broadwellde/memory.json	modified	+4	−5	View file
tools/perf/pmu-events/arch/x86/broadwellde/other.json	modified	+10	−10	View file
tools/perf/pmu-events/arch/x86/broadwellde/pipeline.json	modified	+612	−602	View file
tools/perf/pmu-events/arch/x86/broadwellde/virtual-memory.json	modified	+75	−75	View file
tools/perf/pmu-events/arch/x86/broadwellx/cache.json	modified	+203	−180	View file
tools/perf/pmu-events/arch/x86/broadwellx/floating-point.json	modified	+51	−57	View file
tools/perf/pmu-events/arch/x86/broadwellx/frontend.json	modified	+69	−69	View file
tools/perf/pmu-events/arch/x86/broadwellx/memory.json	modified	+35	−5	View file
tools/perf/pmu-events/arch/x86/broadwellx/other.json	modified	+10	−10	View file
tools/perf/pmu-events/arch/x86/broadwellx/pipeline.json	modified	+612	−602	View file
tools/perf/pmu-events/arch/x86/broadwellx/virtual-memory.json	modified	+75	−75	View file
tools/perf/pmu-events/arch/x86/goldmont/cache.json	modified	+1081	−163	View file
tools/perf/pmu-events/arch/x86/goldmont/memory.json	modified	+270	−10	View file
tools/perf/pmu-events/arch/x86/goldmont/other.json	modified	+42	−12	View file
tools/perf/pmu-events/arch/x86/goldmont/pipeline.json	modified	+264	−242	View file
tools/perf/pmu-events/arch/x86/goldmont/virtual-memory.json	modified	+30	−30	View file
tools/perf/pmu-events/arch/x86/haswell/cache.json	modified	+194	−171	View file
tools/perf/pmu-events/arch/x86/haswell/floating-point.json	modified	+10	−10	View file
tools/perf/pmu-events/arch/x86/haswell/frontend.json	modified	+66	−66	View file
tools/perf/pmu-events/arch/x86/haswell/memory.json	modified	+21	−0	View file
tools/perf/pmu-events/arch/x86/haswell/other.json	modified	+10	−10	View file
tools/perf/pmu-events/arch/x86/haswell/pipeline.json	modified	+570	−561	View file
tools/perf/pmu-events/arch/x86/haswell/virtual-memory.json	modified	+106	−106	View file
tools/perf/pmu-events/arch/x86/haswellx/cache.json	modified	+200	−177	View file
tools/perf/pmu-events/arch/x86/haswellx/floating-point.json	modified	+10	−10	View file
tools/perf/pmu-events/arch/x86/haswellx/frontend.json	modified	+66	−66	View file
tools/perf/pmu-events/arch/x86/haswellx/memory.json	modified	+28	−0	View file
tools/perf/pmu-events/arch/x86/haswellx/other.json	modified	+10	−10	View file
tools/perf/pmu-events/arch/x86/haswellx/pipeline.json	modified	+571	−562	View file
tools/perf/pmu-events/arch/x86/haswellx/virtual-memory.json	modified	+106	−106	View file
tools/perf/pmu-events/arch/x86/ivybridge/cache.json	modified	+111	−132	View file
tools/perf/pmu-events/arch/x86/ivybridge/frontend.json	modified	+61	−61	View file
tools/perf/pmu-events/arch/x86/ivybridge/memory.json	modified	+12	−12	View file
tools/perf/pmu-events/arch/x86/ivybridge/other.json	modified	+10	−10	View file
tools/perf/pmu-events/arch/x86/ivybridge/pipeline.json	modified	+412	−410	View file
tools/perf/pmu-events/arch/x86/ivybridge/virtual-memory.json	modified	+30	−30	View file
tools/perf/pmu-events/arch/x86/ivytown/cache.json	modified	+112	−124	View file
tools/perf/pmu-events/arch/x86/ivytown/frontend.json	modified	+61	−61	View file
tools/perf/pmu-events/arch/x86/ivytown/memory.json	modified	+12	−12	View file
tools/perf/pmu-events/arch/x86/ivytown/other.json	modified	+10	−10	View file
tools/perf/pmu-events/arch/x86/ivytown/pipeline.json	modified	+412	−410	View file
tools/perf/pmu-events/arch/x86/ivytown/virtual-memory.json	modified	+30	−30	View file
tools/perf/pmu-events/arch/x86/mapfile.csv	modified	+1	−4	View file
tools/perf/pmu-events/arch/x86/silvermont/cache.json	modified	+2	−1	View file
tools/perf/pmu-events/arch/x86/skylake/cache.json	modified	+515	−3875	View file
tools/perf/pmu-events/arch/x86/skylake/floating-point.json	modified	+2	−3	View file
tools/perf/pmu-events/arch/x86/skylake/frontend.json	modified	+121	−111	View file
tools/perf/pmu-events/arch/x86/skylake/memory.json	modified	+212	−1906	View file
tools/perf/pmu-events/arch/x86/skylake/other.json	modified	+38	−2	View file
tools/perf/pmu-events/arch/x86/skylake/pipeline.json	modified	+492	−481	View file
tools/perf/pmu-events/arch/x86/skylake/virtual-memory.json	modified	+137	−125	View file
tools/perf/pmu-events/arch/x86/skylakex/cache.json	modified	+167	−90	View file
tools/perf/pmu-events/arch/x86/skylakex/floating-point.json	modified	+1	−2	View file
tools/perf/pmu-events/arch/x86/skylakex/frontend.json	modified	+24	−24	View file
tools/perf/pmu-events/arch/x86/skylakex/memory.json	modified	+154	−77	View file
tools/perf/pmu-events/arch/x86/skylakex/other.json	modified	+93	−1	View file
tools/perf/pmu-events/arch/x86/skylakex/pipeline.json	modified	+22	−22	View file
tools/perf/pmu-events/arch/x86/skylakex/virtual-memory.json	modified	+21	−21	View file
tools/perf/pmu-events/jevents.c	modified	+38	−1	View file
tools/perf/scripts/python/bin/mem-phys-addr-record	added	+19	−0	View file
tools/perf/scripts/python/bin/mem-phys-addr-report	added	+3	−0	View file
tools/perf/scripts/python/mem-phys-addr.py	added	+95	−0	View file
tools/perf/tests/attr.c	modified	+6	−0	View file
tools/perf/tests/backward-ring-buffer.c	modified	+3	−3	View file
tools/perf/tests/bp_signal.c	modified	+1	−1	View file
tools/perf/tests/bpf-script-example.c	modified	+2	−2	View file
tools/perf/tests/bpf.c	modified	+32	−36	View file
tools/perf/tests/builtin-test.c	modified	+5	−5	View file
tools/perf/tests/code-reading.c	modified	+1	−1	View file
tools/perf/tests/dwarf-unwind.c	modified	+1	−0	View file
tools/perf/tests/keep-tracking.c	modified	+1	−1	View file
tools/perf/tests/mmap-basic.c	modified	+1	−1	View file
tools/perf/tests/openat-syscall-tp-fields.c	modified	+4	−1	View file
tools/perf/tests/parse-events.c	modified	+0	−1	View file
tools/perf/tests/perf-record.c	modified	+1	−1	View file
tools/perf/tests/sample-parsing.c	modified	+1	−1	View file
tools/perf/tests/shell/trace+probe_vfs_getname.sh	modified	+3	−4	View file
tools/perf/tests/sw-clock.c	modified	+1	−1	View file
tools/perf/tests/switch-tracking.c	modified	+1	−1	View file
tools/perf/tests/task-exit.c	modified	+1	−1	View file
tools/perf/tests/thread-map.c	modified	+1	−1	View file
tools/perf/trace/beauty/Build	modified	+1	−0	View file
tools/perf/trace/beauty/arch_errno_names.c	added	+1	−0	View file
tools/perf/trace/beauty/arch_errno_names.sh	added	+100	−0	View file
tools/perf/trace/beauty/beauty.h	modified	+5	−0	View file
tools/perf/trace/beauty/flock.c	modified	+5	−5	View file
tools/perf/trace/beauty/futex_val3.c	added	+18	−0	View file
tools/perf/ui/browsers/annotate.c	modified	+197	−202	View file
tools/perf/ui/gtk/annotate.c	modified	+13	−12	View file
tools/perf/util/Build	modified	+9	−1	View file
tools/perf/util/annotate.c	modified	+340	−312	View file
tools/perf/util/annotate.h	modified	+42	−34	View file
tools/perf/util/arm-spe-pkt-decoder.c	added	+462	−0	View file
tools/perf/util/arm-spe-pkt-decoder.h	added	+43	−0	View file
tools/perf/util/arm-spe.c	added	+231	−0	View file
tools/perf/util/arm-spe.h	added	+31	−0	View file
tools/perf/util/auxtrace.c	modified	+5	−3	View file
tools/perf/util/auxtrace.h	modified	+1	−0	View file
tools/perf/util/bpf-loader.c	modified	+2	−2	View file
tools/perf/util/callchain.c	modified	+10	−0	View file
tools/perf/util/callchain.h	modified	+2	−0	View file
tools/perf/util/cgroup.c	modified	+3	−0	View file
tools/perf/util/cs-etm-decoder/Build	added	+1	−0	View file
tools/perf/util/cs-etm-decoder/cs-etm-decoder.c	added	+513	−0	View file
tools/perf/util/cs-etm-decoder/cs-etm-decoder.h	added	+105	−0	View file
tools/perf/util/cs-etm.c	added	+1023	−0	View file
tools/perf/util/cs-etm.h	modified	+18	−0	View file
tools/perf/util/data.c	modified	+0	−10	View file
tools/perf/util/dso.c	modified	+1	−1	View file
tools/perf/util/env.c	modified	+47	−0	View file
tools/perf/util/env.h	modified	+2	−0	View file
tools/perf/util/event.c	modified	+8	−0	View file
tools/perf/util/event.h	modified	+2	−2	View file
tools/perf/util/evlist.c	modified	+43	−27	View file
tools/perf/util/evlist.h	modified	+9	−6	View file
tools/perf/util/evsel.c	modified	+163	−64	View file
tools/perf/util/evsel.h	modified	+7	−5	View file
tools/perf/util/generate-cmdlist.sh	modified	+1	−1	View file
tools/perf/util/header.c	modified	+128	−2	View file
tools/perf/util/header.h	modified	+8	−1	View file
tools/perf/util/intel-bts.c	modified	+1	−5	View file
tools/perf/util/intel-pt-decoder/Build	modified	+15	−9	View file
tools/perf/util/intel-pt.c	modified	+3	−8	View file
tools/perf/util/machine.c	modified	+2	−2	View file
tools/perf/util/map.c	modified	+1	−1	View file
tools/perf/util/metricgroup.c	modified	+6	−4	View file
tools/perf/util/mmap.c	modified	+25	−48	View file
tools/perf/util/mmap.h	modified	+2	−2	View file
tools/perf/util/ordered-events.c	modified	+1	−2	View file
tools/perf/util/ordered-events.h	modified	+1	−1	View file
tools/perf/util/parse-events.c	modified	+3	−0	View file
tools/perf/util/path.c	modified	+14	−0	View file
tools/perf/util/path.h	modified	+3	−0	View file
tools/perf/util/pmu.c	modified	+71	−16	View file
tools/perf/util/pmu.h	modified	+1	−1	View file
tools/perf/util/probe-event.c	modified	+61	−24	View file
tools/perf/util/python-ext-sources	modified	+1	−0	View file
tools/perf/util/python.c	modified	+1	−1	View file
tools/perf/util/rblist.c	modified	+12	−7	View file
tools/perf/util/rblist.h	modified	+1	−0	View file
tools/perf/util/scripting-engines/trace-event-python.c	modified	+2	−1	View file
tools/perf/util/session.c	modified	+26	−28	View file
tools/perf/util/session.h	modified	+1	−1	View file
tools/perf/util/sort.c	modified	+12	−8	View file
tools/perf/util/srcline.c	modified	+5	−4	View file
tools/perf/util/srcline.h	modified	+3	−2	View file
tools/perf/util/stat-shadow.c	modified	+258	−168	View file
tools/perf/util/stat.c	modified	+11	−4	View file
tools/perf/util/stat.h	modified	+60	−3	View file
tools/perf/util/string.c	modified	+46	−0	View file
tools/perf/util/string2.h	modified	+2	−0	View file
tools/perf/util/symbol.c	modified	+5	−0	View file
tools/perf/util/symbol.h	modified	+1	−0	View file
tools/perf/util/syscalltbl.c	modified	+4	−0	View file
tools/perf/util/target.h	modified	+7	−0	View file
tools/perf/util/thread_map.c	modified	+20	−7	View file
tools/perf/util/thread_map.h	modified	+2	−1	View file
tools/perf/util/time-utils.c	modified	+289	−12	View file
tools/perf/util/time-utils.h	modified	+8	−0	View file
tools/perf/util/tool.h	modified	+1	−0	View file
tools/perf/util/unwind-libunwind-local.c	modified	+3	−6	View file
tools/perf/util/unwind-libunwind.c	modified	+2	−2	View file
tools/perf/util/util.c	modified	+1	−1	View file
tools/perf/util/util.h	modified	+10	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/process/kernel-enforcement-statement.rst

View file

diff --git a/Documentation/process/kernel-enforcement-statement.rst b/Documentation/process/kernel-enforcement-statement.rst
index b317067..bfa6a78 100644
--- a/Documentation/process/kernel-enforcement-statement.rst
+++ b/Documentation/process/kernel-enforcement-statement.rst
@@ -118,6 +118,7 @@ we might work for today, have in the past, or will in the future.
   - Mike Marshall
   - Chris Mason
   - Paul E. McKenney
+  - Arnaldo Carvalho de Melo
   - David S. Miller
   - Ingo Molnar
   - Kuninori Morimoto

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 859a28d..217a875 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1327,7 +1327,8 @@ F:	tools/perf/arch/arm/util/pmu.c
 F:	tools/perf/arch/arm/util/auxtrace.c
 F:	tools/perf/arch/arm/util/cs-etm.c
 F:	tools/perf/arch/arm/util/cs-etm.h
-F:	tools/perf/util/cs-etm.h
+F:	tools/perf/util/cs-etm.*
+F:	tools/perf/util/cs-etm-decoder/*
 
 ARM/CORGI MACHINE SUPPORT
 M:	Richard Purdie <[email protected]>

arch/x86/events/msr.c

View file

diff --git a/arch/x86/events/msr.c b/arch/x86/events/msr.c
index 14efaa0..18e2628 100644
--- a/arch/x86/events/msr.c
+++ b/arch/x86/events/msr.c
@@ -10,7 +10,9 @@ enum perf_msr_id {
 	PERF_MSR_SMI			= 4,
 	PERF_MSR_PTSC			= 5,
 	PERF_MSR_IRPERF			= 6,
-
+	PERF_MSR_THERM			= 7,
+	PERF_MSR_THERM_SNAP		= 8,
+	PERF_MSR_THERM_UNIT		= 9,
 	PERF_MSR_EVENT_MAX,
 };
 
@@ -29,6 +31,11 @@ static bool test_irperf(int idx)
 	return boot_cpu_has(X86_FEATURE_IRPERF);
 }
 
+static bool test_therm_status(int idx)
+{
+	return boot_cpu_has(X86_FEATURE_DTHERM);
+}
+
 static bool test_intel(int idx)
 {
 	if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL ||
@@ -95,22 +102,28 @@ struct perf_msr {
 	bool	(*test)(int idx);
 };
 
-PMU_EVENT_ATTR_STRING(tsc,    evattr_tsc,    "event=0x00");
-PMU_EVENT_ATTR_STRING(aperf,  evattr_aperf,  "event=0x01");
-PMU_EVENT_ATTR_STRING(mperf,  evattr_mperf,  "event=0x02");
-PMU_EVENT_ATTR_STRING(pperf,  evattr_pperf,  "event=0x03");
-PMU_EVENT_ATTR_STRING(smi,    evattr_smi,    "event=0x04");
-PMU_EVENT_ATTR_STRING(ptsc,   evattr_ptsc,   "event=0x05");
-PMU_EVENT_ATTR_STRING(irperf, evattr_irperf, "event=0x06");
+PMU_EVENT_ATTR_STRING(tsc,				evattr_tsc,		"event=0x00"	);
+PMU_EVENT_ATTR_STRING(aperf,				evattr_aperf,		"event=0x01"	);
+PMU_EVENT_ATTR_STRING(mperf,				evattr_mperf,		"event=0x02"	);
+PMU_EVENT_ATTR_STRING(pperf,				evattr_pperf,		"event=0x03"	);
+PMU_EVENT_ATTR_STRING(smi,				evattr_smi,		"event=0x04"	);
+PMU_EVENT_ATTR_STRING(ptsc,				evattr_ptsc,		"event=0x05"	);
+PMU_EVENT_ATTR_STRING(irperf,				evattr_irperf,		"event=0x06"	);
+PMU_EVENT_ATTR_STRING(cpu_thermal_margin,		evattr_therm,		"event=0x07"	);
+PMU_EVENT_ATTR_STRING(cpu_thermal_margin.snapshot,	evattr_therm_snap,	"1"		);
+PMU_EVENT_ATTR_STRING(cpu_thermal_margin.unit,		evattr_therm_unit,	"C"		);
 
 static struct perf_msr msr[] = {
-	[PERF_MSR_TSC]    = { 0,		&evattr_tsc,	NULL,		 },
-	[PERF_MSR_APERF]  = { MSR_IA32_APERF,	&evattr_aperf,	test_aperfmperf, },
-	[PERF_MSR_MPERF]  = { MSR_IA32_MPERF,	&evattr_mperf,	test_aperfmperf, },
-	[PERF_MSR_PPERF]  = { MSR_PPERF,	&evattr_pperf,	test_intel,	 },
-	[PERF_MSR_SMI]    = { MSR_SMI_COUNT,	&evattr_smi,	test_intel,	 },
-	[PERF_MSR_PTSC]   = { MSR_F15H_PTSC,	&evattr_ptsc,	test_ptsc,	 },
-	[PERF_MSR_IRPERF] = { MSR_F17H_IRPERF,	&evattr_irperf,	test_irperf,	 },
+	[PERF_MSR_TSC]		= { 0,				&evattr_tsc,		NULL,			},
+	[PERF_MSR_APERF]	= { MSR_IA32_APERF,		&evattr_aperf,		test_aperfmperf,	},
+	[PERF_MSR_MPERF]	= { MSR_IA32_MPERF,		&evattr_mperf,		test_aperfmperf,	},
+	[PERF_MSR_PPERF]	= { MSR_PPERF,			&evattr_pperf,		test_intel,		},
+	[PERF_MSR_SMI]		= { MSR_SMI_COUNT,		&evattr_smi,		test_intel,		},
+	[PERF_MSR_PTSC]		= { MSR_F15H_PTSC,		&evattr_ptsc,		test_ptsc,		},
+	[PERF_MSR_IRPERF]	= { MSR_F17H_IRPERF,		&evattr_irperf,		test_irperf,		},
+	[PERF_MSR_THERM]	= { MSR_IA32_THERM_STATUS,	&evattr_therm,		test_therm_status,	},
+	[PERF_MSR_THERM_SNAP]	= { MSR_IA32_THERM_STATUS,	&evattr_therm_snap,	test_therm_status,	},
+	[PERF_MSR_THERM_UNIT]	= { MSR_IA32_THERM_STATUS,	&evattr_therm_unit,	test_therm_status,	},
 };
 
 static struct attribute *events_attrs[PERF_MSR_EVENT_MAX + 1] = {
@@ -161,9 +174,9 @@ static int msr_event_init(struct perf_event *event)
 	if (!msr[cfg].attr)
 		return -EINVAL;
 
-	event->hw.idx = -1;
-	event->hw.event_base = msr[cfg].msr;
-	event->hw.config = cfg;
+	event->hw.idx		= -1;
+	event->hw.event_base	= msr[cfg].msr;
+	event->hw.config	= cfg;
 
 	return 0;
 }
@@ -184,7 +197,7 @@ static void msr_event_update(struct perf_event *event)
 	u64 prev, now;
 	s64 delta;
 
-	/* Careful, an NMI might modify the previous event value. */
+	/* Careful, an NMI might modify the previous event value: */
 again:
 	prev = local64_read(&event->hw.prev_count);
 	now = msr_read_counter(event);
@@ -193,17 +206,22 @@ again:
 		goto again;
 
 	delta = now - prev;
-	if (unlikely(event->hw.event_base == MSR_SMI_COUNT))
+	if (unlikely(event->hw.event_base == MSR_SMI_COUNT)) {
 		delta = sign_extend64(delta, 31);
-
-	local64_add(delta, &event->count);
+		local64_add(delta, &event->count);
+	} else if (unlikely(event->hw.event_base == MSR_IA32_THERM_STATUS)) {
+		/* If valid, extract digital readout, otherwise set to -1: */
+		now = now & (1ULL << 31) ? (now >> 16) & 0x3f :  -1;
+		local64_set(&event->count, now);
+	} else {
+		local64_add(delta, &event->count);
+	}
 }
 
 static void msr_event_start(struct perf_event *event, int flags)
 {
-	u64 now;
+	u64 now = msr_read_counter(event);
 
-	now = msr_read_counter(event);
 	local64_set(&event->hw.prev_count, now);
 }
 
@@ -250,9 +268,7 @@ static int __init msr_init(void)
 	for (i = PERF_MSR_TSC + 1; i < PERF_MSR_EVENT_MAX; i++) {
 		u64 val;
 
-		/*
-		 * Virt sucks arse; you cannot tell if a R/O MSR is present :/
-		 */
+		/* Virt sucks; you cannot tell if a R/O MSR is present :/ */
 		if (!msr[i].test(i) || rdmsrl_safe(msr[i].msr, &val))
 			msr[i].attr = NULL;
 	}

arch/x86/include/asm/uprobes.h

View file

diff --git a/arch/x86/include/asm/uprobes.h b/arch/x86/include/asm/uprobes.h
index 74f4c2f..d8bfa98 100644
--- a/arch/x86/include/asm/uprobes.h
+++ b/arch/x86/include/asm/uprobes.h
@@ -53,6 +53,10 @@ struct arch_uprobe {
 			u8	fixups;
 			u8	ilen;
 		} 			defparam;
+		struct {
+			u8	reg_offset;	/* to the start of pt_regs */
+			u8	ilen;
+		}			push;
 	};
 };
 

arch/x86/kernel/uprobes.c

View file

diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
index a3755d2..85c7ef2 100644
--- a/arch/x86/kernel/uprobes.c
+++ b/arch/x86/kernel/uprobes.c
@@ -528,11 +528,11 @@ static int default_pre_xol_op(struct arch_uprobe *auprobe, struct pt_regs *regs)
 	return 0;
 }
 
-static int push_ret_address(struct pt_regs *regs, unsigned long ip)
+static int emulate_push_stack(struct pt_regs *regs, unsigned long val)
 {
 	unsigned long new_sp = regs->sp - sizeof_long();
 
-	if (copy_to_user((void __user *)new_sp, &ip, sizeof_long()))
+	if (copy_to_user((void __user *)new_sp, &val, sizeof_long()))
 		return -EFAULT;
 
 	regs->sp = new_sp;
@@ -566,7 +566,7 @@ static int default_post_xol_op(struct arch_uprobe *auprobe, struct pt_regs *regs
 		regs->ip += correction;
 	} else if (auprobe->defparam.fixups & UPROBE_FIX_CALL) {
 		regs->sp += sizeof_long(); /* Pop incorrect return address */
-		if (push_ret_address(regs, utask->vaddr + auprobe->defparam.ilen))
+		if (emulate_push_stack(regs, utask->vaddr + auprobe->defparam.ilen))
 			return -ERESTART;
 	}
 	/* popf; tell the caller to not touch TF */
@@ -655,7 +655,7 @@ static bool branch_emulate_op(struct arch_uprobe *auprobe, struct pt_regs *regs)
 		 *
 		 * But there is corner case, see the comment in ->post_xol().
 		 */
-		if (push_ret_address(regs, new_ip))
+		if (emulate_push_stack(regs, new_ip))
 			return false;
 	} else if (!check_jmp_cond(auprobe, regs)) {
 		offs = 0;
@@ -665,6 +665,16 @@ static bool branch_emulate_op(struct arch_uprobe *auprobe, struct pt_regs *regs)
 	return true;
 }
 
+static bool push_emulate_op(struct arch_uprobe *auprobe, struct pt_regs *regs)
+{
+	unsigned long *src_ptr = (void *)regs + auprobe->push.reg_offset;
+
+	if (emulate_push_stack(regs, *src_ptr))
+		return false;
+	regs->ip += auprobe->push.ilen;
+	return true;
+}
+
 static int branch_post_xol_op(struct arch_uprobe *auprobe, struct pt_regs *regs)
 {
 	BUG_ON(!branch_is_call(auprobe));
@@ -703,6 +713,10 @@ static const struct uprobe_xol_ops branch_xol_ops = {
 	.post_xol = branch_post_xol_op,
 };
 
+static const struct uprobe_xol_ops push_xol_ops = {
+	.emulate  = push_emulate_op,
+};
+
 /* Returns -ENOSYS if branch_xol_ops doesn't handle this insn */
 static int branch_setup_xol_ops(struct arch_uprobe *auprobe, struct insn *insn)
 {
@@ -750,6 +764,87 @@ static int branch_setup_xol_ops(struct arch_uprobe *auprobe, struct insn *insn)
 	return 0;
 }
 
+/* Returns -ENOSYS if push_xol_ops doesn't handle this insn */
+static int push_setup_xol_ops(struct arch_uprobe *auprobe, struct insn *insn)
+{
+	u8 opc1 = OPCODE1(insn), reg_offset = 0;
+
+	if (opc1 < 0x50 || opc1 > 0x57)
+		return -ENOSYS;
+
+	if (insn->length > 2)
+		return -ENOSYS;
+	if (insn->length == 2) {
+		/* only support rex_prefix 0x41 (x64 only) */
+#ifdef CONFIG_X86_64
+		if (insn->rex_prefix.nbytes != 1 ||
+		    insn->rex_prefix.bytes[0] != 0x41)
+			return -ENOSYS;
+
+		switch (opc1) {
+		case 0x50:
+			reg_offset = offsetof(struct pt_regs, r8);
+			break;
+		case 0x51:
+			reg_offset = offsetof(struct pt_regs, r9);
+			break;
+		case 0x52:
+			reg_offset = offsetof(struct pt_regs, r10);
+			break;
+		case 0x53:
+			reg_offset = offsetof(struct pt_regs, r11);
+			break;
+		case 0x54:
+			reg_offset = offsetof(struct pt_regs, r12);
+			break;
+		case 0x55:
+			reg_offset = offsetof(struct pt_regs, r13);
+			break;
+		case 0x56:
+			reg_offset = offsetof(struct pt_regs, r14);
+			break;
+		case 0x57:
+			reg_offset = offsetof(struct pt_regs, r15);
+			break;
+		}
+#else
+		return -ENOSYS;
+#endif
+	} else {
+		switch (opc1) {
+		case 0x50:
+			reg_offset = offsetof(struct pt_regs, ax);
+			break;
+		case 0x51:
+			reg_offset = offsetof(struct pt_regs, cx);
+			break;
+		case 0x52:
+			reg_offset = offsetof(struct pt_regs, dx);
+			break;
+		case 0x53:
+			reg_offset = offsetof(struct pt_regs, bx);
+			break;
+		case 0x54:
+			reg_offset = offsetof(struct pt_regs, sp);
+			break;
+		case 0x55:
+			reg_offset = offsetof(struct pt_regs, bp);
+			break;
+		case 0x56:
+			reg_offset = offsetof(struct pt_regs, si);
+			break;
+		case 0x57:
+			reg_offset = offsetof(struct pt_regs, di);
+			break;
+		}
+	}
+
+	auprobe->push.reg_offset = reg_offset;
+	auprobe->push.ilen = insn->length;
+	auprobe->ops = &push_xol_ops;
+	return 0;
+}
+
 /**
  * arch_uprobe_analyze_insn - instruction analysis including validity and fixups.
  * @mm: the probed address space.
@@ -771,6 +866,10 @@ int arch_uprobe_analyze_insn(struct arch_uprobe *auprobe, struct mm_struct *mm, 
 	if (ret != -ENOSYS)
 		return ret;
 
+	ret = push_setup_xol_ops(auprobe, &insn);
+	if (ret != -ENOSYS)
+		return ret;
+
 	/*
 	 * Figure out which fixups default_post_xol_op() will need to perform,
 	 * and annotate defparam->fixups accordingly.

arch/x86/tools/Makefile

View file

diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
index 972b8e8..09af7ff 100644
--- a/arch/x86/tools/Makefile
+++ b/arch/x86/tools/Makefile
@@ -13,28 +13,28 @@ else
   posttest_64bit = -n
 endif
 
-distill_awk = $(srctree)/arch/x86/tools/distill.awk
+reformatter = $(srctree)/arch/x86/tools/objdump_reformat.awk
 chkobjdump = $(srctree)/arch/x86/tools/chkobjdump.awk
 
 quiet_cmd_posttest = TEST    $@
-      cmd_posttest = ($(OBJDUMP) -v | $(AWK) -f $(chkobjdump)) || $(OBJDUMP) -d -j .text $(objtree)/vmlinux | $(AWK) -f $(distill_awk) | $(obj)/test_get_len $(posttest_64bit) $(posttest_verbose)
+      cmd_posttest = ($(OBJDUMP) -v | $(AWK) -f $(chkobjdump)) || $(OBJDUMP) -d -j .text $(objtree)/vmlinux | $(AWK) -f $(reformatter) | $(obj)/insn_decoder_test $(posttest_64bit) $(posttest_verbose)
 
 quiet_cmd_sanitytest = TEST    $@
       cmd_sanitytest = $(obj)/insn_sanity $(posttest_64bit) -m 1000000
 
-posttest: $(obj)/test_get_len vmlinux $(obj)/insn_sanity
+posttest: $(obj)/insn_decoder_test vmlinux $(obj)/insn_sanity
 	$(call cmd,posttest)
 	$(call cmd,sanitytest)
 
-hostprogs-y	+= test_get_len insn_sanity
+hostprogs-y	+= insn_decoder_test insn_sanity
 
 # -I needed for generated C source and C source which in the kernel tree.
-HOSTCFLAGS_test_get_len.o := -Wall -I$(objtree)/arch/x86/lib/ -I$(srctree)/arch/x86/include/uapi/ -I$(srctree)/arch/x86/include/ -I$(srctree)/arch/x86/lib/ -I$(srctree)/include/uapi/
+HOSTCFLAGS_insn_decoder_test.o := -Wall -I$(objtree)/arch/x86/lib/ -I$(srctree)/arch/x86/include/uapi/ -I$(srctree)/arch/x86/include/ -I$(srctree)/arch/x86/lib/ -I$(srctree)/include/uapi/
 
 HOSTCFLAGS_insn_sanity.o := -Wall -I$(objtree)/arch/x86/lib/ -I$(srctree)/arch/x86/include/ -I$(srctree)/arch/x86/lib/ -I$(srctree)/include/
 
 # Dependencies are also needed.
-$(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/inat.c $(srctree)/arch/x86/include/asm/inat_types.h $(srctree)/arch/x86/include/asm/inat.h $(srctree)/arch/x86/include/asm/insn.h $(objtree)/arch/x86/lib/inat-tables.c
+$(obj)/insn_decoder_test.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/inat.c $(srctree)/arch/x86/include/asm/inat_types.h $(srctree)/arch/x86/include/asm/inat.h $(srctree)/arch/x86/include/asm/insn.h $(objtree)/arch/x86/lib/inat-tables.c
 
 $(obj)/insn_sanity.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/inat.c $(srctree)/arch/x86/include/asm/inat_types.h $(srctree)/arch/x86/include/asm/inat.h $(srctree)/arch/x86/include/asm/insn.h $(objtree)/arch/x86/lib/inat-tables.c
 

arch/x86/tools/insn_decoder_test.c

View file

diff --git a/arch/x86/tools/test_get_len.c b/arch/x86/tools/insn_decoder_test.c
similarity index 86%
rename from arch/x86/tools/test_get_len.c
rename to arch/x86/tools/insn_decoder_test.c
index ecf31e0..a3b4fd9 100644
--- a/arch/x86/tools/test_get_len.c
+++ b/arch/x86/tools/insn_decoder_test.c
@@ -9,10 +9,6 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
  * Copyright (C) IBM Corporation, 2009
  */
 
@@ -21,6 +17,7 @@
 #include <string.h>
 #include <assert.h>
 #include <unistd.h>
+#include <stdarg.h>
 
 #define unlikely(cond) (cond)
 
@@ -33,7 +30,7 @@
  * particular.  See if insn_get_length() and the disassembler agree
  * on the length of each instruction in an elf disassembly.
  *
- * Usage: objdump -d a.out | awk -f distill.awk | ./test_get_len
+ * Usage: objdump -d a.out | awk -f objdump_reformat.awk | ./insn_decoder_test
  */
 
 const char *prog;
@@ -42,8 +39,8 @@ static int x86_64;
 
 static void usage(void)
 {
-	fprintf(stderr, "Usage: objdump -d a.out | awk -f distill.awk |"
-		" %s [-y|-n] [-v]\n", prog);
+	fprintf(stderr, "Usage: objdump -d a.out | awk -f objdump_reformat.awk"
+		" | %s [-y|-n] [-v]\n", prog);
 	fprintf(stderr, "\t-y	64bit mode\n");
 	fprintf(stderr, "\t-n	32bit mode\n");
 	fprintf(stderr, "\t-v	verbose mode\n");
@@ -52,10 +49,21 @@ static void usage(void)
 
 static void malformed_line(const char *line, int line_nr)
 {
-	fprintf(stderr, "%s: malformed line %d:\n%s", prog, line_nr, line);
+	fprintf(stderr, "%s: error: malformed line %d:\n%s",
+		prog, line_nr, line);
 	exit(3);
 }
 
+static void pr_warn(const char *fmt, ...)
+{
+	va_list ap;
+
+	fprintf(stderr, "%s: warning: ", prog);
+	va_start(ap, fmt);
+	vfprintf(stderr, fmt, ap);
+	va_end(ap);
+}
+
 static void dump_field(FILE *fp, const char *name, const char *indent,
 		       struct insn_field *field)
 {
@@ -153,21 +161,20 @@ int main(int argc, char **argv)
 		insn_get_length(&insn);
 		if (insn.length != nb) {
 			warnings++;
-			fprintf(stderr, "Warning: %s found difference at %s\n",
-				prog, sym);
-			fprintf(stderr, "Warning: %s", line);
-			fprintf(stderr, "Warning: objdump says %d bytes, but "
-				"insn_get_length() says %d\n", nb,
-				insn.length);
+			pr_warn("Found an x86 instruction decoder bug, "
+				"please report this.\n", sym);
+			pr_warn("%s", line);
+			pr_warn("objdump says %d bytes, but insn_get_length() "
+				"says %d\n", nb, insn.length);
 			if (verbose)
 				dump_insn(stderr, &insn);
 		}
 	}
 	if (warnings)
-		fprintf(stderr, "Warning: decoded and checked %d"
-			" instructions with %d warnings\n", insns, warnings);
+		pr_warn("Decoded and checked %d instructions with %d "
+			"failures\n", insns, warnings);
 	else
-		fprintf(stdout, "Success: decoded and checked %d"
-			" instructions\n", insns);
+		fprintf(stdout, "%s: success: Decoded and checked %d"
+			" instructions\n", prog, insns);
 	return 0;
 }

arch/x86/tools/objdump_reformat.awk

View file

diff --git a/arch/x86/tools/distill.awk b/arch/x86/tools/objdump_reformat.awk
similarity index 95%
rename from arch/x86/tools/distill.awk
rename to arch/x86/tools/objdump_reformat.awk
index e0edecc..f418c91 100644
--- a/arch/x86/tools/distill.awk
+++ b/arch/x86/tools/objdump_reformat.awk
@@ -1,7 +1,7 @@
 #!/bin/awk -f
 # SPDX-License-Identifier: GPL-2.0
-# Usage: objdump -d a.out | awk -f distill.awk | ./test_get_len
-# Distills the disassembly as follows:
+# Usage: objdump -d a.out | awk -f objdump_reformat.awk | ./insn_decoder_test
+# Reformats the disassembly as follows:
 # - Removes all lines except the disassembled instructions.
 # - For instructions that exceed 1 line (7 bytes), crams all the hex bytes
 # into a single line.

include/uapi/linux/perf_event.h

View file

diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index b9a4953..c77c9a2 100644
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -612,9 +612,12 @@ struct perf_event_mmap_page {
  */
 #define PERF_RECORD_MISC_PROC_MAP_PARSE_TIMEOUT	(1 << 12)
 /*
- * PERF_RECORD_MISC_MMAP_DATA and PERF_RECORD_MISC_COMM_EXEC are used on
- * different events so can reuse the same bit position.
- * Ditto PERF_RECORD_MISC_SWITCH_OUT.
+ * Following PERF_RECORD_MISC_* are used on different
+ * events, so can reuse the same bit position:
+ *
+ *   PERF_RECORD_MISC_MMAP_DATA  - PERF_RECORD_MMAP* events
+ *   PERF_RECORD_MISC_COMM_EXEC  - PERF_RECORD_COMM event
+ *   PERF_RECORD_MISC_SWITCH_OUT - PERF_RECORD_SWITCH* events
  */
 #define PERF_RECORD_MISC_MMAP_DATA		(1 << 13)
 #define PERF_RECORD_MISC_COMM_EXEC		(1 << 13)
@@ -864,6 +867,7 @@ enum perf_event_type {
 	 *	struct perf_event_header	header;
 	 *	u32				pid;
 	 *	u32				tid;
+	 *	struct sample_id		sample_id;
 	 * };
 	 */
 	PERF_RECORD_ITRACE_START		= 12,

kernel/events/callchain.c

View file

diff --git a/kernel/events/callchain.c b/kernel/events/callchain.c
index 1b2be63..772a43f 100644
--- a/kernel/events/callchain.c
+++ b/kernel/events/callchain.c
@@ -179,21 +179,6 @@ put_callchain_entry(int rctx)
 }
 
 struct perf_callchain_entry *
-perf_callchain(struct perf_event *event, struct pt_regs *regs)
-{
-	bool kernel = !event->attr.exclude_callchain_kernel;
-	bool user   = !event->attr.exclude_callchain_user;
-	/* Disallow cross-task user callchains. */
-	bool crosstask = event->ctx->task && event->ctx->task != current;
-	const u32 max_stack = event->attr.sample_max_stack;
-
-	if (!kernel && !user)
-		return NULL;
-
-	return get_perf_callchain(regs, 0, kernel, user, max_stack, crosstask, true);
-}
-
-struct perf_callchain_entry *
 get_perf_callchain(struct pt_regs *regs, u32 init_nr, bool kernel, bool user,
 		   u32 max_stack, bool crosstask, bool add_mark)
 {

kernel/events/core.c

View file

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 5d8f403..d99fe3f 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -5824,19 +5824,11 @@ void perf_output_sample(struct perf_output_handle *handle,
 		perf_output_read(handle, event);
 
 	if (sample_type & PERF_SAMPLE_CALLCHAIN) {
-		if (data->callchain) {
-			int size = 1;
-
-			if (data->callchain)
-				size += data->callchain->nr;
-
-			size *= sizeof(u64);
+		int size = 1;
 
-			__output_copy(handle, data->callchain, size);
-		} else {
-			u64 nr = 0;
-			perf_output_put(handle, nr);
-		}
+		size += data->callchain->nr;
+		size *= sizeof(u64);
+		__output_copy(handle, data->callchain, size);
 	}
 
 	if (sample_type & PERF_SAMPLE_RAW) {
@@ -5989,6 +5981,26 @@ static u64 perf_virt_to_phys(u64 virt)
 	return phys_addr;
 }
 
+static struct perf_callchain_entry __empty_callchain = { .nr = 0, };
+
+static struct perf_callchain_entry *
+perf_callchain(struct perf_event *event, struct pt_regs *regs)
+{
+	bool kernel = !event->attr.exclude_callchain_kernel;
+	bool user   = !event->attr.exclude_callchain_user;
+	/* Disallow cross-task user callchains. */
+	bool crosstask = event->ctx->task && event->ctx->task != current;
+	const u32 max_stack = event->attr.sample_max_stack;
+	struct perf_callchain_entry *callchain;
+
+	if (!kernel && !user)
+		return &__empty_callchain;
+
+	callchain = get_perf_callchain(regs, 0, kernel, user,
+				       max_stack, crosstask, true);
+	return callchain ?: &__empty_callchain;
+}
+
 void perf_prepare_sample(struct perf_event_header *header,
 			 struct perf_sample_data *data,
 			 struct perf_event *event,