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

Pull perf updates from Ingo Molnar:
 "Kernel improvements:

   - watchdog driver improvements by Li Zefan
   - Power7 CPI stack events related improvements by Sukadev Bhattiprolu
   - event multiplexing via hrtimers and other improvements by Stephane
     Eranian
   - kernel stack use optimization by Andrew Hunter
   - AMD IOMMU uncore PMU support by Suravee Suthikulpanit
   - NMI handling rate-limits by Dave Hansen
   - various hw_breakpoint fixes by Oleg Nesterov
   - hw_breakpoint overflow period sampling and related signal handling
     fixes by Jiri Olsa
   - Intel Haswell PMU support by Andi Kleen

  Tooling improvements:

   - Reset SIGTERM handler in workload child process, fix from David
     Ahern.
   - Makefile reorganization, prep work for Kconfig patches, from Jiri
     Olsa.
   - Add automated make test suite, from Jiri Olsa.
   - Add --percent-limit option to 'top' and 'report', from Namhyung
     Kim.
   - Sorting improvements, from Namhyung Kim.
   - Expand definition of sysfs format attribute, from Michael Ellerman.

  Tooling fixes:

   - 'perf tests' fixes from Jiri Olsa.
   - Make Power7 CPI stack events available in sysfs, from Sukadev
     Bhattiprolu.
   - Handle death by SIGTERM in 'perf record', fix from David Ahern.
   - Fix printing of perf_event_paranoid message, from David Ahern.
   - Handle realloc failures in 'perf kvm', from David Ahern.
   - Fix divide by 0 in variance, from David Ahern.
   - Save parent pid in thread struct, from David Ahern.
   - Handle JITed code in shared memory, from Andi Kleen.
   - Fixes for 'perf diff', from Jiri Olsa.
   - Remove some unused struct members, from Jiri Olsa.
   - Add missing liblk.a dependency for python/perf.so, fix from Jiri
     Olsa.
   - Respect CROSS_COMPILE in liblk.a, from Rabin Vincent.
   - No need to do locking when adding hists in perf report, only 'top'
     needs that, from Namhyung Kim.
   - Fix alignment of symbol column in in the hists browser (top,
     report) when -v is given, from NAmhyung Kim.
   - Fix 'perf top' -E option behavior, from Namhyung Kim.
   - Fix bug in isupper() and islower(), from Sukadev Bhattiprolu.
   - Fix compile errors in bp_signal 'perf test', from Sukadev
     Bhattiprolu.

  ... and more things"

* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (102 commits)
  perf/x86: Disable PEBS-LL in intel_pmu_pebs_disable()
  perf/x86: Fix shared register mutual exclusion enforcement
  perf/x86/intel: Support full width counting
  x86: Add NMI duration tracepoints
  perf: Drop sample rate when sampling is too slow
  x86: Warn when NMI handlers take large amounts of time
  hw_breakpoint: Introduce "struct bp_cpuinfo"
  hw_breakpoint: Simplify *register_wide_hw_breakpoint()
  hw_breakpoint: Introduce cpumask_of_bp()
  hw_breakpoint: Simplify the "weight" usage in toggle_bp_slot() paths
  hw_breakpoint: Simplify list/idx mess in toggle_bp_slot() paths
  perf/x86/intel: Add mem-loads/stores support for Haswell
  perf/x86/intel: Support Haswell/v4 LBR format
  perf/x86/intel: Move NMI clearing to end of PMI handler
  perf/x86/intel: Add Haswell PEBS support
  perf/x86/intel: Add simple Haswell PMU support
  perf/x86/intel: Add Haswell PEBS record support
  perf/x86/intel: Fix sparse warning
  perf/x86/amd: AMD IOMMU Performance Counter PERF uncore PMU implementation
  perf/x86/amd: Add IOMMU Performance Counter resource management
  ...

2 files changed, 33 insertions, 5 deletions

