1. 04 Mar, 2011 3 commits
    • Ingo Molnar's avatar
      Merge branch 'perf/urgent' into perf/core · 888a8a3e
      Ingo Molnar authored
      Merge reason: Pick up updates before queueing up dependent patches.
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      888a8a3e
    • Frederic Weisbecker's avatar
      perf: Fix undefined PyVarObject_HEAD_INIT in python 2.5 · cfff2d90
      Frederic Weisbecker authored
      PyVarObject_HEAD_INIT is undefined in python 2.5, resulting
      in a build crash:
      
      	util/python.c:81: attention : déclaration implicite de la fonction « «PyVarObject_HEAD_INIT» »
      	util/python.c:82: erreur: request for member «tp_name» in something not a structure or union
      	util/python.c:117: erreur: request for member «tp_name» in something not a structure or union
      	util/python.c:146: erreur: request for member «tp_name» in something not a structure or union
      	util/python.c:177: erreur: request for member «tp_name» in something not a structure or union
      	util/python.c:290: erreur: request for member «tp_name» in something not a structure or union
      	util/python.c:359: erreur: request for member «tp_name» in something not a structure or union
      	util/python.c:532: erreur: request for member «tp_name» in something not a structure or union
      	util/python.c:761: erreur: request for member «tp_name» in something not a structure or union
      	error: command 'gcc' failed with exit status 1
      	make: *** [python/perf.so] Erreur 1
      
      We can fix that by defining PyVarObject_HEAD_INIT as a wrapper on
      PyObject_HEAD_INIT, thanks to a trick found on biopython:
      https://github.com/biopython/biopython/commit/d4eaf57946c7b4c32eca8d18821edf32f83e300dSigned-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Tom Zanussi <tzanussi@gmail.com>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      cfff2d90
    • Frederic Weisbecker's avatar
      perf: Fix missing strndup declaration · ff9ae1ba
      Frederic Weisbecker authored
      <ctype.h> is included first without _GNU_SOURCE, so it ends up
      including <string.h> without declaring strndup(). And further
      <string.h> declarations, even with _GNU_SOURCE defined, are
      of course without effect.
      
      Therefore:
      
      	util/strfilter.c: Dans la fonction «strfilter_node__new» :
      	util/strfilter.c:134: attention : déclaration implicite de la fonction « «strndup» »
      	util/strfilter.c:134: attention : incompatible implicit declaration of built-in function «strndup»
      	make: *** [util/strfilter.o] Erreur 1
      
      Just don't include ctype.h as it doesn't appear to be necessary
      anyway.
      Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Tom Zanussi <tzanussi@gmail.com>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      ff9ae1ba
  2. 03 Mar, 2011 1 commit
  3. 02 Mar, 2011 2 commits
    • Frederic Weisbecker's avatar
      perf: Set filters before mmaping events · 0a102479
      Frederic Weisbecker authored
      We currently set the filters after we mmap the events, this is a
      race that let undesired events record themselves in the buffer before
      we had the time to set the filters.
      
      So set the filters before they can be recorded. That also librarizes
      the filters setting so that filtering can be done more easily
      from other tools than perf record later.
      Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Tom Zanussi <tzanussi@gmail.com>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      0a102479
    • Lin Ming's avatar
      perf, x86: Add Intel SandyBridge CPU support · b06b3d49
      Lin Ming authored
      This patch adds basic SandyBridge support, including hardware
      cache events and PEBS events support.
      
      It has been tested on SandyBridge CPUs with perf stat and also
      with PEBS based profiling - both work fine.
      
      The patch does not affect other models.
      
      v2 -> v3:
       - fix PEBS event 0xd0 with right umask combinations
       - move snb pebs constraint assignment to intel_pmu_init
      
      v1 -> v2:
       - add more raw and PEBS events constraints
       - use offcore events for LLC-* cache events
       - remove the call to Nehalem workaround enable_all function
      Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
      Acked-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Andi Kleen <andi@firstfloor.org>
      LKML-Reference: <1299072424.2175.24.camel@localhost>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      b06b3d49
  4. 01 Mar, 2011 4 commits
    • Arnaldo Carvalho de Melo's avatar
      perf top tui: Wait till the first sample to refresh the screen. · 5807806a
      Arnaldo Carvalho de Melo authored
      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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      5807806a
    • Arnaldo Carvalho de Melo's avatar
      perf top: Fix reporting of invalid --vmlinux · 374cfe56
      Arnaldo Carvalho de Melo authored
      Using ui__warning, that will, in --tui, show a window with the message,
      waiting for the user to press Ok.
      
      Also run exit_browser() to let newt do its final cleaning of the screen.
      
      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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      374cfe56
    • Arnaldo Carvalho de Melo's avatar
      perf tui: Make ui__warning modal · a1ceb741
      Arnaldo Carvalho de Melo authored
      By taking the ui__lock so that no other screen updates take place while
      waiting for the user.
      
      That was happening when handling an invalid --vmlinux parameter in 'perf
      top --tui', with the screen refresh routine repainting the screen and
      removing the warning window.
      
      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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      a1ceb741
    • Arnaldo Carvalho de Melo's avatar
      perf top browser: Handle empty active symbols list · 3166fc8f
      Arnaldo Carvalho de Melo authored
      Fixing a SEGV. An empty list could happen when not being able to resolve
      symbols, for instance when --vmlinux invalid-file is used.
      
      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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      3166fc8f
  5. 28 Feb, 2011 3 commits
    • Arnaldo Carvalho de Melo's avatar
      perf symbols: Fix vmlinux path when not using --symfs · a639dc64
      Arnaldo Carvalho de Melo authored
      The ec5761ea cset introduced the symfs feature with a bug for loading vmlinux
      files that ended up causing this failure:
      
      [root@emilia v2.6.38-rc5+]# strace -e trace=open perf top --vmlinux ./vmlinux 2>&1 | tail -3
      open("/./vmlinux", O_RDONLY)            = -1 ENOENT (No such file or directory)
      ./vmlinux with build id b9266bf40e98dadb5d43a2f3e95d3c5d4aff46dc not found, continuing without symbols
      The ./vmlinux file can't be used
      [root@emilia v2.6.38-rc5+]#
      
      Remove the extra slash, just like is done in the DSO__ORIG_DSO handling in
      dso__load() and other parts of the ec5761ea cset.
      Reported-by: default avatarIngo Molnar <mingo@elte.hu>
      Cc: David Ahern <daahern@cisco.com>
      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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      a639dc64
    • Thomas Renninger's avatar
      perf timechart: Fix max number of cpus · 54b08f5f
      Thomas Renninger authored
      Currently numcpus is determined in pid_put_sample which is only
      called on sched_switch/sched_wakeup sample processing.
      
      On a machine with a lot cpus I often saw the last cpu missing.
      
      Check for (max) numcpus on every event happening and in the
      beginning. -> fixes the issue for me.
      Signed-off-by: default avatarThomas Renninger <trenn@suse.de>
      Cc: Arjan van de Ven <arjan@linux.intel.com>
      Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
      Cc: lenb@kernel.org
      LKML-Reference: <1298842606-55712-6-git-send-email-trenn@suse.de>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      54b08f5f
    • Thomas Renninger's avatar
      perf timechart: Fix black idle boxes in the title · e8530720
      Thomas Renninger authored
      This fix is needed for eye of gnome and firefox svg viewers.
      Only Inkscape can handle the broken case.
      
      Compare with the other svg_legenda_box declarations, looks
      like a typo slipped in at this place.
      Signed-off-by: default avatarThomas Renninger <trenn@suse.de>
      Cc: Arjan van de Ven <arjan@linux.intel.com>
      Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
      Cc: lenb@kernel.org
      LKML-Reference: <1298842606-55712-5-git-send-email-trenn@suse.de>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      e8530720
  6. 25 Feb, 2011 3 commits
    • Arnaldo Carvalho de Melo's avatar
      perf ui browser: Introduce ui_browser__show_title · b210b3bb
      Arnaldo Carvalho de Melo authored
      Needed because we were only showing the title in ui_browser__show,
      not in ui_browser__run, and in the run loop we may be calling other
      browsers that would then change the title, when we go back to the
      previous browser, we need to redraw the title.
      
      We could have done this as the Newt help line, with pop, etc, but I
      don't think its worth, doing it explicitely, when needed (some browsers
      may not use the title area at all) seems enough/more flexible.
      
      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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      b210b3bb
    • Arnaldo Carvalho de Melo's avatar
      perf top browser: Fix up exit keys · c16bfe9a
      Arnaldo Carvalho de Melo authored
      The left key was exiting 'perf top --tui' when it really shouldn't, it
      was too easy to leave the live annotation window and then press one too
      many <- and get out of the tool altogether.
      
      Do just like the report TUI does, ignore the left key for exit and also
      ask the user when pressing ESC if that is really what is wanted.
      Reported-by: default avatarMike Galbraith <efault@gmx.de>
      Suggested-by: default avatarIngo 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      c16bfe9a
    • Arnaldo Carvalho de Melo's avatar
      perf hists: Print number of samples, not the period sum · 69cf0218
      Arnaldo Carvalho de Melo authored
      So that we match the header where we state the number of events with the
      "Samples" column when using 'perf report -n/--show-nr-samples':
      
       [root@emilia ~]# perf record -a sleep 1
       [ perf record: Woken up 1 times to write data ]
       [ perf record: Captured and wrote 0.111 MB perf.data (~4860 samples) ]
       [root@emilia ~]# perf report --stdio --show-nr-samples
       # Events: 11  cycles
       #
       # Overhead  Samples        Command       Shared Object                        Symbol
       # ........ ..........  ...........  ..................  ............................
       #
           16.65%          1        sleep  [kernel.kallsyms]   [k] unmap_vmas
           16.10%          1         perf  libpthread-2.12.so  [.] __pthread_cleanup_push_defer
           15.79%          2         perf  [kernel.kallsyms]   [k] format_decode
           12.88%          1  kworker/1:2  [kernel.kallsyms]   [k] cache_reap
           10.69%          1      swapper  [kernel.kallsyms]   [k] _raw_spin_lock
            7.55%          1        sleep  [kernel.kallsyms]   [k] prepare_exec_creds
            6.00%          1         perf  [jbd2]              [k] start_this_handle
            5.29%          1         perf  [kernel.kallsyms]   [k] seq_read
            4.75%          1         perf  [kernel.kallsyms]   [k] get_pid_task
            4.30%          1         perf  [kernel.kallsyms]   [k] _raw_spin_unlock_irqrestore
      
       #
       # (For a higher level overview, try: perf report --sort comm,dso)
       #
       [root@emilia ~]#
      Reported-by: default avatarStephane Eranian <eranian@google.com>
      Reported-by: default avatarCliff Wickman <cpw@sgi.com>
      Acked-by: default avatarStephane Eranian <eranian@google.com>
      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>
      Cc: <stable@kernel.org>
      LKML-Reference: <new-submission>
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      [ cherry-picked it from perf/core, as it has been reported by others as well. ]
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      69cf0218
  7. 23 Feb, 2011 11 commits
  8. 22 Feb, 2011 13 commits
    • Kevin Hilman's avatar
      i2c-omap: fix static suspend vs. runtime suspend · adf6e079
      Kevin Hilman authored
      When runtime PM is enabled, each OMAP i2c device is suspended after
      each i2c xfer.  However, there are two cases when the static suspend
      methods must be used to ensure the devices are suspended:
      
      1) runtime PM is disabled, either at compile time or dynamically
          via /sys/devices/.../power/control.
      2) an i2c client driver uses i2c during it's suspend callback, thus
         leaving the i2c driver active (NOTE: runtime suspend transitions are
         disabled during system suspend, so i2c activity during system
         suspend will runtime resume the device, but not runtime (re)suspend it.)
      
      Since the actual work to suspend the device is handled by the
      subsytem, call the bus methods to take care of it.
      
      NOTE: This takes care of a known suspend problem on OMAP3 where the
      TWL RTC driver does i2c xfers during its suspend path leaving the i2c
      driver in an active state (since runtime suspend transistions are
      disabled.)
      Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
      Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
      adf6e079
    • Wolfram Sang's avatar
      i2c-stu300: make sure adapter-name is terminated · f10820e4
      Wolfram Sang authored
      Use strlcpy instead of strncpy.
      Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
      Cc: Linus Walleij <linus.walleij@stericsson.com>
      Cc: Ben Dooks <ben-linux@fluff.org>
      Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
      f10820e4
    • Linus Torvalds's avatar
      Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 · d8204a37
      Linus Torvalds authored
      * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
        pcmcia: re-enable Zoomed Video support
        cm4000_cs: Fix undefined ops warning
        pcmcia vs. MECR on pxa25x/sa1111
        drivers/char/pcmcia/ipwireless/main.c: Convert release_resource to release_region/release_mem_region
      d8204a37
    • Linus Torvalds's avatar
      Merge branch 'irq-fixes-for-linus' of... · 571020df
      Linus Torvalds authored
      Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        genirq: Disable the SHIRQ_DEBUG call in request_threaded_irq for now
        genirq: Prevent access beyond allocated_irqs bitmap
      571020df
    • Linus Torvalds's avatar
      Merge branch 'perf-fixes-for-linus' of... · ee883477
      Linus Torvalds authored
      Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        perf: Fix throttle logic
        perf, x86: P4 PMU: Fix spurious NMI messages
      ee883477
    • Linus Torvalds's avatar
      Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 609b06f3
      Linus Torvalds authored
      * 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ASoC: Ensure supplies are maintained for force enabled widgets
        ASoC: WM8994: Improve playback robustness
        ASoC: WM8994: Improve robustness in some use cases
        ASoC: WM8903: Fix mic detection enable logic
        ASoC: WM8903: Fix mic detection register definitions
        ASoC: CX20442: fix wrong reg_cache_default content
        ASoC: Sync initial widget state with hardware
      609b06f3
    • Romain Francoise's avatar
      .gitignore: ignore *.xz files · 790e10ba
      Romain Francoise authored
      Building with CONFIG_KERNEL_XZ results in the following:
      
       # Untracked files:
       #   (use "git add <file>..." to include in what will be committed)
       #
       #       arch/x86/boot/compressed/vmlinux.bin.xz
      
      So ignore xz-compressed files at the top level like we already do for
      other compression types.
      Signed-off-by: default avatarRomain Francoise <romain@orebokech.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      790e10ba
    • Arnaldo Carvalho de Melo's avatar
      perf top: Live TUI Annotation · c97cf422
      Arnaldo Carvalho de Melo authored
      Now one has just to press the right key, 'a' or Enter on the main 'perf
      top --tui' screen to live annotate the symbol under the cursor.
      
      The annotate window starts centered on the hottest line (the one with
      most samples so far) then TAB and shift+TAB can be used to go to the
      prev/next hot line.
      
      Pressing 'H' at any point will center again the screen on the hottest
      line.
      
      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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      c97cf422
    • Arnaldo Carvalho de Melo's avatar
      perf probe: Remove redundant checks · 8635bf6e
      Arnaldo Carvalho de Melo authored
      While fixing an error propagating problem in f809b25 I added two
      redundant checks.
      
      I did that because I didn't expect the checks to be on the while and for
      loop condition expression, where they are tested before we run the loop,
      where the 'ret' variable is set.
      
      So remove it from there and leave it just after it is actually set,
      eliminating unneded tests.
      Reported-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
      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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      8635bf6e
    • Arnaldo Carvalho de Melo's avatar
      perf evsel: Fix inverted test for fixing up attr.inherit flag · e603dc15
      Arnaldo Carvalho de Melo authored
      The kernel refuses mmapping an event with the inherit flag set for
      something that is systemwide (cpu == -1), and the evsel layer got this
      reversed at some point, fix it.
      
      The symtom was that the --pid and --tid parameters for 'perf record' and
      'perf top' returned with -EINVAL, like:
      
       # /tmp/build-perf/perf record -v -fo/tmp/perf.data -p 1042
         Warning:  ... trying to fall back to cpu-clock-ticks
      
         Fatal: failed to mmap with 22 (Invalid argument)
      Reported-by: default avatarDavid Ahern <dsahern@gmail.com>
      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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      e603dc15
    • Linus Torvalds's avatar
      Linux 2.6.38-rc6 · f5412be5
      Linus Torvalds authored
      f5412be5
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6 · 3b71710f
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
        eCryptfs: Copy up lower inode attrs in getattr
        ecryptfs: read on a directory should return EISDIR if not supported
        eCryptfs: Handle NULL nameidata pointers
        eCryptfs: Revert "dont call lookup_one_len to avoid NULL nameidata"
      3b71710f
    • Arnaldo Carvalho de Melo's avatar
      perf probe: Fix error propagation leading to segfault · fbee632d
      Arnaldo Carvalho de Melo authored
      There are two hunks in this patch that stops probe processing as soon as one
      error is found, breaking out of loops, the other fix an error propagation that
      should return a negative error number but instead was returning the result of
      "ret < 0", which is 1 and thus made several error checks fail because they test
      agains < 0.
      
      The problem could be triggered by asking for a variable that was optimized out,
      fact that should stop the whole probe processing but instead was segfaulting
      while installing broken probes:
      
      [root@emilia ~]# probe perf_mmap:55 user_lock_limit
      Failed to find the location of user_lock_limit at this address.
       Perhaps, it has been optimized out.
      Failed to find 'user_lock_limit' in this function.
      Add new events:
        probe:perf_mmap      (on perf_mmap:55 with user_lock_limit)
        probe:perf_mmap_1    (on perf_mmap:55 with user_lock_limit)
      Segmentation fault (core dumped)
      [root@emilia ~]# perf probe -l
        probe:perf_mmap      (on perf_mmap:55@git/linux/kernel/perf_event.c with user_lock_limit)
        probe:perf_mmap_1    (on perf_mmap:55@git/linux/kernel/perf_event.c with user_lock_limit)
      [root@emilia ~]#
      
      After the fix:
      
      [root@emilia ~]# probe perf_mmap:55 user_lock_limit
      Failed to find the location of user_lock_limit at this address.
       Perhaps, it has been optimized out.
      Failed to find 'user_lock_limit' in this function.
        Error: Failed to add events. (-2)
      [root@emilia ~]#
      
      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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      fbee632d