1. 13 9月, 2013 3 次提交
  2. 12 9月, 2013 4 次提交
    • S
      perf/x86: Fix uncore PCI fixed counter handling · dbc33f70
      Stephane Eranian 提交于
      There was a bug in the handling of SNB-EP/IVB-EP uncore PCI
      fixed counters, e.g., IMC.
      
      It would cause erratic values to be returned for the IMC
      clockticks event. This was due to a bogus hwc->config value
      which was then written to PCI config space.
      
      The erratic values can be seen via:
      
        $ perf stat -a -C 0 -e uncore_imc_0/clockticks/ -I 1000 sleep 10
      
      The fixed counter has most fields marked as reserved with
      hw reset values of 0. Yet the kernel was defaulting to a
      hwc->config = ~0 and that was causing the issues.
      
      This patch sets the hwc->config values for fixed uncore event
      to 0. Now, the values of IMC clockticks is correct.
      Signed-off-by: NStephane Eranian <eranian@google.com>
      Reviewed-by: NAndi Kleen <ak@linux.intel.com>
      Cc: peterz@infradead.org
      Cc: zheng.z.yan@intel.com
      Link: http://lkml.kernel.org/r/20130909195350.GA17643@google.comSigned-off-by: NIngo Molnar <mingo@kernel.org>
      dbc33f70
    • O
      uprobes: Fix utask->depth accounting in handle_trampoline() · 878b5a6e
      Oleg Nesterov 提交于
      Currently utask->depth is simply the number of allocated/pending
      return_instance's in uprobe_task->return_instances list.
      
      handle_trampoline() should decrement this counter every time we
      handle/free an instance, but due to typo it does this only if
      ->chained == T. This means that in the likely case this counter
      is never decremented and the probed task can't report more than
      MAX_URETPROBE_DEPTH events.
      Reported-by: NMikhail Kulemin <Mikhail.Kulemin@ru.ibm.com>
      Reported-by: NHemant Kumar Shaw <hkshaw@linux.vnet.ibm.com>
      Signed-off-by: NOleg Nesterov <oleg@redhat.com>
      Acked-by: NAnton Arapov <anton@redhat.com>
      Cc: masami.hiramatsu.pt@hitachi.com
      Cc: srikar@linux.vnet.ibm.com
      Cc: systemtap@sourceware.org
      Cc: stable@vger.kernel.org
      Link: http://lkml.kernel.org/r/20130911154726.GA8093@redhat.comSigned-off-by: NIngo Molnar <mingo@kernel.org>
      878b5a6e
    • S
      perf/x86: Add constraint for IVB CYCLE_ACTIVITY:CYCLES_LDM_PENDING · 6113af14
      Stephane Eranian 提交于
      The IvyBridge event CYCLE_ACTIVITY:CYCLES_LDM_PENDING can only
      be measured on counters 0-3 when HT is off. When HT is on, you
      only have counters 0-3.
      
      If you program it on the eight counters for 1s on a 3GHz
      IVB laptop running a noploop, you see:
      
                 2 747 527 CYCLE_ACTIVITY:CYCLES_LDM_PENDING
                 2 747 527 CYCLE_ACTIVITY:CYCLES_LDM_PENDING
                 2 747 527 CYCLE_ACTIVITY:CYCLES_LDM_PENDING
                 2 747 527 CYCLE_ACTIVITY:CYCLES_LDM_PENDING
             3 280 563 608 CYCLE_ACTIVITY:CYCLES_LDM_PENDING
             3 280 563 608 CYCLE_ACTIVITY:CYCLES_LDM_PENDING
             3 280 563 608 CYCLE_ACTIVITY:CYCLES_LDM_PENDING
             3 280 563 608 CYCLE_ACTIVITY:CYCLES_LDM_PENDING
      
      Clearly the last 4 values are bogus.
      Signed-off-by: NStephane Eranian <eranian@google.com>
      Cc: peterz@infradead.org
      Cc: ak@linux.intel.com
      Cc: zheng.z.yan@intel.com
      Cc: dhsharp@google.com
      Link: http://lkml.kernel.org/r/20130911152222.GA28761@google.comSigned-off-by: NIngo Molnar <mingo@kernel.org>
      6113af14
    • I
      Merge tag 'perf-urgent-for-mingo' of... · e6d38183
      Ingo Molnar 提交于
      Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
      
      Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
      
       * Handle perf.data files with no tracepoints in 'perf trace', fixing a
         segfault.
      
       * Fix up MMAP2 buffer space reservation, a problem that was caught via
         'perf test' consistency tests.
      
       * Add attr->mmap2 support in the tools, a patch that should've been merged
         together with the kernel counterpart:
      
           13d7a241 "perf: Add attr->mmap2 attribute to an event".
      
         Merging it allowed us to catch the MMAP buffer space reservation problem via
         'perf test'. From Stephane Eranian.
      
         The tools deals with older kernels by disabling this feature, resetting the
         perf_event_attr.mmap2 bit, when -EINVAL is returned by perf_event_open, just
         like with perf_event_attr.{sample_id_all,exclude_{guest,host}}.
      
         When such fallback happens the perf_missing_features.mmap2 flag is set to
         true and can be used by tooling that strictly needs this feature to check
         for its availability on the running kernel.
      
       * Make sure we can find PERF_SAMPLE_ID in the variable part of PERF_RECORD_
         ring buffer records in 'perf kvm', where direct manipulation of sample_type
         was being done.
      
         Fixed by making use of the perf_evlist__set_sample_bit() helper and by
         setting the evlist->id_pos in perf_evlist__open(), from Adrian Hunter.
      Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      Signed-off-by: NIngo Molnar <mingo@kernel.org>
      e6d38183
  3. 11 9月, 2013 2 次提交
    • A
      perf: Fix up MMAP2 buffer space reservation · d008d525
      Arnaldo Carvalho de Melo 提交于
      The ino_generation field was added in the PERF_RECORD_MMAP2 record in
      the 13d7a241 cset but no space for it was allocated, corrupting the
      PERF_FORMAT_{TIME,CPU,TID,etc} area (sample_type/sample_id_all), fix it.
      
      Detected with one of the regression tests done by 'perf test':
      
        [root@sandy ~]# perf test -v 7
         7: Validate PERF_RECORD_* events & perf_sample fields     :
        --- start ---
        61315294449606 0 PERF_RECORD_SAMPLE
        61315294453161 0 PERF_RECORD_SAMPLE
        61315294454441 0 PERF_RECORD_SAMPLE
        61315294455709 0 PERF_RECORD_SAMPLE
        61315295600899 0 PERF_RECORD_COMM: sleep:6500
        27917287430500 342521613 PERF_RECORD_MMAP2 6500/6500: [0x400000(0x7000) @ 0 00:1d 311442 9016]: /usr/bin/sleep
        MMAP2 going backwards in time, prev=61315295600899, curr=27917287430500
        MMAP2 with unexpected cpu, expected 0, got 342521613
        MMAP2 with unexpected pid, expected 6500, got 1701606191
        MMAP2 with unexpected tid, expected 6500, got 28773
        27917287430500 342561333 PERF_RECORD_MMAP2 6500/6500: [0x3b7e000000(0x223000) @ 0 00:1d 309186 9016]: /usr/lib64/ld-2.16.so
        MMAP2 with unexpected cpu, expected 0, got 342561333
        MMAP2 with unexpected pid, expected 6500, got 1932408369
        MMAP2 with unexpected tid, expected 6500, got 111
        27917287430500 342600095 PERF_RECORD_MMAP2 6500/6500: [0x7fffbd7dc000(0x1000) @ 0x7fffbd7dc000 00:00 0 0]: [vdso]
        MMAP2 with unexpected cpu, expected 0, got 342600095
        MMAP2 with unexpected pid, expected 6500, got 1935963739
        MMAP2 with unexpected tid, expected 6500, got 23919
        27917287430500 342882834 PERF_RECORD_MMAP2 6500/6500: [0x3b7e400000(0x3b8000) @ 0 00:1d 309187 9016]: /usr/lib64/libc-2.16.so
        MMAP2 with unexpected cpu, expected 0, got 342882834
        MMAP2 with unexpected pid, expected 6500, got 909192754
        MMAP2 with unexpected tid, expected 6500, got 7303982
        61316297195411 0 PERF_RECORD_EXIT(6500:6500):(6500:6500)
        ---- end ----
        Validate PERF_RECORD_* events & perf_sample fields: FAILED!
        [root@sandy ~]#
      
      After this patch:
      
        [root@sandy ~]# perf test 7
         7: Validate PERF_RECORD_* events & perf_sample fields     : Ok
        [root@sandy ~]#
      Acked-by: NPeter Zijlstra <peterz@infradead.org>
      Acked-by: NStephane Eranian <eranian@google.com>
      Cc: Adrian Hunter <adrian.hunter@intel.com>
      Cc: David Ahern <dsahern@gmail.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Stephane Eranian <eranian@google.com>
      Link: http://lkml.kernel.org/n/tip-heeuv986b8ha7whqg4o3he7c@git.kernel.orgSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      d008d525
    • S
      perf tools: Add attr->mmap2 support · 5c5e854b
      Stephane Eranian 提交于
      This patch adds support for the new PERF_RECORD_MMAP2 record type
      exposed by the kernel. This is an extended PERF_RECORD_MMAP record.
      
      It adds for each file-backed mapping the device major, minor number and
      the inode number and generation.
      
      This triplet uniquely identifies the source of a file-backed mapping. It
      can be used to detect identical virtual mappings between processes, for
      instance.
      
      The patch will prefer MMAP2 over MMAP.
      Signed-off-by: NStephane Eranian <eranian@google.com>
      Cc: Andi Kleen <ak@linux.intel.com>
      Cc: David Ahern <dsahern@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: Namhyung Kim <namhyung.kim@lge.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Link: http://lkml.kernel.org/r/1377079825-19057-3-git-send-email-eranian@google.com
      [ Cope with 314add6b "Change machine__findnew_thread() to set thread pid",
        fix 'perf test' regression test entry affected,
        use perf_missing_features.mmap2 to fallback to not using .mmap2 in older kernels,
        so that new tools can work with kernels where this feature is not present ]
      Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      5c5e854b
  4. 10 9月, 2013 3 次提交
  5. 06 9月, 2013 7 次提交
  6. 05 9月, 2013 11 次提交
  7. 04 9月, 2013 10 次提交
    • L
      Merge branch 'x86-asmlinkage-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 2a475501
      Linus Torvalds 提交于
      Pull x86/asmlinkage changes from Ingo Molnar:
       "As a preparation for Andi Kleen's LTO patchset (link time
        optimizations using GCC's -flto which build time optimization has
        steadily increased in quality over the past few years and might
        eventually be usable for the kernel too) this tree includes a handful
        of preparatory patches that make function calling convention
        annotations consistent again:
      
         - Mark every function without arguments (or 64bit only) that is used
           by assembly code with asmlinkage()
      
         - Mark every function with parameters or variables that is used by
           assembly code as __visible.
      
        For the vanilla kernel this has documentation, consistency and
        debuggability advantages, for the time being"
      
      * 'x86-asmlinkage-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/asmlinkage: Fix warning in xen asmlinkage change
        x86, asmlinkage, vdso: Mark vdso variables __visible
        x86, asmlinkage, power: Make various symbols used by the suspend asm code visible
        x86, asmlinkage: Make dump_stack visible
        x86, asmlinkage: Make 64bit checksum functions visible
        x86, asmlinkage, paravirt: Add __visible/asmlinkage to xen paravirt ops
        x86, asmlinkage, apm: Make APM data structure used from assembler visible
        x86, asmlinkage: Make syscall tables visible
        x86, asmlinkage: Make several variables used from assembler/linker script visible
        x86, asmlinkage: Make kprobes code visible and fix assembler code
        x86, asmlinkage: Make various syscalls asmlinkage
        x86, asmlinkage: Make 32bit/64bit __switch_to visible
        x86, asmlinkage: Make _*_start_kernel visible
        x86, asmlinkage: Make all interrupt handlers asmlinkage / __visible
        x86, asmlinkage: Change dotraplinkage into __visible on 32bit
        x86: Fix sys_call_table type in asm/syscall.h
      2a475501
    • L
      Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 3d7e5fc3
      Linus Torvalds 提交于
      Pull x86/asm changes from Ingo Molnar:
       "Main changes:
      
         - Apply low level mutex optimization on x86-64, by Wedson Almeida
           Filho.
      
         - Change bitops to be naturally 'long', by H Peter Anvin.
      
         - Add TSX-NI opcodes support to the x86 (instrumentation) decoder, by
           Masami Hiramatsu.
      
         - Add clang compatibility adjustments/workarounds, by Jan-Simon
           Möller"
      
      * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, doc: Update uaccess.h comment to reflect clang changes
        x86, asm: Fix a compilation issue with clang
        x86, asm: Extend definitions of _ASM_* with a raw format
        x86, insn: Add new opcodes as of June, 2013
        x86/ia32/asm: Remove unused argument in macro
        x86, bitops: Change bitops to be native operand size
        x86: Use asm-goto to implement mutex fast path on x86-64
      3d7e5fc3
    • L
      Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 6924a467
      Linus Torvalds 提交于
      Pull x86/apic changes from Ingo Molnar:
       "Smaller fixes"
      
      * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/ioapic: Check attr against the previous setting when programmed more than once
        x86/ioapic/kcrash: Prevent crash_kexec() from deadlocking on ioapic_lock
        x86/acpi: Fix incorrect sanity check in acpi_register_lapic()
      6924a467
    • L
      Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · ac3c1c4f
      Linus Torvalds 提交于
      Pull timer changes from Ingo Molnar:
       "Various clocksource driver updates: extend the core with memory mapped
        hardware (mmio) support and add new (ARM) Moxart SoC and sun4i
        hardware support"
      
      * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits)
        clocksource: arch_timer: Add support for memory mapped timers
        clocksource: arch_timer: Push the read/write wrappers deeper
        Documentation: Add memory mapped ARM architected timer binding
        clocksource: arch_timer: Pass clock event to set_mode callback
        clocksource: arch_timer: Make register accessors less error-prone
        ARM: clocksource: moxart: documentation: Update device tree bindings document
        ARM: clocksource: moxart: Add bitops.h include
        ARM: clocksource: moxart: documentation: Fix device tree bindings document
        ARM: clocksource: Add support for MOXA ART SoCs
        clocksource: cadence_ttc: Reuse clocksource as sched_clock
        clocksource: cadence_ttc: Remove unused header
        clocksource: sun4i: Fix bug when switching from periodic to oneshot modes
        clocksource: sun4i: Cleanup parent clock setup
        clocksource: sun4i: Remove TIMER_SCAL variable
        clocksource: sun4i: Factor out some timer code
        clocksource: sun4i: Fix the next event code
        clocksource: sun4i: Don't forget to enable the clock we use
        clocksource: sun4i: Add clocksource and sched clock drivers
        clocksource: sun4i: rename AUTORELOAD define to RELOAD
        clocksource: sun4i: Wrap macros arguments in parenthesis
        ...
      ac3c1c4f
    • L
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 5e0b3a4e
      Linus Torvalds 提交于
      Pull scheduler changes from Ingo Molnar:
       "Various optimizations, cleanups and smaller fixes - no major changes
        in scheduler behavior"
      
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched/fair: Fix the sd_parent_degenerate() code
        sched/fair: Rework and comment the group_imb code
        sched/fair: Optimize find_busiest_queue()
        sched/fair: Make group power more consistent
        sched/fair: Remove duplicate load_per_task computations
        sched/fair: Shrink sg_lb_stats and play memset games
        sched: Clean-up struct sd_lb_stat
        sched: Factor out code to should_we_balance()
        sched: Remove one division operation in find_busiest_queue()
        sched/cputime: Use this_cpu_add() in task_group_account_field()
        cpumask: Fix cpumask leak in partition_sched_domains()
        sched/x86: Optimize switch_mm() for multi-threaded workloads
        generic-ipi: Kill unnecessary variable - csd_flags
        numa: Mark __node_set() as __always_inline
        sched/fair: Cleanup: remove duplicate variable declaration
        sched/__wake_up_sync_key(): Fix nr_exclusive tasks which lead to WF_SYNC clearing
      5e0b3a4e
    • L
      Merge branches 'perf-urgent-for-linus' and 'perf-core-for-linus' of... · 0d99b708
      Linus Torvalds 提交于
      Merge branches 'perf-urgent-for-linus' and 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
      
      Pull perf changes from Ingo Molnar:
       "As a first remark I'd like to point out that the obsolete '-f'
        (--force) option, which has not done anything for several releases,
        has been removed from 'perf record' and related utilities.  Everyone
        please update muscle memory accordingly! :-)
      
        Main changes on the perf kernel side:
      
         - Performance optimizations:
              . for trace events, by Steve Rostedt.
              . for time values, by Peter Zijlstra
      
         - New hardware support:
              . for Intel Silvermont (22nm Atom) CPUs, by Zheng Yan
              . for Intel SNB-EP uncore PMUs, by Zheng Yan
      
         - Enhanced hardware support:
              . for Intel uncore PMUs: add filter support for QPI boxes, by Zheng Yan
      
         - Core perf events code enhancements and fixes:
              . for full-nohz feature handling, by Frederic Weisbecker
              . for group events, by Jiri Olsa
              . for call chains, by Frederic Weisbecker
              . for event stream parsing, by Adrian Hunter
      
         - New ABI details:
              . Add attr->mmap2 attribute, by Stephane Eranian
              . Add PERF_EVENT_IOC_ID ioctl to return event ID, by Jiri Olsa
              . Export u64 time_zero on the mmap header page to allow TSC
                calculation, by Adrian Hunter
              . Add dummy software event, by Adrian Hunter.
              . Add a new PERF_SAMPLE_IDENTIFIER to make samples always
                parseable, by Adrian Hunter.
              . Make Power7 events available via sysfs, by Runzhen Wang.
      
         - Code cleanups and refactorings:
              . for nohz-full, by Frederic Weisbecker
              . for group events, by Jiri Olsa
      
         - Documentation updates:
              . for perf_event_type, by Peter Zijlstra
      
        Main changes on the perf tooling side (some of these tooling changes
        utilize the above kernel side changes):
      
         - Lots of 'perf trace' enhancements:
      
              . Make 'perf trace' command line arguments consistent with
                'perf record', by David Ahern.
      
              . Allow specifying syscalls a la strace, by Arnaldo Carvalho de Melo.
      
              . Add --verbose and -o/--output options, by Arnaldo Carvalho de Melo.
      
              . Support ! in -e expressions, to filter a list of syscalls,
                by Arnaldo Carvalho de Melo.
      
              . Arg formatting improvements to allow masking arguments in
                syscalls such as futex and open, where the some arguments are
                ignored and thus should not be printed depending on other args,
                by Arnaldo Carvalho de Melo.
      
              . Beautify futex open, openat, open_by_handle_at, lseek and futex
                syscalls, by Arnaldo Carvalho de Melo.
      
              . Add option to analyze events in a file versus live, so that
                one can do:
      
                 [root@zoo ~]# perf record -a -e raw_syscalls:* sleep 1
                 [ perf record: Woken up 0 times to write data ]
                 [ perf record: Captured and wrote 25.150 MB perf.data (~1098836 samples) ]
                 [root@zoo ~]# perf trace -i perf.data -e futex --duration 1
                    17.799 ( 1.020 ms): 7127 futex(uaddr: 0x7fff3f6c6674, op: 393, val: 1, utime: 0x7fff3f6c6470, ua
                   113.344 (95.429 ms): 7127 futex(uaddr: 0x7fff3f6c6674, op: 393, val: 1, utime: 0x7fff3f6c6470, uaddr2: 0x7fff3f6c6648, val3: 4294967
                   133.778 ( 1.042 ms): 18004 futex(uaddr: 0x7fff3f6c6674, op: 393, val: 1, utime: 0x7fff3f6c6470, uaddr2: 0x7fff3f6c6648, val3: 429496
                 [root@zoo ~]#
      
                By David Ahern.
      
              . Honor target pid / tid options when analyzing a file, by David Ahern.
      
              . Introduce better formatting of syscall arguments, including so
                far beautifiers for mmap, madvise, syscall return values,
                by Arnaldo Carvalho de Melo.
      
              . Handle HUGEPAGE defines in the mmap beautifier, by David Ahern.
      
         - 'perf report/top' enhancements:
      
              . Do annotation using /proc/kcore and /proc/kallsyms when
                available, removing the forced need for a vmlinux file kernel
                assembly annotation. This also improves this use case because
                vmlinux has just the initial kernel image, not what is actually
                in use after various code patchings by things like alternatives.
                By Adrian Hunter.
      
              . Add --ignore-callees=<regex> option to collapse undesired parts
                of call graphs, by Greg Price.
      
              . Simplify symbol filtering by doing it at machine class level,
                by Adrian Hunter.
      
              . Add support for callchains in the gtk UI, by Namhyung Kim.
      
              . Add --objdump option to 'perf top', by Sukadev Bhattiprolu.
      
         - 'perf kvm' enhancements:
      
              . Add option to print only events that exceed a specified time
                duration, by David Ahern.
      
              . Improve stack trace printing, by David Ahern.
      
              . Update documentation of the live command, by David Ahern
      
              . Add perf kvm stat live mode that combines aspects of 'perf kvm
                stat' record and report, by David Ahern.
      
              . Add option to analyze specific VM in perf kvm stat report, by
                David Ahern.
      
              . Do not require /lib/modules/* on a guest, by Jason Wessel.
      
         - 'perf script' enhancements:
      
              . Fix symbol offset computation for some dsos, by David Ahern.
      
              . Fix named threads support, by David Ahern.
      
              . Don't install scripting files files when perl/python support
                is disabled, by Arnaldo Carvalho de Melo.
      
         - 'perf test' enhancements:
      
              . Add various improvements and fixes to the "vmlinux matches
                kallsyms" 'perf test' entry, related to the /proc/kcore
                annotation feature. By Adrian Hunter.
      
              . Add sample parsing test, by Adrian Hunter.
      
              . Add test for reading object code, by Adrian Hunter.
      
              . Add attr record group sampling test, by Jiri Olsa.
      
              . Misc testing infrastructure improvements and other details,
                by Jiri Olsa.
      
         - 'perf list' enhancements:
      
              . Skip unsupported hardware events, by Namhyung Kim.
      
              . List pmu events, by Andi Kleen.
      
         - 'perf diff' enhancements:
      
              . Add support for more than two files comparison, by Jiri Olsa.
      
         - 'perf sched' enhancements:
      
              . Various improvements, including removing reliance on some
                scheduler tracepoints that provide the same information as the
                PERF_RECORD_{FORK,EXIT} events. By David Ahern.
      
              . Remove odd build stall by moving a large struct initialization
                from a local variable to a global one, by Namhyung Kim.
      
         - 'perf stat' enhancements:
      
              . Add --initial-delay option to skip measuring for a defined
                startup phase, by Andi Kleen.
      
         - Generic perf tooling infrastructure/plumbing changes:
      
              . Tidy up sample parsing validation, by Adrian Hunter.
      
              . Fix up jobserver setup in libtraceevent Makefile.
                by Arnaldo Carvalho de Melo.
      
              . Debug improvements, by Adrian Hunter.
      
              . Fix correlation of samples coming after PERF_RECORD_EXIT event,
                by David Ahern.
      
              . Improve robustness of the topology parsing code,
                by Stephane Eranian.
      
              . Add group leader sampling, that allows just one event in a group
                to sample while the other events have just its values read,
                by Jiri Olsa.
      
              . Add support for a new modifier "D", which requests that the
                event, or group of events, be pinned to the PMU.
                By Michael Ellerman.
      
              . Support callchain sorting based on addresses, by Andi Kleen
      
              . Prep work for multi perf data file storage, by Jiri Olsa.
      
              . libtraceevent cleanups, by Namhyung Kim.
      
        And lots and lots of other fixes and code reorganizations that did not
        make it into the list, see the shortlog, diffstat and the Git log for
        details!"
      
      [ Also merge a leftover from the 3.11 cycle ]
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf: Prevent race in unthrottling code
      
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (237 commits)
        perf trace: Tell arg formatters the arg index
        perf trace: Add beautifier for open's flags arg
        perf trace: Add beautifier for lseek's whence arg
        perf tools: Fix symbol offset computation for some dsos
        perf list: Skip unsupported events
        perf tests: Add 'keep tracking' test
        perf tools: Add support for PERF_COUNT_SW_DUMMY
        perf: Add a dummy software event to keep tracking
        perf trace: Add beautifier for futex 'operation' parm
        perf trace: Allow syscall arg formatters to mask args
        perf: Convert kmalloc_node(...GFP_ZERO...) to kzalloc_node()
        perf: Export struct perf_branch_entry to userspace
        perf: Add attr->mmap2 attribute to an event
        perf/x86: Add Silvermont (22nm Atom) support
        perf/x86: use INTEL_UEVENT_EXTRA_REG to define MSR_OFFCORE_RSP_X
        perf trace: Handle missing HUGEPAGE defines
        perf trace: Honor target pid / tid options when analyzing a file
        perf trace: Add option to analyze events in a file versus live
        perf evlist: Add tracepoint lookup by name
        perf tests: Add a sample parsing test
        ...
      0d99b708
    • L
      Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 4689550b
      Linus Torvalds 提交于
      Pull core/locking changes from Ingo Molnar:
       "Main changes:
      
         - another mutex optimization, from Davidlohr Bueso
      
         - improved lglock lockdep tracking, from Michel Lespinasse
      
         - [ assorted smaller updates, improvements, cleanups. ]"
      
      * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        generic-ipi/locking: Fix misleading smp_call_function_any() description
        hung_task debugging: Print more info when reporting the problem
        mutex: Avoid label warning when !CONFIG_MUTEX_SPIN_ON_OWNER
        mutex: Do not unnecessarily deal with waiters
        mutex: Fix/document access-once assumption in mutex_can_spin_on_owner()
        lglock: Update lockdep annotations to report recursive local locks
        lockdep: Introduce lock_acquire_exclusive()/shared() helper macros
      4689550b
    • L
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · b854e4de
      Linus Torvalds 提交于
      Pull RCU updates from Ingo Molnar:
       "Main RCU changes this cycle were:
      
         - Full-system idle detection.  This is for use by Frederic
           Weisbecker's adaptive-ticks mechanism.  Its purpose is to allow the
           timekeeping CPU to shut off its tick when all other CPUs are idle.
      
         - Miscellaneous fixes.
      
         - Improved rcutorture test coverage.
      
         - Updated RCU documentation"
      
      * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (30 commits)
        nohz_full: Force RCU's grace-period kthreads onto timekeeping CPU
        nohz_full: Add full-system-idle state machine
        jiffies: Avoid undefined behavior from signed overflow
        rcu: Simplify _rcu_barrier() processing
        rcu: Make rcutorture emit online failures if verbose
        rcu: Remove unused variable from rcu_torture_writer()
        rcu: Sort rcutorture module parameters
        rcu: Increase rcutorture test coverage
        rcu: Add duplicate-callback tests to rcutorture
        doc: Fix memory-barrier control-dependency example
        rcu: Update RTFP documentation
        nohz_full: Add full-system-idle arguments to API
        nohz_full: Add full-system idle states and variables
        nohz_full: Add per-CPU idle-state tracking
        nohz_full: Add rcu_dyntick data for scalable detection of all-idle state
        nohz_full: Add Kconfig parameter for scalable detection of all-idle state
        nohz_full: Add testing information to documentation
        rcu: Eliminate unused APIs intended for adaptive ticks
        rcu: Select IRQ_WORK from TREE_PREEMPT_RCU
        rculist: list_first_or_null_rcu() should use list_entry_rcu()
        ...
      b854e4de
    • L
      Merge tag 'for-3.12-rc1' of git://gitorious.org/linux-pwm/linux-pwm · 458c3f60
      Linus Torvalds 提交于
      Pull pwm changes from Thierry Reding:
       "A set of patches makes the device tree documentation for the various
        PWM drivers more consistent.  Device tree support is added to the
        Renesas TPU driver.  The sysfs interface now makes use of dev_groups.
        Other than that there is a healthy assortment of fixes and
        enhancements for minor issues that have shown up"
      
      * tag 'for-3.12-rc1' of git://gitorious.org/linux-pwm/linux-pwm:
        pwm: pxa: Use module_platform_driver
        pwm: tiehrpwm: add missing __iomem annotation
        pwm: tiecap: add CONFIG_PM_SLEEP to ecap_pwm_{save,restore}_context()
        pwm: simplify use of devm_ioremap_resource
        pwm: renesas-tpu: Add DT support
        ARM: dts: Use the PWM polarity flags
        pwm: Update DT bindings to reference pwm.txt for cells documentation
        pwm: Use the DT macro directly when parsing PWM DT flags
        pwm: Add PWM polarity flag macro for DT
        pwm: mxs: Check the return value from stmp_reset_block()
        pwm: convert class code to use dev_groups
      458c3f60
    • L
      Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · f83b0a4e
      Linus Torvalds 提交于
      Pull pstore changes from Tony Luck:
       "A big part of this is the addition of compression to the generic
        pstore layer so that all backends can use the pitiful amounts of
        storage they control more effectively.  Three other small
        fixes/cleanups too.
      
      * tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        pstore/ram: (really) fix undefined usage of rounddown_pow_of_two
        pstore/ram: Read and write to the 'compressed' flag of pstore
        efi-pstore: Read and write to the 'compressed' flag of pstore
        erst: Read and write to the 'compressed' flag of pstore
        powerpc/pseries: Read and write to the 'compressed' flag of pstore
        pstore: Add file extension to pstore file if compressed
        pstore: Add decompression support to pstore
        pstore: Introduce new argument 'compressed' in the read callback
        pstore: Add compression support to pstore
        pstore/Kconfig: Select ZLIB_DEFLATE and ZLIB_INFLATE when PSTORE is selected
        pstore: Add new argument 'compressed' in pstore write callback
        powerpc/pseries: Remove (de)compression in nvram with pstore enabled
        pstore: d_alloc_name() doesn't return an ERR_PTR
        acpi/apei/erst: Add missing iounmap() on error in erst_exec_move_data()
      f83b0a4e