diff --git a/Documentation/ABI/testing/sysfs-bus-event_source-devices-events b/Documentation/ABI/testing/sysfs-bus-event_source-devices-events
index 0adeb524c0d4..8b25ffb42562 100644
--- a/Documentation/ABI/testing/sysfs-bus-event_source-devices-events
+++ b/Documentation/ABI/testing/sysfs-bus-event_source-devices-events
@@ -27,14 +27,36 @@ Description:	Generic performance monitoring events
                 "basename".
 
 
-What:           /sys/devices/cpu/events/PM_LD_MISS_L1
-                /sys/devices/cpu/events/PM_LD_REF_L1
-                /sys/devices/cpu/events/PM_CYC
+What:           /sys/devices/cpu/events/PM_1PLUS_PPC_CMPL
                 /sys/devices/cpu/events/PM_BRU_FIN
-                /sys/devices/cpu/events/PM_GCT_NOSLOT_CYC
                 /sys/devices/cpu/events/PM_BRU_MPRED
-                /sys/devices/cpu/events/PM_INST_CMPL
                 /sys/devices/cpu/events/PM_CMPLU_STALL
+                /sys/devices/cpu/events/PM_CMPLU_STALL_BRU
+                /sys/devices/cpu/events/PM_CMPLU_STALL_DCACHE_MISS
+                /sys/devices/cpu/events/PM_CMPLU_STALL_DFU
+                /sys/devices/cpu/events/PM_CMPLU_STALL_DIV
+                /sys/devices/cpu/events/PM_CMPLU_STALL_ERAT_MISS
+                /sys/devices/cpu/events/PM_CMPLU_STALL_FXU
+                /sys/devices/cpu/events/PM_CMPLU_STALL_IFU
+                /sys/devices/cpu/events/PM_CMPLU_STALL_LSU
+                /sys/devices/cpu/events/PM_CMPLU_STALL_REJECT
+                /sys/devices/cpu/events/PM_CMPLU_STALL_SCALAR
+                /sys/devices/cpu/events/PM_CMPLU_STALL_SCALAR_LONG
+                /sys/devices/cpu/events/PM_CMPLU_STALL_STORE
+                /sys/devices/cpu/events/PM_CMPLU_STALL_THRD
+                /sys/devices/cpu/events/PM_CMPLU_STALL_VECTOR
+                /sys/devices/cpu/events/PM_CMPLU_STALL_VECTOR_LONG
+                /sys/devices/cpu/events/PM_CYC
+                /sys/devices/cpu/events/PM_GCT_NOSLOT_BR_MPRED
+                /sys/devices/cpu/events/PM_GCT_NOSLOT_BR_MPRED_IC_MISS
+                /sys/devices/cpu/events/PM_GCT_NOSLOT_CYC
+                /sys/devices/cpu/events/PM_GCT_NOSLOT_IC_MISS
+                /sys/devices/cpu/events/PM_GRP_CMPL
+                /sys/devices/cpu/events/PM_INST_CMPL
+                /sys/devices/cpu/events/PM_LD_MISS_L1
+                /sys/devices/cpu/events/PM_LD_REF_L1
+                /sys/devices/cpu/events/PM_RUN_CYC
+                /sys/devices/cpu/events/PM_RUN_INST_CMPL
 
 Date:           2013/01/08
 
diff --git a/Documentation/ABI/testing/sysfs-bus-event_source-devices-format b/Documentation/ABI/testing/sysfs-bus-event_source-devices-format
index 079afc71363d..77f47ff5ee02 100644
--- a/Documentation/ABI/testing/sysfs-bus-event_source-devices-format
+++ b/Documentation/ABI/testing/sysfs-bus-event_source-devices-format
@@ -9,6 +9,12 @@ Description:
                 we want to export, so that userspace can deal with sane
                 name/value pairs.
 
+                Userspace must be prepared for the possibility that attributes
+                define overlapping bit ranges. For example:
+                        attr1 = 'config:0-23'
+                        attr2 = 'config:0-7'
+                        attr3 = 'config:12-35'
+
                 Example: 'config1:1,6-10,44'
                 Defines contents of attribute that occupies bits 1,6-10,44 of
                 perf_event_attr::config1.