1. 03 4月, 2010 11 次提交
    • R
      perf, x86: Undo some some *_counter* -> *_event* renames · 948b1bb8
      Robert Richter 提交于
      The big rename:
      
       cdd6c482 perf: Do the big rename: Performance Counters -> Performance Events
      
      accidentally renamed some members of stucts that were named after
      registers in the spec. To avoid confusion this patch reverts some
      changes. The related specs are MSR descriptions in AMD's BKDGs and the
      ARCHITECTURAL PERFORMANCE MONITORING section in the Intel 64 and IA-32
      Architectures Software Developer's Manuals.
      
      This patch does:
      
       $ sed -i -e 's:num_events:num_counters:g' \
         arch/x86/include/asm/perf_event.h \
         arch/x86/kernel/cpu/perf_event_amd.c \
         arch/x86/kernel/cpu/perf_event.c \
         arch/x86/kernel/cpu/perf_event_intel.c \
         arch/x86/kernel/cpu/perf_event_p6.c \
         arch/x86/kernel/cpu/perf_event_p4.c \
         arch/x86/oprofile/op_model_ppro.c
      
       $ sed -i -e 's:event_bits:cntval_bits:g' -e 's:event_mask:cntval_mask:g' \
         arch/x86/kernel/cpu/perf_event_amd.c \
         arch/x86/kernel/cpu/perf_event.c \
         arch/x86/kernel/cpu/perf_event_intel.c \
         arch/x86/kernel/cpu/perf_event_p6.c \
         arch/x86/kernel/cpu/perf_event_p4.c
      Signed-off-by: NRobert Richter <robert.richter@amd.com>
      Signed-off-by: NPeter Zijlstra <a.p.zijlstra@chello.nl>
      LKML-Reference: <1269880612-25800-2-git-send-email-robert.richter@amd.com>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      948b1bb8
    • I
      Merge branch 'perf/urgent' into perf/core · ec5e61aa
      Ingo Molnar 提交于
      Conflicts:
      	arch/x86/kernel/cpu/perf_event.c
      
      Merge reason: Resolve the conflict, pick up fixes
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      ec5e61aa
    • M
      perf probe: Fix to close dwarf when failing to analyze it · 75ec5a24
      Masami Hiramatsu 提交于
      Fix to close libdw routine when failing to analyze it in
      find_perf_probe_point().
      Signed-off-by: NMasami Hiramatsu <mhiramat@redhat.com>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: systemtap <systemtap@sources.redhat.com>
      Cc: DLE <dle-develop@lists.sourceforge.net>
      LKML-Reference: <20100402165059.23551.95587.stgit@localhost6.localdomain6>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      75ec5a24
    • M
      perf probe: Correct error message for non-structure type · 12e5a7ae
      Masami Hiramatsu 提交于
      perf probe outputs incorrect error message when it is called with
      non-existent field on a non-data structure local variable.
      
      <Before>
       # perf probe vfs_read 'count.hoge'
        Fatal: Structure on a register is not supported yet.
       # perf probe vfs_read 'count->hoge'
        Fatal: Semantic error: hoge must be referred by '.'
      
      This corrects the messsage.
      
      <After>
       # perf probe vfs_read 'count.hoge'
        Fatal: count is not a data structure.
       # perf probe vfs_read 'count->hoge'
        Fatal: count is not a data structure.
      Signed-off-by: NMasami Hiramatsu <mhiramat@redhat.com>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: systemtap <systemtap@sources.redhat.com>
      Cc: DLE <dle-develop@lists.sourceforge.net>
      LKML-Reference: <20100402165052.23551.75866.stgit@localhost6.localdomain6>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      12e5a7ae
    • M
      perf probe: Fix not to return non-matched file · c9e38582
      Masami Hiramatsu 提交于
      Fix cu_find_realpath() not to return the last file path
      if that is not matched to input pattern.
      Signed-off-by: NMasami Hiramatsu <mhiramat@redhat.com>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: systemtap <systemtap@sources.redhat.com>
      Cc: DLE <dle-develop@lists.sourceforge.net>
      LKML-Reference: <20100402165045.23551.47780.stgit@localhost6.localdomain6>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      c9e38582
    • M
      perf probe: Fix --line syntax help and document · 085ea739
      Masami Hiramatsu 提交于
      Just fix typos. --line option accepts ':START-END' syntax,
      not ':START:END'.
      Signed-off-by: NMasami Hiramatsu <mhiramat@redhat.com>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: systemtap <systemtap@sources.redhat.com>
      Cc: DLE <dle-develop@lists.sourceforge.net>
      LKML-Reference: <20100402165038.23551.62590.stgit@localhost6.localdomain6>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      085ea739
    • M
      perf: Fix 'perf sched record' deadlock · 8bb39f9a
      Mike Galbraith 提交于
      perf sched record can deadlock a box should the holder of
      handle->data->lock take an interrupt, and then attempt to
      acquire an rq lock held by a CPU trying to acquire the
      same lock. Disable interrupts.
      
         CPU0                            CPU1
         sched event with rq->lock held
                                         grab handle->data->lock
         spin on handle->data->lock
                                         interrupt
                                         try to grab rq->lock
      Reported-by: NLi Zefan <lizf@cn.fujitsu.com>
      Signed-off-by: NMike Galbraith <efault@gmx.de>
      Tested-by: NLi Zefan <lizf@cn.fujitsu.com>
      Signed-off-by: NPeter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      LKML-Reference: <1269598293.6174.8.camel@marge.simson.net>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      8bb39f9a
    • T
      perf, x86: Fix callgraphs of 32-bit processes on 64-bit kernels · 257ef9d2
      Torok Edwin 提交于
      When profiling a 32-bit process on a 64-bit kernel, callgraph tracing
      stopped after the first function, because it has seen a garbage memory
      address (tried to interpret the frame pointer, and return address as a
      64-bit pointer).
      
      Fix this by using a struct stack_frame with 32-bit pointers when the
      TIF_IA32 flag is set.
      
      Note that TIF_IA32 flag must be used, and not is_compat_task(), because
      the latter is only set when the 32-bit process is executing a syscall,
      which may not always be the case (when tracing page fault events for
      example).
      Signed-off-by: NTörök Edwin <edwintorok@gmail.com>
      Signed-off-by: NPeter Zijlstra <a.p.zijlstra@chello.nl>
      Acked-by: NFrederic Weisbecker <fweisbec@gmail.com>
      Cc: "H. Peter Anvin" <hpa@zytor.com>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: x86@kernel.org
      Cc: linux-kernel@vger.kernel.org
      LKML-Reference: <1268820436-13145-1-git-send-email-edwintorok@gmail.com>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      257ef9d2
    • P
      perf, x86: Fix AMD hotplug & constraint initialization · b38b24ea
      Peter Zijlstra 提交于
      Commit 3f6da390 ("perf: Rework and fix the arch CPU-hotplug hooks") moved
      the amd northbridge allocation from CPUS_ONLINE to CPUS_PREPARE_UP
      however amd_nb_id() doesn't work yet on prepare so it would simply bail
      basically reverting to a state where we do not properly track node wide
      constraints - causing weird perf results.
      
      Fix up the AMD NorthBridge initialization code by allocating from
      CPU_UP_PREPARE and installing it from CPU_STARTING once we have the
      proper nb_id. It also properly deals with the allocation failing.
      Signed-off-by: NPeter Zijlstra <a.p.zijlstra@chello.nl>
      [ robustify using amd_has_nb() ]
      Signed-off-by: NStephane Eranian <eranian@google.com>
      LKML-Reference: <1269353485.5109.48.camel@twins>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      b38b24ea
    • P
      x86: Move notify_cpu_starting() callback to a later stage · 85257024
      Peter Zijlstra 提交于
      Because we need to have cpu identification things done by the time we run
      CPU_STARTING notifiers.
      
      ( This init ordering will be relied on by the next fix. )
      Signed-off-by: NPeter Zijlstra <a.p.zijlstra@chello.nl>
      LKML-Reference: <1269353485.5109.48.camel@twins>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      85257024
    • I
      Merge branch 'perf/urgent' of... · 50d11d19
      Ingo Molnar 提交于
      Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/urgent
      50d11d19
  2. 02 4月, 2010 3 次提交
    • L
      Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 42be79e3
      Linus Torvalds 提交于
      * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (76 commits)
        drm/radeon/kms: enable ACPI powermanagement mode on radeon gpus.
        drm/radeon/kms: rs400/480 should set common registers.
        drm/radeon/kms: add sanity check to wptr.
        drm/radeon/kms/evergreen: get DP working
        drm/radeon/kms: add hw_i2c module option
        drm/radeon/kms: use new pre/post_xfer i2c bit algo hooks
        drm/radeon/kms: disable MSI on IGP chips
        drm/radeon/kms: display watermark updates (v2)
        drm/radeon/kms/dp: disable training pattern on the sink at the end of link training
        drm/radeon/kms: minor fixes for eDP with LCD* device tags (v2)
        drm/radeon/kms/dp: remove extraneous training complete call
        drm/radeon/kms/atom: minor fixes to transmitter setup
        drm/radeon/kms: Only restrict BO to visible VRAM size when pinning to VRAM.
        drm: fix build error when SYSRQ is disabled
        drm/radeon/kms: fix macbookpro connector quirk
        drm/radeon/r6xx/r7xx: further safe reg clean up
        drm/radeon: bump the UMS driver version for r6xx/r7xx const buffer support
        drm/radeon/kms: bump the version for r6xx/r7xx const buffer support
        drm/radeon/r6xx/r7xx: CS parser fixes
        drm/radeon/kms: fix some typos in r6xx/r7xx hpd setup
        ...
      
      Fix up MSI-related conflicts in drivers/gpu/drm/radeon/radeon_irq_kms.c
      42be79e3
    • L
      Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze · 445c682b
      Linus Torvalds 提交于
      * 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (35 commits)
        microblaze: Support word copying in copy_tofrom_user
        microblaze: Print early printk information to log buffer
        microblaze: head.S typo fix
        microblaze: Use MICROBLAZE_TLB_SIZE in asm code
        microblaze: Kconfig Fix - pci
        microblaze: Adding likely macros
        microblaze: Add .type and .size to ASM functions
        microblaze: Fix TLB macros
        microblaze: Use instruction with delay slot
        microblaze: Remove additional resr and rear loading
        microblaze: Change register usage for ESR and EAR
        microblaze: Prepare work for optimization in exception code
        microblaze: Add DEBUG option
        microblaze: Support systems without lmb bram
        microblaze: uaccess: Sync strlen, strnlen, copy_to/from_user
        microblaze: uaccess: Unify __copy_tofrom_user
        microblaze: uaccess: Move functions to generic location
        microblaze: uaccess: Fix put_user for noMMU
        microblaze: uaccess: Fix get_user macro for noMMU
        microblaze: uaccess: fix clear_user for noMMU kernel
        ...
      445c682b
    • L
      Merge branch 'for_linus' of... · c7681f46
      Linus Torvalds 提交于
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86:
        eeepc-wmi: new driver for WMI based hotkeys on Eee PC laptops
        asus-laptop: fix warning in asus_handle_init
      c7681f46
  3. 01 4月, 2010 26 次提交