1. 05 2月, 2011 2 次提交
    • A
      perf annotate: Move annotate functions to util/ · 78f7defe
      Arnaldo Carvalho de Melo 提交于
      They will be used by perf top, so that we have just one set of routines
      to do annotation.
      
      Rename "struct sym_priv" to "struct annotation", etc, to clarify this
      code a bit.
      
      Rename "struct sym_ext" to "struct source_line", to give it a meaningful
      name, that clarifies that it is a the result of an addr2line call, that
      is sorted by percentage one particular source code line appeared in the
      annotation.
      
      And since we're moving things around also rename 'sym_hist->ip' to
      'sym_hist->addr' as we want to do data structure annotation at some
      point.
      
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Tom Zanussi <tzanussi@gmail.com>
      LKML-Reference: <new-submission>
      Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      78f7defe
    • A
      perf top: Remove superfluous name_len field · 764328d3
      Arnaldo Carvalho de Melo 提交于
      From the sym_entry struct, struct symbol already has this field.
      
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Tom Zanussi <tzanussi@gmail.com>
      LKML-Reference: <new-submission>
      Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      764328d3
  2. 03 2月, 2011 1 次提交
    • P
      perf: Cure task_oncpu_function_call() races · fe4b04fa
      Peter Zijlstra 提交于
      Oleg reported that on architectures with
      __ARCH_WANT_INTERRUPTS_ON_CTXSW the IPI from
      task_oncpu_function_call() can land before perf_event_task_sched_in()
      and cause interesting situations for eg. perf_install_in_context().
      
      This patch reworks the task_oncpu_function_call() interface to give a
      more usable primitive as well as rework all its users to hopefully be
      more obvious as well as remove the races.
      
      While looking at the code I also found a number of races against
      perf_event_task_sched_out() which can flip contexts between tasks so
      plug those too.
      Reported-and-reviewed-by: NOleg Nesterov <oleg@redhat.com>
      Signed-off-by: NPeter Zijlstra <a.p.zijlstra@chello.nl>
      LKML-Reference: <new-submission>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      fe4b04fa
  3. 02 2月, 2011 7 次提交
    • I
      Merge branch 'perf/core' of... · b84defe6
      Ingo Molnar 提交于
      Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
      b84defe6
    • I
      Merge commit 'v2.6.38-rc3' into perf/core · 8104a477
      Ingo Molnar 提交于
      Merge reason: Pick up latest fixes.
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      8104a477
    • Y
      perf top: Fix TUI compilation · cdb0861c
      Yinghai Lu 提交于
      > +	slsmg_write_nstring(width >= syme->map->dso->long_name_len ?
      > +				syme->map->dso->long_name :
      > +				syme->map->dso->short_name, width);
      
      need update macro for that calling
      
      util/ui/browsers/top.c: In function ‘perf_top_browser__write’:
      util/ui/browsers/top.c:60:2: error: cast to pointer from integer of different size
      util/ui/browsers/top.c:60:2: error: comparison between pointer and integer
      util/ui/browsers/top.c:60:2: error: passing argument 1 of ‘SLsmg_write_nstring’ discards qualifiers from pointer target type
      /usr/include/slang.h:1728:16: note: expected ‘char *’ but argument is of type ‘const char *’
      make: *** [util/ui/browsers/top.o] Error 1
      
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: H. Peter Anvin <hpa@zytor.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Tom Zanussi <tzanussi@gmail.com>
      LKML-Reference: <4D48562B.20006@kernel.org>
      Signed-off-by: NYinghai Lu <yinghai@kernel.org>
      Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      cdb0861c
    • A
      perf tools: Don't try to build python bindings if Python.h not available · 978f626c
      Arnaldo Carvalho de Melo 提交于
      Just leverage the test done for python support in 'python script',
      emitting a warning about losing those features if python-dev[el] is not
      installed.
      Reported-by: NPeter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Tom Zanussi <tzanussi@gmail.com>
      LKML-Reference: <new-submission>
      Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      978f626c
    • A
      perf stat: Fix up resource release order · 0015e2e1
      Arnaldo Carvalho de Melo 提交于
      That was causing a SEGV on selected old distros.
      
      Problem introduced in 7e2ed097.
      Reported-by: NPeter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Tom Zanussi <tzanussi@gmail.com>
      LKML-Reference: <new-submission>
      Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      0015e2e1
    • A
      perf tools: Fix up 'make clean' target · 568bb7b8
      Arnaldo Carvalho de Melo 提交于
      It wasn't using $(OUTPUT) to rm *.o and there were some funny looking
      automake files that never get created but were being deleted anyway.
      
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Tom Zanussi <tzanussi@gmail.com>
      LKML-Reference: <new-submission>
      Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      568bb7b8
    • A
      perf tools: Remove verbose build messages for the python binding · 067187fc
      Arnaldo Carvalho de Melo 提交于
      Also now it builds it in a well known location:
      
      [acme@felicio linux]$ rm -rf ../build/perf/
      [acme@felicio linux]$ mkdir ../build/perf
      [acme@felicio linux]$ make -j2 O=~acme/git/build/perf -C tools/perf/
      <SNIP>
      [acme@felicio linux]$ ls -la ../build/perf/python/
      total 152
      -rwxrwxr-x 1 acme acme 147957 Feb  1 14:56 perf.so
      drwxrwxr-x 3 acme acme     17 Feb  1 14:56 temp
      [acme@felicio linux]$
      
      [root@felicio ~]# strip ~acme/git/build/perf/python/perf.so
      [root@felicio ~]# ls -la ~acme/git/build/perf/python/perf.so
      -rwxrwxr-x 1 acme acme 46264 Feb  1 14:58 /home/acme/git/build/perf/python/perf.so
      
      [root@felicio ~]# export PYTHONPATH=~acme/git/build/perf/python/
      [root@felicio ~]# ~acme/git/linux/tools/perf/python/twatch.py
      cpu:  0, pid: 7751, tid: 7751 { type: exit, pid: 7751, ppid: 7751, tid: 7751, ptid: 7751, time: 54562393512356}
      cpu:  0, pid: 13700, tid: 13700 { type: fork, pid: 7756, ppid: 13700, tid: 7756, ptid: 13700, time: 54562393746739}
      cpu:  1, pid: 7756, tid: 7756 { type: fork, pid: 7757, ppid: 7756, tid: 7757, ptid: 7756, time: 54562394246152}
      cpu:  1, pid: 7757, tid: 7757 { type: comm, pid: 7757, tid: 7757, comm: awk }
      cpu:  1, pid: 7757, tid: 7757 { type: exit, pid: 7757, ppid: 7757, tid: 7757, ptid: 7757, time: 54562395456813}
      Reported-by: NIngo Molnar <mingo@elte.hu>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Tom Zanussi <tzanussi@gmail.com>
      LKML-Reference: <new-submission>
      Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      067187fc
  4. 01 2月, 2011 16 次提交
    • L
      Linux 2.6.38-rc3 · ebf53826
      Linus Torvalds 提交于
      ebf53826
    • L
      Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · 0fd08c55
      Linus Torvalds 提交于
      * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
        NFS: NFSv4 readdir loses entries
        NFS: Micro-optimize nfs4_decode_dirent()
        NFS: Fix an NFS client lockdep issue
        NFS construct consistent co_ownerid for v4.1
        NFS: nfs_wcc_update_inode() should set nfsi->attr_gencount
        NFS improve pnfs_put_deviceid_cache debug print
        NFS fix cb_sequence error processing
        NFS do not find client in NFSv4 pg_authenticate
        NLM: Fix "kernel BUG at fs/lockd/host.c:417!" or ".../host.c:283!"
        NFS: Prevent memory allocation failure in nfsacl_encode()
        NFS: nfsacl_{encode,decode} should return signed integer
        NFS: Fix "kernel BUG at fs/nfs/nfs3xdr.c:1338!"
        NFS: Fix "kernel BUG at fs/aio.c:554!"
        NFS4: Avoid potential NULL pointer dereference in decode_and_add_ds().
        NFS: fix handling of malloc failure during nfs_flush_multi()
      0fd08c55
    • A
      perf python: Fix build on 32-bit · f6bbc1da
      Arnaldo Carvalho de Melo 提交于
      Where there are lots of errors related to python methods receiving
      'char *' for things like file open mode, which break the build, also
      disable strict aliasing and fixup some other warnings. Now builds on
      both 32-bit and 64-bit fedora systems.
      
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Tom Zanussi <tzanussi@gmail.com>
      LKML-Reference: <new-submission>
      Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      f6bbc1da
    • L
      Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm · 7921127e
      Linus Torvalds 提交于
      * 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
        ARM: smp_on_up: allow non-ARM SMP processors
        ARM: io: ensure inb/outb() et.al. are properly ordered on ARMv6+
        ARM: initrd: disable initrd if passed address overlaps reserved region
        ARM: footbridge: fix debug macros
        ARM: mmci: round down the bytes transferred on error
        ARM: mmci: complete the transaction on error
        ARM: 6642/1: mmci: calculate remaining bytes at error correctly
      7921127e
    • L
      Merge branch 'omap-fixes-for-linus' of... · 35a8524f
      Linus Torvalds 提交于
      Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
      
      * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
        arch/arm/mach-omap2/dma.c: Convert IS_ERR result to PTR_ERR
        arm: omap2: mux: fix compile warning
        omap1: Simplify use of omap_irq_flags
        omap2+: Fix unused variable warning for omap_irq_base
      35a8524f
    • R
      kernel.h: fix kernel-doc warning · ffbbf2da
      Randy Dunlap 提交于
      Fix kernel-doc warning in kernel.h from commit 7ef88ad5
      ("BUILD_BUG_ON: make it handle more cases"):
      
        Warning(include/linux/kernel.h:605): No description found for parameter 'condition'
        Warning(include/linux/kernel.h:605): Excess function parameter 'cond' description in 'BUILD_BUG_ON'
      Signed-off-by: NRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ffbbf2da
    • L
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · fb9f1f17
      Linus Torvalds 提交于
      * 'for-linus' of git://oss.sgi.com/xfs/xfs:
        xfs: xfs_bmap_add_extent_delay_real should init br_startblock
        xfs: fix dquot shaker deadlock
        xfs: handle CIl transaction commit failures correctly
        xfs: limit extsize to size of AGs and/or MAXEXTLEN
        xfs: prevent extsize alignment from exceeding maximum extent size
        xfs: limit extent length for allocation to AG size
        xfs: speculative delayed allocation uses rounddown_power_of_2 badly
        xfs: fix efi item leak on forced shutdown
        xfs: fix log ticket leak on forced shutdown.
      fb9f1f17
    • M
      virtio: update MAINTAINERS · 2426ec8f
      Michael S. Tsirkin 提交于
      Patches should keep coming through Rusty but it helps if I'm Cc'd as
      well.
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      Signed-off-by: NRusty Russell <rusty@rustcorp.com.au>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      2426ec8f
    • L
      Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · cbae4873
      Linus Torvalds 提交于
      * 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (42 commits)
        usb: gadget: composite: avoid access beyond array max length
        USB: serial: handle Data Carrier Detect changes
        USB: gadget: Fix endpoint representation in ci13xxx_udc
        USB: gadget: Fix error path in ci13xxx_udc gadget probe function
        usb: pch_udc: Fix the worning log issue at gadget driver remove
        USB: serial: Updated support for ICOM devices
        USB: ehci-mxc: add work-around for efika mx/sb bug
        USB: unbreak ehci-mxc on otg port of i.MX27
        drivers: update to pl2303 usb-serial to support Motorola cables
        USB: adding USB support for Cinterion's HC2x, EU3 and PH8 products
        USB serial: add missing .usb_driver field in serial drivers
        USB: ehci-fsl: Fix 'have_sysif_regs' detection
        USB: g_printer: fix bug in module parameter definitions
        USB: g_printer: fix bug in unregistration
        USB: uss720: remove duplicate USB device
        MAINTAINERS: add ueagle-atm entry
        USB: EHCI: fix DMA deallocation bug
        USB: pch_udc: support new device ML7213 IOH
        usb: pch_udc: Fixed issue which does not work with g_serial
        usb: set ep_dev async suspend should be later than device_initialize
        ...
      cbae4873
    • L
      Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · fb1c6348
      Linus Torvalds 提交于
      * 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (26 commits)
        staging: r8712u: Add new device IDs
        staging: brcm80211: fix suspend/resume issue in brcmsmac
        staging: brcm80211: remove assert to avoid panic since 2.6.37 kernel
        Staging: iio: Aditional fixpoint formatted output bugfix
        staging: usbip: vhci: use urb->dev->portnum to find port
        staging: usbip: vhci: handle EAGAIN from SO_RCVTIMEO
        staging: usbip: vhci: friendly log messages for connection errors
        staging: usbip: vhci: refuse to enqueue for dead connections
        staging: usbip: vhci: give back URBs from in-flight unlink requests
        staging: usbip: vhci: update reference count for usb_device
        staging: usbip: stub: update refcounts for devices and interfaces
        staging: tidspbridge: replace mbox callback with notifier_call
        staging: comedi: ni_labpc: Use shared IRQ for PCMCIA card
        Staging: speakup: &&/|| confusion in silent_store()
        iio: Fixpoint formatted output bugfix
        staging: rt2860: Fix incorrect netif_stop_queue usage warning
        staging: r8712u: Fix memory leak in firmware loading
        staging: tidspbridge: configure full L1 MMU range
        staging: rt2870sta: Add ID for Linksys WUSB100v2
        Staging: xgfib: put parenthesis in the right place
        ...
      fb1c6348
    • L
      Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 · abfa44b5
      Linus Torvalds 提交于
      * 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
        tty/serial: fix apbuart build
        n_hdlc: fix read and write locking
        serial: unbreak billionton CF card
        tty: use for_each_console() and WARN() on sysfs failures
        vt: fix issue when fbcon wants to takeover a second time.
      
      Fix up trivial conflict in drivers/tty/tty_io.c
      abfa44b5
    • R
      ARM: smp_on_up: allow non-ARM SMP processors · e98ff0f5
      Russell King 提交于
      Allow non-ARM SMP processors to use the SMP_ON_UP feature.  CPUs
      supporting SMP must have the new CPU ID format, so check for this first.
      Then check for ARM11MPCore, which fails the MPIDR check.  Lastly check
      the MPIDR reports multiprocessing extensions and that the CPU is part of
      a multiprocessing system.
      
      Cc: <stable@kernel.org>
      Reported-and-Tested-by: NStephen Boyd <sboyd@codeaurora.org>
      Acked-by: NWill Deacon <will.deacon@arm.com>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      e98ff0f5
    • A
      perf probe: Use %td for pointer arithmetic result · 823c7164
      Arnaldo Carvalho de Melo 提交于
      %td is for ptrdiff_t, avoiding this warning on 32-bit:
      
      cc1: warnings being treated as errors
      builtin-probe.c: In function ‘opt_set_filter’:
      builtin-probe.c:176:4: error: format ‘%ld’ expects type ‘long int’, but
      argument 3 has type ‘int’
      
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.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>
      Cc: Tom Zanussi <tzanussi@gmail.com>
      LKML-Reference: <new-submission>
      Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      823c7164
    • A
      perf top: Introduce slang based TUI · c0443df1
      Arnaldo Carvalho de Melo 提交于
      Disabled by default as there are features found in the stdio based one
      that aren't implemented, like live annotation, filtering knobs data
      entry.
      
      Annotation hopefully will get somehow merged with the 'perf annotate'
      code.
      
      To use it:
      
      perf top --tui
      
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Tom Zanussi <tzanussi@gmail.com>
      LKML-Reference: <new-submission>
      Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      c0443df1
    • A
      perf tools: Don't fallback to setup_pager unconditionally · 229ade9b
      Arnaldo Carvalho de Melo 提交于
      Because in tools like 'top' we don't want the pager.
      
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Tom Zanussi <tzanussi@gmail.com>
      LKML-Reference: <new-submission>
      Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      229ade9b
    • A
      perf top: Move display agnostic routines to util/top.[ch] · 8c3e10eb
      Arnaldo Carvalho de Melo 提交于
      Paving the way for a slang browser a la 'perf report --tui'.
      
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Tom Zanussi <tzanussi@gmail.com>
      LKML-Reference: <new-submission>
      Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      8c3e10eb
  5. 31 1月, 2011 14 次提交