1. 09 Feb, 2016 8 commits
  2. 05 Feb, 2016 7 commits
    • Stephane Eranian's avatar
      perf jit: add source line info support · 598b7c69
      Stephane Eranian authored
      This patch adds source line information support to perf for jitted code.
      
      The source line info must be emitted by the runtime, such as JVMTI.
      
      Perf injects extract the source line info from the jitdump file and adds
      the corresponding .debug_lines section in the ELF image generated for
      each jitted function.
      
      The source line enables matching any address in the profile with a
      source file and line number.
      
      The improvement is visible in perf annotate with the source code
      displayed alongside the assembly code.
      
      The dwarf code leverages the support from OProfile which is also
      released under GPLv2.  Copyright 2007 OProfile authors.
      Signed-off-by: default avatarStephane Eranian <eranian@google.com>
      Cc: Adrian Hunter <adrian.hunter@intel.com>
      Cc: Andi Kleen <ak@linux.intel.com>
      Cc: Carl Love <cel@us.ibm.com>
      Cc: David Ahern <dsahern@gmail.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: John McCutchan <johnmccutchan@google.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Pawel Moll <pawel.moll@arm.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Sonny Rao <sonnyrao@chromium.org>
      Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
      Link: http://lkml.kernel.org/r/1448874143-7269-5-git-send-email-eranian@google.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      598b7c69
    • Stephane Eranian's avatar
      perf tools: add JVMTI agent library · 209045ad
      Stephane Eranian authored
      This is a standalone JVMTI library to help  profile Java jitted code with perf
      record/perf report. The library is not installed or compiled automatically by
      perf Makefile. It is not used directly by perf. It is arch agnostic and has
      been tested on X86 and ARM. It needs to be used with a Java runtime, such as
      OpenJDK, as follows:
      
        $ java -agentpath:libjvmti.so .......
      
      See the "Committer Notes" below on how to build it.
      
      When used this way, java will generate a jitdump binary file in
      $HOME/.debug/java/jit/java-jit-*
      
      This binary dump file contains information to help symbolize and
      annotate jitted code.
      
      The jitdump information must be injected into the perf.data file
      using:
      
        $ perf inject --jit -i perf.data -o perf.data.jitted
      
      This injects the MMAP records to cover the jitted code and also generates
      one ELF image for each jitted function. The ELF images are created in the
      same subdir as the jitdump file. The MMAP records point there too.
      
      Then, to visualize the function or asm profile, simply use the regular
      perf commands:
      
        $ perf report -i perf.data.jitted
      
      or
      
        $ perf annotate -i perf.data.jitted
      
      JVMTI agent code adapted from the OProfile's opagent code.
      
      This version of the JVMTI agent is using the CLOCK_MONOTONIC as the time
      source to timestamp jit samples. To correlate with perf_events samples,
      it needs to run on kernel 4.0.0-rc5+ or later with the following commit
      from Peter Zijlstra:
      
        34f43927 ("perf: Add per event clockid support")
      
      With this patch recording jitted code is done as follows:
      
         $ perf record -k mono -- java -agentpath:libjvmti.so .......
      
       --------------------------------------------------------------------------
      
      Committer Notes:
      
      Extended testing instructions:
      
        $ cd tools/perf/jvmti/
        $ dnf install java-devel
        $ make
      
      Then, create some simple java stuff to record some samples:
      
        $ cat hello.java
        public class hello {
      	public static void main(String[] args) {
                       System.out.println("Hello, World");
             	}
        }
        $ javac hello.java
        $ java hello
        Hello, World
        $
      
      And then record it using this jvmti thing:
      
        $ perf record -k mono java -agentpath:/home/acme/git/linux/tools/perf/jvmti/libjvmti.so hello
        java: jvmti: jitdump in /home/acme/.debug/jit/java-jit-20160205.XXWIEDls/jit-1908.dump
        Hello, World
        [ perf record: Woken up 1 times to write data ]
        [ perf record: Captured and wrote 0.030 MB perf.data (268 samples) ]
        $
      
      Now lets insert the PERF_RECORD_MMAP2 records to point jitted mmaps to
      files created by the agent:
      
        $ perf inject --jit -i perf.data -o perf.data.jitted
      
      And finally see that it did its job:
      
        $ perf report -D -i perf.data.jitted | grep PERF_RECORD_MMAP2 | tail -5
        79197149129422 0xfe10 [0xa0]: PERF_RECORD_MMAP2 1908/1923: [0x7f172428bd60(0x80) @ 0x40 fd:02 1840554 1]: --xs /home/acme/.debug/jit/java-jit-20160205.XXWIEDls/jitted-1908-283.so
        79197149235701 0xfeb0 [0xa0]: PERF_RECORD_MMAP2 1908/1923: [0x7f172428ba60(0x180) @ 0x40 fd:02 1840555 1]: --xs /home/acme/.debug/jit/java-jit-20160205.XXWIEDls/jitted-1908-284.so
        79197149250558 0xff50 [0xa0]: PERF_RECORD_MMAP2 1908/1923: [0x7f172428b860(0x180) @ 0x40 fd:02 1840556 1]: --xs /home/acme/.debug/jit/java-jit-20160205.XXWIEDls/jitted-1908-285.so
        79197149714746 0xfff0 [0xa0]: PERF_RECORD_MMAP2 1908/1923: [0x7f172428b660(0x180) @ 0x40 fd:02 1840557 1]: --xs /home/acme/.debug/jit/java-jit-20160205.XXWIEDls/jitted-1908-286.so
        79197149806558 0x10090 [0xa0]: PERF_RECORD_MMAP2 1908/1923: [0x7f172428b460(0x180) @ 0x40 fd:02 1840558 1]: --xs /home/acme/.debug/jit/java-jit-20160205.XXWIEDls/jitted-1908-287.so
        $
      
      So:
      
        $ perf report -D -i perf.data | grep PERF_RECORD_MMAP2 | wc -l
        Failed to open /tmp/perf-1908.map, continuing without symbols
        21
        $ perf report -D -i perf.data.jitted | grep PERF_RECORD_MMAP2 | wc -l
        307
        $ echo $((307 - 21))
        286
        $
      
      286 extra PERF_RECORD_MMAP2 records.
      
      All for thise tiny, with just one function, ELF files:
      
        $ file /home/acme/.debug/jit/java-jit-20160205.XXWIEDls/jitted-1908-9.so
        /home/acme/.debug/jit/java-jit-20160205.XXWIEDls/jitted-1908-9.so: ELF 64-bit LSB shared object, x86-64, version 1 (SYSV), corrupted program header size, BuildID[sha1]=ae54a2ebc3ecf0ba547bfc8cabdea1519df5203f, not stripped
        $ readelf -sw /home/acme/.debug/jit/java-jit-20160205.XXWIEDls/jitted-1908-9.so
      
        Symbol table '.symtab' contains 2 entries:
         Num:    Value          Size Type    Bind   Vis      Ndx Name
           0: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT  UND
           1: 0000000000000040     9 FUNC    LOCAL  DEFAULT    1 atomic_cmpxchg_long
        $
      
      Inserted into the build-id cache:
      
        $ ls -la ~/.debug/.build-id/ae/54a2ebc3ecf0ba547bfc8cabdea1519df5203f
        lrwxrwxrwx. 1 acme acme 111 Feb  5 11:30 /home/acme/.debug/.build-id/ae/54a2ebc3ecf0ba547bfc8cabdea1519df5203f -> ../../home/acme/.debug/jit/java-jit-20160205.XXWIEDls/jitted-1908-9.so/ae54a2ebc3ecf0ba547bfc8cabdea1519df5203f
      
      Note: check why 'file' reports that 'corrupted program header size'.
      
      With a stupid java hog to do some profiling:
      
      $ cat hog.java
        public class hog {
      	private static double do_something_else(int i) {
      		double total = 0;
      		while (i > 0) {
      			total += Math.log(i--);
      		}
      		return total;
      	}
      	private static double do_something(int i) {
      		double total = 0;
      		while (i > 0) {
      			total += Math.sqrt(i--) + do_something_else(i / 100);
      		}
      		return total;
      	}
      	public static void main(String[] args) {
      		System.out.println(String.format("%s=%f & %f", args[0],
      				   do_something(Integer.parseInt(args[0])),
      				   do_something_else(Integer.parseInt(args[1]))));
      	}
        }
        $ javac hog.java
        $ perf record -F 10000 -g -k mono java -agentpath:/home/acme/git/linux/tools/perf/jvmti/libjvmti.so hog 100000 2345000
        java: jvmti: jitdump in /home/acme/.debug/jit/java-jit-20160205.XX4sqd14/jit-8670.dump
        100000=291561592.669602 & 32050989.778714
        [ perf record: Woken up 6 times to write data ]
        [ perf record: Captured and wrote 1.536 MB perf.data (12538 samples) ]
        $ perf inject --jit -i perf.data -o perf.data.jitted
      
      Looking at the 'perf report' TUI, at one expanded callchain leading
      to the jitted code:
      
        $ perf report --no-children -i perf.data.jitted
      
      Samples: 12K of event 'cycles:pp', Event count (approx.): 3829569932
        Overhead  Comm  Shared Object       Symbol
      -   93.38%  java  jitted-8670-291.so  [.] class hog.do_something_else(int)
           class hog.do_something_else(int)
         - Interpreter
            - 75.86% call_stub
                 JavaCalls::call_helper
                 jni_invoke_static
                 jni_CallStaticVoidMethod
                 JavaMain
                 start_thread
            - 17.52% JavaCalls::call_helper
                 jni_invoke_static
                 jni_CallStaticVoidMethod
                 JavaMain
                 start_thread
      Signed-off-by: default avatarStephane Eranian <eranian@google.com>
      Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Adrian Hunter <adrian.hunter@intel.com>
      Cc: Andi Kleen <ak@linux.intel.com>
      Cc: Carl Love <cel@us.ibm.com>
      Cc: David Ahern <dsahern@gmail.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: John McCutchan <johnmccutchan@google.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Pawel Moll <pawel.moll@arm.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Sonny Rao <sonnyrao@chromium.org>
      Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
      Link: http://lkml.kernel.org/r/1448874143-7269-4-git-send-email-eranian@google.com
      [ Made it build on fedora23, added some build/usage instructions ]
      [ Check if filename != NULL in compiled_method_load_cb, fixing segfault ]
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      209045ad
    • Stephane Eranian's avatar
      perf inject: Add jitdump mmap injection support · 9b07e27f
      Stephane Eranian authored
      This patch adds a --jit/-j option to perf inject.
      
      This options injects MMAP records into the perf.data file to cover the
      jitted code mmaps. It also emits ELF images for each function in the
      jidump file.  Those images are created where the jitdump file is.  The
      MMAP records point to that location as well.
      
      Typical flow:
      
        $ perf record -k mono -- java -agentpath:libpjvmti.so java_class
        $ perf inject --jit -i perf.data -o perf.data.jitted
        $ perf report -i perf.data.jitted
      
      Note that jitdump.h support is not limited to Java, it works with any
      jitted environment modified to emit the jitdump file format, include
      those where code can be jitted multiple times and moved around.
      
      The jitdump.h format is adapted from the Oprofile project.
      
      The genelf.c (ELF binary generation) depends on MD5 hash encoding for
      the buildid. To enable this, libssl-dev must be installed. If not, then
      genelf.c defaults to using urandom to generate the buildid, which is not
      ideal.  The Makefile auto-detects the presence on libssl-dev.
      
      This version mmaps the jitdump file to create a marker MMAP record in
      the perf.data file. The marker is used to detect jitdump and cause perf
      inject to inject the jitted mmaps and generate ELF images for jitted
      functions.
      
      In V8, the following fixes and changes were made among other things:
      
        -  the jidump header format include a new flags field to be used
           to carry information about the configuration of the runtime agent.
           Contributed by: Adrian Hunter <adrian.hunter@intel.com>
      
        - Fix mmap pgoff: MMAP event pgoff must be the offset within the ELF file
          at which the code resides.
          Contributed by: Adrian Hunter <adrian.hunter@intel.com>
      
        - Fix ELF virtual addresses: perf tools expect the ELF virtual addresses of dynamic
          objects to match the file offset.
          Contributed by: Adrian Hunter <adrian.hunter@intel.com>
      
        - JIT MMAP injection does not obey finished_round semantics. JIT MMAP injection injects all
          MMAP events in one go, so it does not obey finished_round semantics, so drop the
          finished_round events from the output perf.data file.
          Contributed by: Adrian Hunter <adrian.hunter@intel.com>
      Signed-off-by: default avatarStephane Eranian <eranian@google.com>
      Cc: Adrian Hunter <adrian.hunter@intel.com>
      Cc: Andi Kleen <ak@linux.intel.com>
      Cc: Carl Love <cel@us.ibm.com>
      Cc: David Ahern <dsahern@gmail.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: John McCutchan <johnmccutchan@google.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Pawel Moll <pawel.moll@arm.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Sonny Rao <sonnyrao@chromium.org>
      Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
      Link: http://lkml.kernel.org/r/1448874143-7269-3-git-send-email-eranian@google.com
      [ Moved inject.build_ids ordering bits to a separate patch, fixed the NO_LIBELF=1 build ]
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      9b07e27f
    • Arnaldo Carvalho de Melo's avatar
      perf inject: Make sure mmap records are ordered when injecting build_ids · 921f3fad
      Arnaldo Carvalho de Melo authored
      To make sure the mmap records are ordered correctly and so that the
      correct especially due to jitted code mmaps.
      
      We cannot generate the buildid hit list and inject the jit mmaps (will
      come right after this patch) in at the same time for now.
      Signed-off-by: default avatarStephane Eranian <eranian@google.com>
      Cc: Adrian Hunter <adrian.hunter@intel.com>
      Cc: Andi Kleen <ak@linux.intel.com>
      Cc: Carl Love <cel@us.ibm.com>
      Cc: David Ahern <dsahern@gmail.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: John McCutchan <johnmccutchan@google.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Pawel Moll <pawel.moll@arm.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Sonny Rao <sonnyrao@chromium.org>
      Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
      Link: http://lkml.kernel.org/r/1448874143-7269-3-git-send-email-eranian@google.com
      [ Carved out from a larger patch ]
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      921f3fad
    • Stephane Eranian's avatar
      perf build: Add libcrypto feature detection · 8ee46460
      Stephane Eranian authored
      Will be used to generate build-ids in the jitdump code.
      Signed-off-by: default avatarStephane Eranian <eranian@google.com>
      Cc: Adrian Hunter <adrian.hunter@intel.com>
      Cc: Andi Kleen <ak@linux.intel.com>
      Cc: Carl Love <cel@us.ibm.com>
      Cc: David Ahern <dsahern@gmail.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: John McCutchan <johnmccutchan@google.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Pawel Moll <pawel.moll@arm.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Sonny Rao <sonnyrao@chromium.org>
      Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
      Link: http://lkml.kernel.org/r/1448874143-7269-3-git-send-email-eranian@google.com
      [ tools/perf/Makefile.perf comment about NO_LIBCRYPTO and added it to tests/make ]
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      8ee46460
    • Stephane Eranian's avatar
      perf symbols: add Java demangling support · e9c4bcdd
      Stephane Eranian authored
      Add Java function descriptor demangling support.  Something bfd cannot
      do.
      
      Use the JAVA_DEMANGLE_NORET flag to avoid decoding the return type of
      functions.
      Signed-off-by: default avatarStephane Eranian <eranian@google.com>
      Cc: Adrian Hunter <adrian.hunter@intel.com>
      Cc: Andi Kleen <ak@linux.intel.com>
      Cc: Carl Love <cel@us.ibm.com>
      Cc: David Ahern <dsahern@gmail.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: John McCutchan <johnmccutchan@google.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Pawel Moll <pawel.moll@arm.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Sonny Rao <sonnyrao@chromium.org>
      Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
      Link: http://lkml.kernel.org/r/1448874143-7269-2-git-send-email-eranian@google.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      e9c4bcdd
    • Marcin Ślusarz's avatar
      perf tools: handle spaces in file names obtained from /proc/pid/maps · 89fee59b
      Marcin Ślusarz authored
      Steam frequently puts game binaries in folders with spaces.
      
      Note: "(deleted)" markers are now treated as part of the file name.
      Signed-off-by: default avatarMarcin Ślusarz <marcin.slusarz@gmail.com>
      Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
      Fixes: 60648033 ("perf tools: Use sscanf for parsing /proc/pid/maps")
      Link: http://lkml.kernel.org/r/20160119190303.GA17579@marcin-Inspiron-7720Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      89fee59b
  3. 04 Feb, 2016 16 commits
  4. 03 Feb, 2016 9 commits
    • Jiri Olsa's avatar
      perf stat: Fix interval output values · 51fd2df1
      Jiri Olsa authored
      We broke interval data displays with commit:
      
        3f416f22 ("perf stat: Do not clean event's private stats")
      
      This commit removed stats cleaning, which is important for '-r' option
      to carry counters data over the whole run. But it's necessary to clean
      it for interval mode, otherwise the displayed value is avg of all
      previous values.
      
      Before:
        $ perf stat -e cycles -a -I 1000 record
        #           time             counts unit events
             1.000240796         75,216,287      cycles
             2.000512791        107,823,524      cycles
      
        $ perf stat report
        #           time             counts unit events
             1.000240796         75,216,287      cycles
             2.000512791         91,519,906      cycles
      
      Now:
        $ perf stat report
        #           time             counts unit events
             1.000240796         75,216,287      cycles
             2.000512791        107,823,524      cycles
      
      Notice the second value being bigger (91,.. < 107,..).
      
      This could be easily verified by using perf script which displays raw
      stat data:
      
        $ perf script
        CPU  THREAD       VAL         ENA         RUN        TIME EVENT
          0      -1  23855779  1000209530  1000209530  1000240796 cycles
          1      -1  33340397  1000224964  1000224964  1000240796 cycles
          2      -1  15835415  1000226695  1000226695  1000240796 cycles
          3      -1   2184696  1000228245  1000228245  1000240796 cycles
          0      -1  97014312  2000514533  2000514533  2000512791 cycles
          1      -1  46121497  2000543795  2000543795  2000512791 cycles
          2      -1  32269530  2000543566  2000543566  2000512791 cycles
          3      -1   7634472  2000544108  2000544108  2000512791 cycles
      
      The sum of the first 4 values is the first interval aggregated value:
      
        23855779 + 33340397 + 15835415 + 2184696 = 75,216,287
      
      The sum of the second 4 values minus first value is the second interval
      aggregated value:
      
        97014312 + 46121497 + 32269530 + 7634472 - 75216287 = 107,823,524
      Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
      Cc: Andi Kleen <ak@linux.intel.com>
      Cc: David Ahern <dsahern@gmail.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Stephane Eranian <eranian@google.com>
      Link: http://lkml.kernel.org/r/1454485436-20639-1-git-send-email-jolsa@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      51fd2df1
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · b37a05c0
      Linus Torvalds authored
      Merge fixes from Andrew Morton:
       "18 fixes"
      
      [ The 18 fixes turned into 17 commits, because one of the fixes was a
        fix for another patch in the series that I just folded in by editing
        the patch manually - hopefully correctly     - Linus ]
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
        mm: fix memory leak in copy_huge_pmd()
        drivers/hwspinlock: fix race between radix tree insertion and lookup
        radix-tree: fix race in gang lookup
        mm/vmpressure.c: fix subtree pressure detection
        mm: polish virtual memory accounting
        mm: warn about VmData over RLIMIT_DATA
        Documentation: cgroup-v2: add memory.stat::sock description
        mm: memcontrol: drop superfluous entry in the per-memcg stats array
        drivers/scsi/sg.c: mark VMA as VM_IO to prevent migration
        proc: revert /proc/<pid>/maps [stack:TID] annotation
        numa: fix /proc/<pid>/numa_maps for hugetlbfs on s390
        MAINTAINERS: update Seth email
        ocfs2/cluster: fix memory leak in o2hb_region_release
        lib/test-string_helpers.c: fix and improve string_get_size() tests
        thp: limit number of object to scan on deferred_split_scan()
        thp: change deferred_split_count() to return number of THP in queue
        thp: make split_queue per-node
      b37a05c0
    • Linus Torvalds's avatar
      Merge tag 'for-linus-4.5-2' of git://git.code.sf.net/p/openipmi/linux-ipmi · d5bfb96b
      Linus Torvalds authored
      Pull IPMI fix from Corey Minyard:
       "Fix a compile error on IPMI when ACPI is disabled"
      
      * tag 'for-linus-4.5-2' of git://git.code.sf.net/p/openipmi/linux-ipmi:
        ipmi: put acpi.h with the other headers
      d5bfb96b
    • Linus Torvalds's avatar
      Merge tag 'devicetree-fixes-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · 86270c8d
      Linus Torvalds authored
      Pull DeviceTree fixes from Rob Herring:
      
       - Fix build error with *_OF_DECLARE() when used in modules
      
       - Add missing platform maintainers for dts files in MAINTAINERS
      
      * tag 'devicetree-fixes-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
        of: drop symbols declared by _OF_DECLARE() from modules
        MAINTAINERS: Add missing platform maintainers for dts files
      86270c8d
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-4.5-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 81b676bd
      Linus Torvalds authored
      Pull NFS client bugfix and cleanup from Trond Myklebust:
       "Bugfix:
         - pNFS: Fix for missing layoutreturn calls
      
        Cleanup:
         - pNFS: rename NFS_LAYOUT_RETURN_BEFORE_CLOSE for code clarity"
      
      * tag 'nfs-for-4.5-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        NFS: Cleanup - rename NFS_LAYOUT_RETURN_BEFORE_CLOSE
        pNFS: Fix missing layoutreturn calls
      81b676bd
    • Linus Torvalds's avatar
      Merge tag 'trace-v4.5-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · ef582d09
      Linus Torvalds authored
      Pull tracing fix from Steven Rostedt:
       "A cleanup to the stack tracer broke stack tracing on s390.  Here's a
        simple fix to correct that issue"
      
      * tag 'trace-v4.5-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing/stacktrace: Show entire trace if passed in function not found
      ef582d09
    • Hugh Dickins's avatar
      mm: retire GUP WARN_ON_ONCE that outlived its usefulness · 46435364
      Hugh Dickins authored
      Trinity is now hitting the WARN_ON_ONCE we added in v3.15 commit
      cda540ac ("mm: get_user_pages(write,force) refuse to COW in shared
      areas").  The warning has served its purpose, nobody was harmed by that
      change, so just remove the warning to generate less noise from Trinity.
      
      Which reminds me of the comment I wrongly left behind with that commit
      (but was spotted at the time by Kirill), which has since moved into a
      separate function, and become even more obscure: delete it.
      Reported-by: default avatarDave Jones <davej@codemonkey.org.uk>
      Suggested-by: default avatarKirill A. Shutemov <kirill@shutemov.name>
      Signed-off-by: default avatarHugh Dickins <hughd@google.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      46435364
    • Tony Camuso's avatar
      ipmi: put acpi.h with the other headers · 58c9d61f
      Tony Camuso authored
      Enclosing '#include <linux/acpi.h>' within '#ifdef CONFIG_ACPI' is
      unnecessary, since it has its own conditional compile for CONFIG_ACPI.
      
      Commit 0fbcf4af ("ipmi: Convert the IPMI SI ACPI handling to a
      platform device") exposed this as a problem for platforms that do not
      support ACPI when it introduced a call to ACPI_PTR() macro outside of
      the CONFIG_ACPI conditional compile. This would have been perfectly
      acceptable if acpi.h were not conditionally excluded for the non-acpi
      platform, because the conditional compile within acpi.h defines
      ACPI_PTR() to return NULL when compiled for non acpi platforms.
      Signed-off-by: default avatarTony Camuso <tcamuso@redhat.com>
      
      Fixed commit reference in header to conform to standard.
      Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
      58c9d61f
    • Matthew Wilcox's avatar
      mm: fix memory leak in copy_huge_pmd() · 12c9d70b
      Matthew Wilcox authored
      We allocate a pgtable but do not attach it to anything if the PMD is in
      a DAX VMA, causing it to leak.
      
      We certainly try to not free pgtables associated with the huge zero page
      if the zero page is in a DAX VMA, so I think this is the right solution.
      This needs to be properly audited.
      Signed-off-by: default avatarMatthew Wilcox <matthew.r.wilcox@intel.com>
      Cc: Dan Williams <dan.j.williams@intel.com>
      Acked-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      12c9d70b