Skip to content
  1. Feb 04, 2015
    • Peter Zijlstra (Intel)'s avatar
      perf: Fix move_group() order · 8f95b435
      Peter Zijlstra (Intel) authored
      
      
      Jiri reported triggering the new WARN_ON_ONCE in event_sched_out over
      the weekend:
      
        event_sched_out.isra.79+0x2b9/0x2d0
        group_sched_out+0x69/0xc0
        ctx_sched_out+0x106/0x130
        task_ctx_sched_out+0x37/0x70
        __perf_install_in_context+0x70/0x1a0
        remote_function+0x48/0x60
        generic_exec_single+0x15b/0x1d0
        smp_call_function_single+0x67/0xa0
        task_function_call+0x53/0x80
        perf_install_in_context+0x8b/0x110
      
      I think the below should cure this; if we install a group leader it
      will iterate the (still intact) group list and find its siblings and
      try and install those too -- even though those still have the old
      event->ctx -- in the new ctx.
      
      Upon installing the first group sibling we'd try and schedule out the
      group and trigger the above warn.
      
      Fix this by installing the group leader last, installing siblings
      would have no effect, they're not reachable through the group lists
      and therefore we don't schedule them.
      
      Also delay resetting the state until we're absolutely sure the events
      are quiescent.
      
      Reported-by: default avatarJiri Olsa <jolsa@redhat.com>
      Reported-by: default avatar <vincent.weaver@maine.edu>
      Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
      Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Link: http://lkml.kernel.org/r/20150126162639.GA21418@twins.programming.kicks-ass.net
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      8f95b435
    • Peter Zijlstra's avatar
      perf: Fix event->ctx locking · f63a8daa
      Peter Zijlstra authored
      
      
      There have been a few reported issues wrt. the lack of locking around
      changing event->ctx. This patch tries to address those.
      
      It avoids the whole rwsem thing; and while it appears to work, please
      give it some thought in review.
      
      What I did fail at is sensible runtime checks on the use of
      event->ctx, the RCU use makes it very hard.
      
      Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
      Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Link: http://lkml.kernel.org/r/20150123125834.209535886@infradead.org
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      f63a8daa
    • Peter Zijlstra's avatar
      perf: Add a bit of paranoia · 652884fe
      Peter Zijlstra authored
      
      
      Add a few WARN()s to catch things that should never happen.
      
      Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
      Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Link: http://lkml.kernel.org/r/20150123125834.150481799@infradead.org
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      652884fe
    • Ingo Molnar's avatar
  2. Feb 02, 2015
    • Linus Torvalds's avatar
      Linux 3.19-rc7 · e36f014e
      Linus Torvalds authored
      e36f014e
    • Linus Torvalds's avatar
      Merge tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · fba7e994
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "One more week's worth of fixes.  Worth pointing out here are:
      
         - A patch fixing detaching of iommu registrations when a device is
           removed -- earlier the ops pointer wasn't managed properly
         - Another set of Renesas boards get the same GIC setup fixup as
           others have in previous -rcs
         - Serial port aliases fixups for sunxi.  We did the same to tegra but
           we caught that in time before the merge window due to more machines
           being affected.  Here it took longer for anyone to notice.
         - A couple more DT tweaks on sunxi
         - A follow-up patch for the mvebu coherency disabling in last -rc
           batch"
      
      * tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        arm: dma-mapping: Set DMA IOMMU ops in arm_iommu_attach_device()
        ARM: shmobile: r8a7790: Instantiate GIC from C board code in legacy builds
        ARM: shmobile: r8a73a4: Instantiate GIC from C board code in legacy builds
        ARM: mvebu: don't set the PL310 in I/O coherency mode when I/O coherency is disabled
        ARM: sunxi: dt: Fix aliases
        ARM: dts: sun4i: Add simplefb node with de_fe0-de_be0-lcd0-hdmi pipeline
        ARM: dts: sun6i: ippo-q8h-v5: Fix serial0 alias
        ARM: dts: sunxi: Fix usb-phy support for sun4i/sun5i
      fba7e994
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 3441456b
      Linus Torvalds authored
      Pull input layer updates from Dmitry Torokhov:
       "Just a few quirks for PS/2 this time"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: elantech - add more Fujtisu notebooks to force crc_enabled
        Input: i8042 - add noloop quirk for Medion Akoya E7225 (MD98857)
        Input: synaptics - adjust min/max for Lenovo ThinkPad X1 Carbon 2nd
      3441456b
    • Linus Torvalds's avatar
      sched: don't cause task state changes in nested sleep debugging · 00845eb9
      Linus Torvalds authored
      Commit 8eb23b9f
      
       ("sched: Debug nested sleeps") added code to report
      on nested sleep conditions, which we generally want to avoid because the
      inner sleeping operation can re-set the thread state to TASK_RUNNING,
      but that will then cause the outer sleep loop not actually sleep when it
      calls schedule.
      
      However, that's actually valid traditional behavior, with the inner
      sleep being some fairly rare case (like taking a sleeping lock that
      normally doesn't actually need to sleep).
      
      And the debug code would actually change the state of the task to
      TASK_RUNNING internally, which makes that kind of traditional and
      working code not work at all, because now the nested sleep doesn't just
      sometimes cause the outer one to not block, but will cause it to happen
      every time.
      
      In particular, it will cause the cardbus kernel daemon (pccardd) to
      basically busy-loop doing scheduling, converting a laptop into a heater,
      as reported by Bruno Prémont.  But there may be other legacy uses of
      that nested sleep model in other drivers that are also likely to never
      get converted to the new model.
      
      This fixes both cases:
      
       - don't set TASK_RUNNING when the nested condition happens (note: even
         if WARN_ONCE() only _warns_ once, the return value isn't whether the
         warning happened, but whether the condition for the warning was true.
         So despite the warning only happening once, the "if (WARN_ON(..))"
         would trigger for every nested sleep.
      
       - in the cases where we knowingly disable the warning by using
         "sched_annotate_sleep()", don't change the task state (that is used
         for all core scheduling decisions), instead use '->task_state_change'
         that is used for the debugging decision itself.
      
      (Credit for the second part of the fix goes to Oleg Nesterov: "Can't we
      avoid this subtle change in behaviour DEBUG_ATOMIC_SLEEP adds?" with the
      suggested change to use 'task_state_change' as part of the test)
      
      Reported-and-bisected-by: default avatarBruno Prémont <bonbons@linux-vserver.org>
      Tested-by: default avatarRafael J Wysocki <rjw@rjwysocki.net>
      Acked-by: default avatarOleg Nesterov <oleg@redhat.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>,
      Cc: Ilya Dryomov <ilya.dryomov@inktank.com>,
      Cc: Mike Galbraith <umgwanakikbuti@gmail.com>
      Cc: Ingo Molnar <mingo@kernel.org>
      Cc: Peter Hurley <peter@hurleysoftware.com>,
      Cc: Davidlohr Bueso <dave@stgolabs.net>,
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      00845eb9
    • Rainer Koenig's avatar
      Input: elantech - add more Fujtisu notebooks to force crc_enabled · 47c1ffb2
      Rainer Koenig authored
      
      
      Add two more Fujitsu LIFEBOOK models that also ship with the Elantech
      touchpad and don't work with crc_disabled to the quirk list.
      
      Signed-off-by: default avatarRainer Koenig <Rainer.Koenig@ts.fujitsu.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
      47c1ffb2
    • Olof Johansson's avatar
      Merge tag 'renesas-soc-fixes3-for-v3.19' of... · 28111dda
      Olof Johansson authored
      
      Merge tag 'renesas-soc-fixes3-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
      
      Merge "Third Round of Renesas ARM Based SoC Fixes for v3.19" from Simon Horman:
      
      * Instantiate GIC from C board code in legacy builds on r8a7790 and r8a73a4
      
      * tag 'renesas-soc-fixes3-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        ARM: shmobile: r8a7790: Instantiate GIC from C board code in legacy builds
        ARM: shmobile: r8a73a4: Instantiate GIC from C board code in legacy builds
      
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      28111dda
  3. Feb 01, 2015
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 788807d7
      Linus Torvalds authored
      Pull i2c fixes from Wolfram Sang:
       "i2c driver bugfixes (s3c2410, slave-eeprom, sh_mobile), size
        regression "bugfix" (i2c slave), documentation bugfix (st).
      
        Also, one documentation update (da9063), so some devicetrees can now
        be verified"
      
      * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: sh_mobile: terminate DMA reads properly
        i2c: Only include slave support if selected
        i2c: s3c2410: fix ABBA deadlock by keeping clock prepared
        i2c: slave-eeprom: fix boundary check when using sysfs
        i2c: st: Rename clock reference to something that exists
        DT: i2c: Add devices handled by the da9063 MFD driver
      788807d7
  4. Jan 31, 2015
    • Linus Torvalds's avatar
      Merge tag 'char-misc-3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 2141fd01
      Linus Torvalds authored
      Pull char/misc driver fixes from Greg KH:
       "Here are two tiny patches, one fixing up the drivers/Kconfig file, and
        one adding a MAINTAINERS entry for the UIO git tree"
      
      * tag 'char-misc-3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        drivers/Kconfig: remove duplicate entry for soc
        MAINTAINERS: add git url entry for UIO
      2141fd01
    • Linus Torvalds's avatar
      Merge tag 'staging-3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 5921dfe8
      Linus Torvalds authored
      Pull staging tree fixes from Greg KH:
       "Here are two tiny staging tree fixes.  One for the nvec driver to
        resolve a reported problem, and one to add a MAINTAINERS entry for the
        Android drivers"
      
      * tag 'staging-3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        MAINTAINERS: add Android driver entries
        staging: nvec: specify a platform-device base id
      5921dfe8
    • Linus Torvalds's avatar
      Merge tag 'usb-3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 73dc61cb
      Linus Torvalds authored
      Pull USB fixes from Greg KH:
       "Here are some small USB fixes and quirk additions for 3.19-rc7.
      
        All have been in linux-next for a while with no reported problems"
      
      * tag 'usb-3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        USB: Add OTG PET device to TPL
        usb-storage/SCSI: blacklist FUA on JMicron 152d:2566 USB-SATA controller
        uas: Add no-report-opcodes quirk for Simpletech devices with id 4971:8017
        storage: Revise/fix quirk for 04E6:000F SCM USB-SCSI converter
        usb: phy: never defer probe in non-OF case
        usb: dwc2: call dwc2_is_controller_alive() under spinlock
      73dc61cb
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 6155bc14
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
       "Mostly tooling fixes, but also an event groups fix, two PMU driver
        fixes and a CPU model variant addition"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf: Tighten (and fix) the grouping condition
        perf/x86/intel: Add model number for Airmont
        perf/rapl: Fix crash in rapl_scale()
        perf/x86/intel/uncore: Move uncore_box_init() out of driver initialization
        perf probe: Fix probing kretprobes
        perf symbols: Introduce 'for' method to iterate over the symbols with a given name
        perf probe: Do not rely on map__load() filter to find symbols
        perf symbols: Introduce method to iterate symbols ordered by name
        perf symbols: Return the first entry with a given name in find_by_name method
        perf annotate: Fix memory leaks in LOCK handling
        perf annotate: Handle ins parsing failures
        perf scripting perl: Force to use stdbool
        perf evlist: Remove extraneous 'was' on error message
      6155bc14
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · bc208e0e
      Linus Torvalds authored
      Pull btrfs fix from Chris Mason:
       "We have one more fix for btrfs in my for-linus branch - this was a bug
        in the new raid5/6 scrubbing support"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        btrfs: fix raid56 scrub failed in xfstests btrfs/072
      bc208e0e
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · 92ef9ce3
      Linus Torvalds authored
      Pull quota and UDF fix from Jan Kara:
       "A fix for UDF to properly free preallocated blocks and a fix for quota
        so that Q_GETQUOTA quotactl reports correct numbers for XFS filesystem
        (and similarly Q_XGETQUOTA quotactl works properly for other
        filesystems)"
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        quota: Switch ->get_dqblk() and ->set_dqblk() to use bytes as space units
        udf: Release preallocation on last writeable close
      92ef9ce3
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 1f59fe76
      Linus Torvalds authored
      Pull KVM fixes from Paolo Bonzini:
       "The ARM changes are largish, but not too scary.  And a simple fix for
        x86 (bug introduced in 3.19)"
      
      (Paolo sayus these are the "Final" fixes. We'll see).
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        KVM: x86: check LAPIC presence when building apic_map
        arm/arm64: KVM: Use kernel mapping to perform invalidation on page fault
        arm/arm64: KVM: Invalidate data cache on unmap
        arm/arm64: KVM: Use set/way op trapping to track the state of the caches
      1f59fe76
    • Linus Torvalds's avatar
      Merge tag 'iommu-fixes-v3.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · f3a34041
      Linus Torvalds authored
      Pull IOMMU fixes from Joerg Roedel:
       "Two small fixes for the Tegra GART IOMMU driver:
      
         - provide a .map_sg function for iommu_ops
         - do not register Tegra GART driver as a workaround because of issues
           with it when used from DRM code"
      
      * tag 'iommu-fixes-v3.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
        iommu/tegra: gart: Provide default ->map_sg() callback
        iommu/tegra: gart: Do not register with bus
      f3a34041
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · c6591c81
      Linus Torvalds authored
      Pull intel and dp mst drm fixes from Dave Airlie:
       "Intel had a few more fixes lined up and no point me sitting on them,
        along with a DP MST fix from Rob for a race at undock + vt switch"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm: fix fb-helper vs MST dangling connector ptrs (v2)
        drm/i915: BDW Fix Halo PCI IDs marked as ULT.
        drm/i915: Fix and clean BDW PCH identification
        drm/i915: Only fence tiled region of object.
        drm/i915: fix inconsistent brightness after resume
        drm/i915: Init PPGTT before context enable
      c6591c81
    • Guenter Roeck's avatar
      arc: mm: Fix build failure · e262eb93
      Guenter Roeck authored
      Fix misspelled define.
      
      Fixes: 33692f27
      
       ("vm: add VM_FAULT_SIGSEGV handling support")
      Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      e262eb93
    • Ingo Molnar's avatar
      Merge tag 'perf-core-for-mingo' of... · 1ed39bac
      Ingo Molnar authored
      
      Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
      
      Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
      
       User visible changes:
      
        - Show precise number of samples in at the end of a 'record' session, if
          processing build ids, since we will then traverse the whole perf.data file
          and see all the PERF_RECORD_SAMPLE records, otherwise stop showing the
          previous off-base heuristicly counted number of "samples"  (Namhyung Kim).
      
        - Support to read compressed module from build-id cache (Namhyung Kim)
      
       Infrastructure changes:
      
        - Cache eh/debug frame offset for dwarf unwind (Namhyung Kim)
      
        - Set header version correctly in all cases (Namhyung Kim)
      
        - Set attr.task bit for a tracking event, to be consistent (Namhyung Kim)
          perf tools: Use perf_data_file__fd() consistently
          perf symbols: Convert lseek + read to pread
      
        - Don't rely on malloc working for sz 0, fixing another problem when
          using uClibc (Vineet Gupta)
      
        - Provide stub for missing pthread_attr_setaffinity_np for libcs where this
          is not available, such as uClibc (Vineet Gupta)
      
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      1ed39bac
    • Wolfram Sang's avatar
      i2c: sh_mobile: terminate DMA reads properly · 32e22409
      Wolfram Sang authored
      
      
      DMA read requests could miss proper termination, so two more bytes would
      have been read via PIO overwriting the end of the buffer with wrong
      data. Make DMA stop handling more readable while we are here.
      
      Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
      Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
      32e22409
  5. Jan 30, 2015
    • Radim Krčmář's avatar
      KVM: x86: check LAPIC presence when building apic_map · df04d1d1
      Radim Krčmář authored
      We forgot to re-check LAPIC after splitting the loop in commit
      173beedc
      
       (KVM: x86: Software disabled APIC should still deliver
      NMIs, 2014-11-02).
      
      Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
      Fixes: 173beedc
      
      
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      df04d1d1
    • Paolo Bonzini's avatar
      Merge tag 'kvm-arm-fixes-3.19-2' of... · 02512b2b
      Paolo Bonzini authored
      Merge tag 'kvm-arm-fixes-3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master
      
      Second round of fixes for KVM/ARM for 3.19.
      
      Fixes memory corruption issues on APM platforms and swapping issues on
      DMA-coherent systems.
      02512b2b
    • Dave Airlie's avatar
      Merge tag 'drm-intel-fixes-2015-01-29' of git://anongit.freedesktop.org/drm-intel into drm-fixes · a78b80f5
      Dave Airlie authored
      misc i915 fixes, mostly all stable material as well.
      
      * tag 'drm-intel-fixes-2015-01-29' of git://anongit.freedesktop.org/drm-intel:
        drm/i915: BDW Fix Halo PCI IDs marked as ULT.
        drm/i915: Fix and clean BDW PCH identification
        drm/i915: Only fence tiled region of object.
        drm/i915: fix inconsistent brightness after resume
        drm/i915: Init PPGTT before context enable
      a78b80f5
    • Rob Clark's avatar
      drm: fix fb-helper vs MST dangling connector ptrs (v2) · 2148f18f
      Rob Clark authored
      
      
      VT switch back/forth from console to xserver (for example) has potential
      to go horribly wrong if a dynamic DP MST connector ends up in the saved
      modeset that is restored when switching back to fbcon.
      
      When removing a dynamic connector, don't forget to clean up the saved
      state.
      
      v1: original
      v2: null out set->fb if no more connectors to avoid making i915 cranky
      
      Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1184968
      Cc: stable@vger.kernel.org #v3.17+
      Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      2148f18f
    • Linus Torvalds's avatar
      Merge tag 'dm-3.19-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · 1c999c47
      Linus Torvalds authored
      Pull device mapper fixes from Mike Snitzer:
       "One stable fix for a dm-cache 3.19-rc6 regression and one stable fix
        for dm-thin:
      
         - fix DM cache metadata open/lookup error paths to properly use
           ERR_PTR and IS_ERR (fixes: 3.19-rc6 "stable" commit 9b1cc9f2)
      
         - fix DM thin-provisioning to disallow userspace from sending
           messages to the thin-pool if the pool is in READ_ONLY or FAIL mode
           since no metadata changes are allowed in these modes"
      
      * tag 'dm-3.19-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm thin: don't allow messages to be sent to a pool target in READ_ONLY or FAIL mode
        dm cache: fix missing ERR_PTR returns and handling
      1c999c47
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-3.19-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 353a0c6f
      Linus Torvalds authored
      Pull NFS client bugfixes from Trond Myklebust:
       "Highlights include:
      
         - Stable fix for a NFSv4.1 Oops on mount
         - Stable fix for an O_DIRECT deadlock condition
         - Fix an issue with submounted volumes and fake duplicate inode
           numbers"
      
      * tag 'nfs-for-3.19-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        NFS: Fix use of nfs_attr_use_mounted_on_fileid()
        NFSv4.1: Fix an Oops in nfs41_walk_client_list
        nfs: fix dio deadlock when O_DIRECT flag is flipped
      353a0c6f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 884e00f3
      Linus Torvalds authored
      Pull Ceph fixes from Sage Weil:
       "These paches from Ilya finally squash a race condition with layered
        images that he's been chasing for a while"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
        rbd: drop parent_ref in rbd_dev_unprobe() unconditionally
        rbd: fix rbd_dev_parent_get() when parent_overlap == 0
      884e00f3
    • Marc Zyngier's avatar
      arm/arm64: KVM: Use kernel mapping to perform invalidation on page fault · 0d3e4d4f
      Marc Zyngier authored
      
      
      When handling a fault in stage-2, we need to resync I$ and D$, just
      to be sure we don't leave any old cache line behind.
      
      That's very good, except that we do so using the *user* address.
      Under heavy load (swapping like crazy), we may end up in a situation
      where the page gets mapped in stage-2 while being unmapped from
      userspace by another CPU.
      
      At that point, the DC/IC instructions can generate a fault, which
      we handle with kvm->mmu_lock held. The box quickly deadlocks, user
      is unhappy.
      
      Instead, perform this invalidation through the kernel mapping,
      which is guaranteed to be present. The box is much happier, and so
      am I.
      
      Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
      Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
      0d3e4d4f
    • Marc Zyngier's avatar
      arm/arm64: KVM: Invalidate data cache on unmap · 363ef89f
      Marc Zyngier authored
      
      
      Let's assume a guest has created an uncached mapping, and written
      to that page. Let's also assume that the host uses a cache-coherent
      IO subsystem. Let's finally assume that the host is under memory
      pressure and starts to swap things out.
      
      Before this "uncached" page is evicted, we need to make sure
      we invalidate potential speculated, clean cache lines that are
      sitting there, or the IO subsystem is going to swap out the
      cached view, loosing the data that has been written directly
      into memory.
      
      Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
      Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
      363ef89f
    • Marc Zyngier's avatar
      arm/arm64: KVM: Use set/way op trapping to track the state of the caches · 3c1e7165
      Marc Zyngier authored
      
      
      Trying to emulate the behaviour of set/way cache ops is fairly
      pointless, as there are too many ways we can end-up missing stuff.
      Also, there is some system caches out there that simply ignore
      set/way operations.
      
      So instead of trying to implement them, let's convert it to VA ops,
      and use them as a way to re-enable the trapping of VM ops. That way,
      we can detect the point when the MMU/caches are turned off, and do
      a full VM flush (which is what the guest was trying to do anyway).
      
      This allows a 32bit zImage to boot on the APM thingy, and will
      probably help bootloaders in general.
      
      Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
      Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
      3c1e7165
    • Namhyung Kim's avatar
      perf symbols: Convert lseek + read to pread · c52686f9
      Namhyung Kim authored
      
      
      When dso_cache__read() is called, it reads data from the given offset
      using lseek + normal read syscall.  It can be combined to a single pread
      syscall.
      
      Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
      Cc: Adrian Hunter <adrian.hunter@intel.com>
      Cc: Andi Kleen <andi@firstfloor.org>
      Cc: David Ahern <dsahern@gmail.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Stephane Eranian <eranian@google.com>
      Link: http://lkml.kernel.org/r/1422518843-25818-40-git-send-email-namhyung@kernel.org
      [ Fixed it up when cherry picking it from the multi threaded patchkit ]
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      c52686f9
    • Namhyung Kim's avatar
      perf tools: Use perf_data_file__fd() consistently · 42aa276f
      Namhyung Kim authored
      
      
      Do not reference file->fd directly since we want hide the
      implementation details from outside for possible future changes.
      
      Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
      Cc: Adrian Hunter <adrian.hunter@intel.com>
      Cc: Andi Kleen <andi@firstfloor.org>
      Cc: David Ahern <dsahern@gmail.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Stephane Eranian <eranian@google.com>
      Link: http://lkml.kernel.org/r/1422518843-25818-8-git-send-email-namhyung@kernel.org
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      42aa276f
    • Namhyung Kim's avatar
      perf symbols: Support to read compressed module from build-id cache · 0b064f43
      Namhyung Kim authored
      The commit c00c48fc
      
       ("perf symbols: Preparation for compressed
      kernel module support") added support for compressed kernel modules but
      it only supports system path DSOs.  When a dso is read from build-id
      cache, its filename doesn't end with ".gz" but has build-id.  In this
      case, we should fallback to the original dso->name.
      
      Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
      Cc: Adrian Hunter <adrian.hunter@intel.com>
      Cc: Andi Kleen <andi@firstfloor.org>
      Cc: David Ahern <dsahern@gmail.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Stephane Eranian <eranian@google.com>
      Link: http://lkml.kernel.org/r/1422518843-25818-2-git-send-email-namhyung@kernel.org
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      0b064f43
    • Namhyung Kim's avatar
      perf evsel: Set attr.task bit for a tracking event · 62e503b7
      Namhyung Kim authored
      
      
      The perf_event_attr.task bit is to track task (fork and exit) events but
      it missed to be set by perf_evsel__config().  While it was not a problem
      in practice since setting other bits (comm/mmap) ended up being in same
      result, it'd be good to set it explicitly anyway.
      
      The attr->task is to track task related events (fork/exit) only but
      other meta events like comm and mmap[2] also needs the task events.  So
      setting attr->comm and/or attr->mmap causes the kernel emits the task
      events anyway.  So the attr->task is only meaningful when other bits are
      off but I'd like to set it for completeness.
      
      Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
      Cc: Adrian Hunter <adrian.hunter@intel.com>
      Cc: Andi Kleen <andi@firstfloor.org>
      Cc: David Ahern <dsahern@gmail.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Stephane Eranian <eranian@google.com>
      Link: http://lkml.kernel.org/r/1422518843-25818-6-git-send-email-namhyung@kernel.org
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      62e503b7
    • Namhyung Kim's avatar
      perf header: Set header version correctly · f7913971
      Namhyung Kim authored
      
      
      When check_magic_endian() is called, it checks the magic number in the
      perf data file to determine version and endianness.  But if it uses a
      same endian the verison number wasn't updated and makes confusion.
      
      Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
      Cc: Adrian Hunter <adrian.hunter@intel.com>
      Cc: Andi Kleen <andi@firstfloor.org>
      Cc: David Ahern <dsahern@gmail.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Stephane Eranian <eranian@google.com>
      Link: http://lkml.kernel.org/r/1422518843-25818-5-git-send-email-namhyung@kernel.org
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      f7913971
    • Linus Torvalds's avatar
      Merge tag 'sound-3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · a2ae004a
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "This batch ended up being larger than wished, but there is nothing to
        worry too much there.
      
        Most of commits are for ASoC, a compress NULL dereference fix, a fix
        for probe error handling, and the rest are device-specific fixes.  In
        addition, we have a fix for a long-standing but of seq-dummy driver,
        which just cuts off the buggy part in the end"
      
      * tag 'sound-3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: seq-dummy: remove deadlock-causing events on close
        ASoC: omap-mcbsp: Correct CBM_CFS dai format configuration
        ASoC: soc-compress.c: fix NULL dereference
        ASoC: rt286: set the same format for dac and adc
        ASoC: wm8904: fix runtime warning
        ASoC: simple-card: Fix crash in asoc_simple_card_unref()
        ASoC: fsl: imx-wm8962: Set the card owner field
        ASoC: pcm512x: Fix DSP program selection
        ASoC: rt5677: Modify the behavior that updates the PLL parameter.
        ASoC: fsl_ssi: Fix irq error check
        ASoC: rockchip: i2s: applys rate symmetry for CPU DAI
        ASoC: Intel: Add NULL checks for the stream pointer
        ASoC: wm8960: Fix capture sample rate from 11250 to 11025
        ASoC: adi: Add missing return statement.
        ASoC: Intel: Don't change offset of block allocator during fixed allocate
        ASoC: ts3a227e: Check and report jack status at probe
        ASoC: fsl_esai: Fix incorrect xDC field width of xCCR registers
      a2ae004a
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-v3.19-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 297614f3
      Linus Torvalds authored
      Pull final pin control fix from Linus Walleij:
       "A late pin control fix for the v3.19 series: The AT91 gpio controller
        would miss wakeup events, this single fix make it work properly"
      
      [ "Final"? Yeah, I'll believe that once I've actually released 3.19 ;)   - Linus ]
      
      * tag 'pinctrl-v3.19-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
        pinctrl: at91: allow to have disabled gpio bank
      297614f3