Skip to content
  1. May 30, 2014
    • Stefan Richter's avatar
      firewire: ohci: enable MSI for VIA VT6315 rev 1, drop cycle timer quirk · d151f985
      Stefan Richter authored
      Commit af0cdf49
      
       "firewire: ohci: fix regression with VIA VT6315,
      disable MSI" acted upon a report against VT6315 rev 0:
      http://linux.derkeiler.com/Mailing-Lists/Kernel/2010-12/msg02301.html
      $ lspci -nn
      VIA Technologies, Inc. VT6315 Series Firewire Controller [1106:3403]
      
      I now got a card with
      $ lspci -nn
      VIA Technologies, Inc. VT6315 Series Firewire Controller [1106:3403] (rev 01)
      and this works fine with MSI enabled.
      
      Second, I tested this VT6315 rev 1 without CYCLE_TIMER quirk flag using
      http://me.in-berlin.de/~s5r6/linux1394/utils/test_cycle_time_v20100125.c
      and found that this chip does in fact access the cycle timer atomically.
      
      Things I can't test because I don't have the hardware:
        - whether VT6315 rev 0 really needs QUIRK_CYCLE_TIMER,
        - whether the VT6320 PCI device needs QUIRK_CYCLE_TIMER,
        - whether the VT6325 and VT6330 PCIe devices need QUIRK_CYCLE_TIMER
          and QUIRK_NO_MSI.
      
      Hence, just add a whitelist entry specifically for VT6315 rev >= 1
      without any quirk flags.  Before this entry we need an extra entry to
      catch VT6315 rev <= 0 due to how our ID matching logic works.
      
      Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
      d151f985
  2. May 17, 2014
  3. May 12, 2014
  4. May 10, 2014
    • Linus Torvalds's avatar
      Linux 3.15-rc5 · d6d211db
      Linus Torvalds authored
      d6d211db
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 181da3c3
      Linus Torvalds authored
      Pull x86 fixes from Peter Anvin:
       "A somewhat unpleasantly large collection of small fixes.  The big ones
        are the __visible tree sweep and a fix for 'earlyprintk=efi,keep'.  It
        was using __init functions with predictably suboptimal results.
      
        Another key fix is a build fix which would produce output that simply
        would not decompress correctly in some configuration, due to the
        existing Makefiles picking up an unfortunate local label and mistaking
        it for the global symbol _end.
      
        Additional fixes include the handling of 64-bit numbers when setting
        the vdso data page (a latent bug which became manifest when i386
        started exporting a vdso with time functions), a fix to the new MSR
        manipulation accessors which would cause features to not get properly
        unblocked, a build fix for 32-bit userland, and a few new platform
        quirks"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, vdso, time: Cast tv_nsec to u64 for proper shifting in update_vsyscall()
        x86: Fix typo in MSR_IA32_MISC_ENABLE_LIMIT_CPUID macro
        x86: Fix typo preventing msr_set/clear_bit from having an effect
        x86/intel: Add quirk to disable HPET for the Baytrail platform
        x86/hpet: Make boot_hpet_disable extern
        x86-64, build: Fix stack protector Makefile breakage with 32-bit userland
        x86/reboot: Add reboot quirk for Certec BPC600
        asmlinkage: Add explicit __visible to drivers/*, lib/*, kernel/*
        asmlinkage, x86: Add explicit __visible to arch/x86/*
        asmlinkage: Revert "lto: Make asmlinkage __visible"
        x86, build: Don't get confused by local symbols
        x86/efi: earlyprintk=efi,keep fix
      181da3c3
  5. May 09, 2014
    • Boris Ostrovsky's avatar
      x86, vdso, time: Cast tv_nsec to u64 for proper shifting in update_vsyscall() · 28b92e09
      Boris Ostrovsky authored
      
      
      With tk->wall_to_monotonic.tv_nsec being a 32-bit value on 32-bit
      systems, (tk->wall_to_monotonic.tv_nsec << tk->shift) in update_vsyscall()
      may lose upper bits or, worse, add them since compiler will do this:
      	(u64)(tk->wall_to_monotonic.tv_nsec << tk->shift)
      instead of
      	((u64)tk->wall_to_monotonic.tv_nsec << tk->shift)
      
      So if, for example, tv_nsec is 0x800000 and shift is 8 we will end up
      with 0xffffffff80000000 instead of 0x80000000. And then we are stuck in
      the subsequent 'while' loop.
      
      We need an explicit cast.
      
      Signed-off-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
      Link: http://lkml.kernel.org/r/1399648287-15178-1-git-send-email-boris.ostrovsky@oracle.com
      Acked-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      Cc: <stable@vger.kernel.org> # v3.14
      Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
      28b92e09
    • Andres Freund's avatar
      x86: Fix typo in MSR_IA32_MISC_ENABLE_LIMIT_CPUID macro · c45f7736
      Andres Freund authored
      The spuriously added semicolon didn't have any effect because the
      macro isn't currently in use.
      
      c0a639ad
      
      
      
      Signed-off-by: default avatarAndres Freund <andres@anarazel.de>
      Link: http://lkml.kernel.org/r/1399598957-7011-3-git-send-email-andres@anarazel.de
      Cc: Borislav Petkov <bp@suse.de>
      Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
      c45f7736
    • Andres Freund's avatar
      x86: Fix typo preventing msr_set/clear_bit from having an effect · 722a0d22
      Andres Freund authored
      Due to a typo the msr accessor function introduced in
      22085a66 didn't have any lasting
      effects because they accidentally wrote the old value back.
      
      After c0a639ad
      
       this at the very least
      this causes cpuid limits not to be lifted on some cpus leading to
      missing capabilities for those.
      
      Signed-off-by: default avatarAndres Freund <andres@anarazel.de>
      Link: http://lkml.kernel.org/r/1399598957-7011-2-git-send-email-andres@anarazel.de
      Cc: Borislav Petkov <bp@suse.de>
      Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
      722a0d22
    • Linus Torvalds's avatar
      Merge tag 'xfs-for-linus-3.15-rc5' of git://oss.sgi.com/xfs/xfs · afcf0a2d
      Linus Torvalds authored
      Pull xfs fixes from Dave Chinner:
       "The main fix is adding support for default ACLs on O_TMPFILE opened
        inodes to bring XFS into line with other filesystems.  Metadata CRCs
        are now also considered well enough tested to be fully supported, so
        we're removing the shouty warnings issued at mount time for
        filesystems with that format.  And there's transaction block
        reservation overrun fix.
      
        Summary:
         - fix a remote attribute size calculation bug that leads to a
           transaction overrun
         - add default ACLs to O_TMPFILE files
         - Remove the EXPERIMENTAL tag from filesystems with metadata CRC
           support"
      
      * tag 'xfs-for-linus-3.15-rc5' of git://oss.sgi.com/xfs/xfs:
        xfs: remote attribute overwrite causes transaction overrun
        xfs: initialize default acls for ->tmpfile()
        xfs: fully support v5 format filesystems
      afcf0a2d
    • Linus Torvalds's avatar
      Merge tag 'trace-fixes-v3.15-rc4-v2' of... · f322e262
      Linus Torvalds authored
      Merge tag 'trace-fixes-v3.15-rc4-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
      
      Pull tracing fixes from Steven Rostedt:
       "This contains two fixes.
      
        The first is a long standing bug that causes bogus data to show up in
        the refcnt field of the module_refcnt tracepoint.  It was introduced
        by a merge conflict resolution back in 2.6.35-rc days.
      
        The result should be 'refcnt = incs - decs', but instead it did
        'refcnt = incs + decs'.
      
        The second fix is to a bug that was introduced in this merge window
        that allowed for a tracepoint funcs pointer to be used after it was
        freed.  Moving the location of where the probes are released solved
        the problem"
      
      * tag 'trace-fixes-v3.15-rc4-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracepoint: Fix use of tracepoint funcs after rcu free
        trace: module: Maintain a valid user count
      f322e262
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · d86561b4
      Linus Torvalds authored
      Pull input subsystem fixes from Dmitry Torokhov:
       "Just a few fixups to various drivers"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: elantech - fix touchpad initialization on Gigabyte U2442
        Input: tca8418 - fix loading this driver as a module from a device tree
        Input: bma150 - extend chip detection for bma180
        Input: atkbd - fix keyboard not working on some LG laptops
        Input: synaptics - add min/max quirk for ThinkPad Edge E431
      d86561b4
    • Linus Torvalds's avatar
      Merge tag 'sound-3.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · c6c96d7b
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "A bunch of small fixes for USB-audio and HD-audio, where most of them
        are for regressions: USB-audio PM fixes, ratelimit annoyance fix, HDMI
        offline state fix, and a couple of device-specific quirks"
      
      * tag 'sound-3.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - hdmi: Set converter channel count even without sink
        ALSA: usb-audio: work around corrupted TEAC UD-H01 feedback data
        ALSA: usb-audio: Fix deadlocks at resuming
        ALSA: usb-audio: Save mixer status only once at suspend
        ALSA: usb-audio: Prevent printk ratelimiting from spamming kernel log while DEBUG not defined
        ALSA: hda - add headset mic detect quirk for a Dell laptop
      c6c96d7b
    • Linus Torvalds's avatar
      Merge tag 'mfd-mmc-fixes-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd · 1b826a94
      Linus Torvalds authored
      Pull mmc/rtsx revert from Lee Jones.
      
      * tag 'mfd-mmc-fixes-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
        mmc: rtsx: Revert "mmc: rtsx: add support for pre_req and post_req"
      1b826a94
  6. May 08, 2014
    • Mathieu Desnoyers's avatar
      tracepoint: Fix use of tracepoint funcs after rcu free · 8058bd0f
      Mathieu Desnoyers authored
      Commit de7b2973
      
       "tracepoint: Use struct pointer instead of name hash
      for reg/unreg tracepoints" introduces a use after free by calling
      release_probes on the old struct tracepoint array before the newly
      allocated array is published with rcu_assign_pointer. There is a race
      window where tracepoints (RCU readers) can perform a
      "use-after-grace-period-after-free", which shows up as a GPF in
      stress-tests.
      
      Link: http://lkml.kernel.org/r/53698021.5020108@oracle.com
      Link: http://lkml.kernel.org/p/1399549669-25465-1-git-send-email-mathieu.desnoyers@efficios.com
      
      Reported-by: default avatarSasha Levin <sasha.levin@oracle.com>
      CC: Oleg Nesterov <oleg@redhat.com>
      CC: Dave Jones <davej@redhat.com>
      Fixes: de7b2973
      
       "tracepoint: Use struct pointer instead of name hash for reg/unreg tracepoints"
      Signed-off-by: default avatarMathieu Desnoyers <mathieu.desnoyers@efficios.com>
      Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      8058bd0f
    • Romain Izard's avatar
      trace: module: Maintain a valid user count · 098507ae
      Romain Izard authored
      
      
      The replacement of the 'count' variable by two variables 'incs' and
      'decs' to resolve some race conditions during module unloading was done
      in parallel with some cleanup in the trace subsystem, and was integrated
      as a merge.
      
      Unfortunately, the formula for this replacement was wrong in the tracing
      code, and the refcount in the traces was not usable as a result.
      
      Use 'count = incs - decs' to compute the user count.
      
      Link: http://lkml.kernel.org/p/1393924179-9147-1-git-send-email-romain.izard.pro@gmail.com
      
      Acked-by: default avatarIngo Molnar <mingo@kernel.org>
      Cc: Rusty Russell <rusty@rustcorp.com.au>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: stable@vger.kernel.org # 2.6.35
      Fixes: c1ab9cab
      
       "merge conflict resolution"
      Signed-off-by: default avatarRomain Izard <romain.izard.pro@gmail.com>
      Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      098507ae
    • Micky Ching's avatar
      mmc: rtsx: Revert "mmc: rtsx: add support for pre_req and post_req" · 98fcc576
      Micky Ching authored
      This reverts commit c42deffd
      
      .
      
      commit <mmc: rtsx: add support for pre_req and post_req> did use
      mutex_unlock() in tasklet, but mutex_unlock() can't be used in
      tasklet(atomic context). The driver needs to use mutex to avoid
      concurrency, so we can't use tasklet here, the patch need to be
      removed.
      
      The spinlock host->lock and pcr->lock may deadlock, one way to solve
      the deadlock is remove host->lock in sd_isr_done_transfer(), but if
      using workqueue the we can avoid using the spinlock and also avoid
      the problem.
      
      Signed-off-by: default avatarMicky Ching <micky_ching@realsil.com.cn>
      Acked-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
      Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
      98fcc576
    • Feng Tang's avatar
      x86/intel: Add quirk to disable HPET for the Baytrail platform · 62187910
      Feng Tang authored
      
      
      HPET on current Baytrail platform has accuracy problem to be
      used as reliable clocksource/clockevent, so add a early quirk to
      disable it.
      
      Signed-off-by: default avatarFeng Tang <feng.tang@intel.com>
      Cc: Clemens Ladisch <clemens@ladisch.de>
      Cc: John Stultz <john.stultz@linaro.org>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Link: http://lkml.kernel.org/r/1398327498-13163-2-git-send-email-feng.tang@intel.com
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      62187910
    • Feng Tang's avatar
      x86/hpet: Make boot_hpet_disable extern · f10f383d
      Feng Tang authored
      
      
      HPET on some platform has accuracy problem. Making
      "boot_hpet_disable" extern so that we can runtime disable
      the HPET timer by using quirk to check the platform.
      
      Signed-off-by: default avatarFeng Tang <feng.tang@intel.com>
      Cc: Clemens Ladisch <clemens@ladisch.de>
      Cc: John Stultz <john.stultz@linaro.org>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Link: http://lkml.kernel.org/r/1398327498-13163-1-git-send-email-feng.tang@intel.com
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      f10f383d
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20140507' of git://git.infradead.org/linux-mtd · 9f1eb57d
      Linus Torvalds authored
      Pull MTD fix from Brian Norris:
       "A single update for Keystone SoC's, whose NAND controller does not
        support subpage programming"
      
      * tag 'for-linus-20140507' of git://git.infradead.org/linux-mtd:
        mtd: davinci-nand: disable subpage write for keystone-nand
      9f1eb57d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 7ceeff44
      Linus Torvalds authored
      Pull HID fixes from Jiri Kosina:
      
       - fix a small bug in computation of report size, which might cause some
         devices (Atmel touchpad found on the Samsung Ativ 9) to reject
         reports with otherwise valid contents
      
       - a few device-ID specific quirks/additions piggy-backing on top of it
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: sensor-hub: Add in quirk for sensor hub in Lenovo Ideapad Yogas
        HID: add NO_INIT_REPORTS quirk for Synaptics Touch Pad V 103S
        HID: core: fix computation of the report size
        HID: multitouch: add support of EliteGroup 05D8 panels
      7ceeff44
    • Linus Torvalds's avatar
      Merge branch 'drm-radeon-mullins' of git://people.freedesktop.org/~airlied/linux · f56cfe0c
      Linus Torvalds authored
      Pull radeon mullins support from Dave Airlie:
       "This is support for the new AMD mullins APU, it pretty much just adds
        support to the driver in the all the right places, and is pretty low
        risk wrt other GPUs"
      
      Oh well.  I guess it ends up fitting under "support new hardware" for
      merging late.
      
      * 'drm-radeon-mullins' of git://people.freedesktop.org/~airlied/linux:
        drm/radeon: add pci ids for Mullins
        drm/radeon: add Mullins VCE support
        drm/radeon: modesetting updates for Mullins.
        drm/radeon: dpm updates for KV/KB
        drm/radeon: add Mullins dpm support.
        drm/radeon: add Mullins UVD support.
        drm/radeon: update cik init for Mullins.
        drm/radeon: add Mullins chip family
      f56cfe0c
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 8a207d3e
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "radeon, i915 and nouveau fixes, all fixes for regressions or black
        screens, or possible oopses"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/radeon: lower the ref * post PLL maximum
        drm/radeon: check that we have a clock before PLL setup
        drm/radeon: drm/radeon: add missing radeon_semaphore_free to error path
        drm/radeon: Fix num_banks calculation for SI
        agp: info leak in agpioc_info_wrap()
        drm/gm107/gr: bump attrib cb size quite a bit
        drm/nouveau: fix another lock unbalance in nouveau_crtc_page_flip
        drm/nouveau/bios: fix shadowing from PROM on big-endian systems
        drm/nouveau/acpi: allow non-optimus setups to load vbios from acpi
        drm/radeon/dp: check for errors in dpcd reads
        drm/radeon: avoid high jitter with small frac divs
        drm/radeon: check buffer relocation offset
        drm/radeon: use pflip irq on R600+ v2
        drm/radeon/uvd: use lower clocks on old UVD to boot v2
        drm/i915: don't try DP_LINK_BW_5_4 on HSW ULX
        drm/i915: Sanitize the enable_ppgtt module option once
        drm/i915: Break encoder->crtc link separately in intel_sanitize_crtc()
      8a207d3e
    • George Spelvin's avatar
      x86-64, build: Fix stack protector Makefile breakage with 32-bit userland · 14262d67
      George Spelvin authored
      
      
      If you are using a 64-bit kernel with 32-bit userland, then
      scripts/gcc-x86_64-has-stack-protector.sh invokes 32-bit gcc
      with -mcmodel=kernel, which produces:
      
      <stdin>:1:0: error: code model 'kernel' not supported in the 32 bit mode
      
      and trips the "broken compiler" test at arch/x86/Makefile:120.
      
      There are several places a fix is possible, but the following seems
      cleanest.  (But it's minimal; it would also be possible to factor
      out a bunch of stuff from the two branches of the if.)
      
      Signed-off-by: default avatarGeorge Spelvin <linux@horizon.com>
      Link: http://lkml.kernel.org/r/20140507210552.7581.qmail@ns.horizon.com
      Cc: <stable@vger.kernel.org> # v3.14
      Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
      14262d67
  7. May 07, 2014
    • Christian Gmeiner's avatar
      x86/reboot: Add reboot quirk for Certec BPC600 · aadca6fa
      Christian Gmeiner authored
      
      
      Certec BPC600 needs reboot=pci to actually reboot.
      
      Signed-off-by: default avatarChristian Gmeiner <christian.gmeiner@gmail.com>
      Cc: Matthew Garrett <mjg59@srcf.ucam.org>
      Cc: Li Aubrey <aubrey.li@linux.intel.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Dave Jones <davej@redhat.com>
      Cc: Fenghua Yu <fenghua.yu@intel.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Link: http://lkml.kernel.org/r/1399446114-2147-1-git-send-email-christian.gmeiner@gmail.com
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      aadca6fa
    • Dave Airlie's avatar
      Merge branch 'mullins' of git://people.freedesktop.org/~deathsimple/linux into drm-fixes · 995c376e
      Dave Airlie authored
      Add Mullins chips support.
      
      * 'mullins' of git://people.freedesktop.org/~deathsimple/linux:
        drm/radeon: add pci ids for Mullins
        drm/radeon: add Mullins VCE support
        drm/radeon: modesetting updates for Mullins.
        drm/radeon: dpm updates for KV/KB
        drm/radeon: add Mullins dpm support.
        drm/radeon: add Mullins UVD support.
        drm/radeon: update cik init for Mullins.
        drm/radeon: add Mullins chip family
      995c376e
    • Dave Airlie's avatar
      Merge branch 'drm-nouveau-next' of... · 2a1235e5
      Dave Airlie authored
      Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
      
      nouveau fixes.
      
      * 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
        drm/gm107/gr: bump attrib cb size quite a bit
        drm/nouveau: fix another lock unbalance in nouveau_crtc_page_flip
        drm/nouveau/bios: fix shadowing from PROM on big-endian systems
        drm/nouveau/acpi: allow non-optimus setups to load vbios from acpi
      2a1235e5
    • Dave Airlie's avatar
      Merge tag 'topc/core-stuff-2014-05-05' of git://anongit.freedesktop.org/drm-intel into drm-fixes · 508200c5
      Dave Airlie authored
      Some more i915 fixes. There's still some DP issues we are looking into,
      but wanted to get these moving.
      
      * tag 'topc/core-stuff-2014-05-05' of git://anongit.freedesktop.org/drm-intel:
        drm/i915: don't try DP_LINK_BW_5_4 on HSW ULX
        drm/i915: Sanitize the enable_ppgtt module option once
        drm/i915: Break encoder->crtc link separately in intel_sanitize_crtc()
      508200c5
    • Dave Airlie's avatar
      Merge branch 'drm-fixes-3.15' of git://people.freedesktop.org/~deathsimple/linux into drm-fixes · 9eabb911
      Dave Airlie authored
      this is the next pull quested for stashed up radeon fixes for 3.15. As discussed support for Mullins was separated out and will get it's own pull request. Remaining highlights are:
      1. Some more patches to better handle PLL limits.
      2. Making use of the PFLIP additional to the VBLANK interrupt, otherwise we sometimes miss page flip events.
      3. Fix for the UVD command stream parser.
      4. Fix for bootup UVD clocks on RV7xx systems.
      5. Adding missing error check on dpcd reads.
      6. Fixes number of banks calculation on SI.
      
      * 'drm-fixes-3.15' of git://people.freedesktop.org/~deathsimple/linux:
        drm/radeon: lower the ref * post PLL maximum
        drm/radeon: check that we have a clock before PLL setup
        drm/radeon: drm/radeon: add missing radeon_semaphore_free to error path
        drm/radeon: Fix num_banks calculation for SI
        drm/radeon/dp: check for errors in dpcd reads
        drm/radeon: avoid high jitter with small frac divs
        drm/radeon: check buffer relocation offset
        drm/radeon: use pflip irq on R600+ v2
        drm/radeon/uvd: use lower clocks on old UVD to boot v2
      9eabb911
    • Linus Torvalds's avatar
      Merge branch 'akpm' (incoming from Andrew) · 38583f09
      Linus Torvalds authored
      Merge misc fixes from Andrew Morton:
       "13 fixes"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
        agp: info leak in agpioc_info_wrap()
        fs/affs/super.c: bugfix / double free
        fanotify: fix -EOVERFLOW with large files on 64-bit
        slub: use sysfs'es release mechanism for kmem_cache
        revert "mm: vmscan: do not swap anon pages just because free+file is low"
        autofs: fix lockref lookup
        mm: filemap: update find_get_pages_tag() to deal with shadow entries
        mm/compaction: make isolate_freepages start at pageblock boundary
        MAINTAINERS: zswap/zbud: change maintainer email address
        mm/page-writeback.c: fix divide by zero in pos_ratio_polynom
        hugetlb: ensure hugepage access is denied if hugepages are not supported
        slub: fix memcg_propagate_slab_attrs
        drivers/rtc/rtc-pcf8523.c: fix month definition
      38583f09
    • Dan Carpenter's avatar
      agp: info leak in agpioc_info_wrap() · 3ca9e5d3
      Dan Carpenter authored
      
      
      On 64 bit systems the agp_info struct has a 4 byte hole between
      ->agp_mode and ->aper_base.  We need to clear it to avoid disclosing
      stack information to userspace.
      
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Cc: David Airlie <airlied@linux.ie>
      Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      3ca9e5d3
    • Fabian Frederick's avatar
      fs/affs/super.c: bugfix / double free · d353efd0
      Fabian Frederick authored
      Commit 842a859d
      
       ("affs: use ->kill_sb() to simplify ->put_super()
      and failure exits of ->mount()") adds .kill_sb which frees sbi but
      doesn't remove sbi free in case of parse_options error causing double
      free+random crash.
      
      Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
      Cc: Alexander Viro <viro@zeniv.linux.org.uk>
      Cc: <stable@vger.kernel.org>	[3.14.x]
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d353efd0
    • Will Woods's avatar
      fanotify: fix -EOVERFLOW with large files on 64-bit · 1e2ee49f
      Will Woods authored
      
      
      On 64-bit systems, O_LARGEFILE is automatically added to flags inside
      the open() syscall (also openat(), blkdev_open(), etc).  Userspace
      therefore defines O_LARGEFILE to be 0 - you can use it, but it's a
      no-op.  Everything should be O_LARGEFILE by default.
      
      But: when fanotify does create_fd() it uses dentry_open(), which skips
      all that.  And userspace can't set O_LARGEFILE in fanotify_init()
      because it's defined to 0.  So if fanotify gets an event regarding a
      large file, the read() will just fail with -EOVERFLOW.
      
      This patch adds O_LARGEFILE to fanotify_init()'s event_f_flags on 64-bit
      systems, using the same test as open()/openat()/etc.
      
      Addresses https://bugzilla.redhat.com/show_bug.cgi?id=696821
      
      Signed-off-by: default avatarWill Woods <wwoods@redhat.com>
      Acked-by: default avatarEric Paris <eparis@redhat.com>
      Reviewed-by: default avatarJan Kara <jack@suse.cz>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1e2ee49f
    • Christoph Lameter's avatar
      slub: use sysfs'es release mechanism for kmem_cache · 41a21285
      Christoph Lameter authored
      
      
      debugobjects warning during netfilter exit:
      
          ------------[ cut here ]------------
          WARNING: CPU: 6 PID: 4178 at lib/debugobjects.c:260 debug_print_object+0x8d/0xb0()
          ODEBUG: free active (active state 0) object type: timer_list hint: delayed_work_timer_fn+0x0/0x20
          Modules linked in:
          CPU: 6 PID: 4178 Comm: kworker/u16:2 Tainted: G        W 3.11.0-next-20130906-sasha #3984
          Workqueue: netns cleanup_net
          Call Trace:
            dump_stack+0x52/0x87
            warn_slowpath_common+0x8c/0xc0
            warn_slowpath_fmt+0x46/0x50
            debug_print_object+0x8d/0xb0
            __debug_check_no_obj_freed+0xa5/0x220
            debug_check_no_obj_freed+0x15/0x20
            kmem_cache_free+0x197/0x340
            kmem_cache_destroy+0x86/0xe0
            nf_conntrack_cleanup_net_list+0x131/0x170
            nf_conntrack_pernet_exit+0x5d/0x70
            ops_exit_list+0x5e/0x70
            cleanup_net+0xfb/0x1c0
            process_one_work+0x338/0x550
            worker_thread+0x215/0x350
            kthread+0xe7/0xf0
            ret_from_fork+0x7c/0xb0
      
      Also during dcookie cleanup:
      
          WARNING: CPU: 12 PID: 9725 at lib/debugobjects.c:260 debug_print_object+0x8c/0xb0()
          ODEBUG: free active (active state 0) object type: timer_list hint: delayed_work_timer_fn+0x0/0x20
          Modules linked in:
          CPU: 12 PID: 9725 Comm: trinity-c141 Not tainted 3.15.0-rc2-next-20140423-sasha-00018-gc4ff6c4 #408
          Call Trace:
            dump_stack (lib/dump_stack.c:52)
            warn_slowpath_common (kernel/panic.c:430)
            warn_slowpath_fmt (kernel/panic.c:445)
            debug_print_object (lib/debugobjects.c:262)
            __debug_check_no_obj_freed (lib/debugobjects.c:697)
            debug_check_no_obj_freed (lib/debugobjects.c:726)
            kmem_cache_free (mm/slub.c:2689 mm/slub.c:2717)
            kmem_cache_destroy (mm/slab_common.c:363)
            dcookie_unregister (fs/dcookies.c:302 fs/dcookies.c:343)
            event_buffer_release (arch/x86/oprofile/../../../drivers/oprofile/event_buffer.c:153)
            __fput (fs/file_table.c:217)
            ____fput (fs/file_table.c:253)
            task_work_run (kernel/task_work.c:125 (discriminator 1))
            do_notify_resume (include/linux/tracehook.h:196 arch/x86/kernel/signal.c:751)
            int_signal (arch/x86/kernel/entry_64.S:807)
      
      Sysfs has a release mechanism.  Use that to release the kmem_cache
      structure if CONFIG_SYSFS is enabled.
      
      Only slub is changed - slab currently only supports /proc/slabinfo and
      not /sys/kernel/slab/*.  We talked about adding that and someone was
      working on it.
      
      [akpm@linux-foundation.org: fix CONFIG_SYSFS=n build]
      [akpm@linux-foundation.org: fix CONFIG_SYSFS=n build even more]
      Signed-off-by: default avatarChristoph Lameter <cl@linux.com>
      Reported-by: default avatarSasha Levin <sasha.levin@oracle.com>
      Tested-by: default avatarSasha Levin <sasha.levin@oracle.com>
      Acked-by: default avatarGreg KH <greg@kroah.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Pekka Enberg <penberg@kernel.org>
      Cc: Russell King <rmk@arm.linux.org.uk>
      Cc: Bart Van Assche <bvanassche@acm.org>
      Cc: Al Viro <viro@ZenIV.linux.org.uk>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      41a21285
    • Johannes Weiner's avatar
      revert "mm: vmscan: do not swap anon pages just because free+file is low" · 62376251
      Johannes Weiner authored
      This reverts commit 0bf1457f
      
       ("mm: vmscan: do not swap anon pages
      just because free+file is low") because it introduced a regression in
      mostly-anonymous workloads, where reclaim would become ineffective and
      trap every allocating task in direct reclaim.
      
      The problem is that there is a runaway feedback loop in the scan balance
      between file and anon, where the balance tips heavily towards a tiny
      thrashing file LRU and anonymous pages are no longer being looked at.
      The commit in question removed the safe guard that would detect such
      situations and respond with forced anonymous reclaim.
      
      This commit was part of a series to fix premature swapping in loads with
      relatively little cache, and while it made a small difference, the cure
      is obviously worse than the disease.  Revert it.
      
      Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
      Reported-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
      Acked-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
      Acked-by: default avatarRafael Aquini <aquini@redhat.com>
      Cc: Rik van Riel <riel@redhat.com>
      Cc: <stable@kernel.org>		[3.12+]
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      62376251
    • Ian Kent's avatar
      autofs: fix lockref lookup · 6b6751f7
      Ian Kent authored
      
      
      autofs needs to be able to see private data dentry flags for its dentrys
      that are being created but not yet hashed and for its dentrys that have
      been rmdir()ed but not yet freed.  It needs to do this so it can block
      processes in these states until a status has been returned to indicate
      the given operation is complete.
      
      It does this by keeping two lists, active and expring, of dentrys in
      this state and uses ->d_release() to keep them stable while it checks
      the reference count to determine if they should be used.
      
      But with the recent lockref changes dentrys being freed sometimes don't
      transition to a reference count of 0 before being freed so autofs can
      occassionally use a dentry that is invalid which can lead to a panic.
      
      Signed-off-by: default avatarIan Kent <raven@themaw.net>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      6b6751f7
    • Johannes Weiner's avatar
      mm: filemap: update find_get_pages_tag() to deal with shadow entries · 139b6a6f
      Johannes Weiner authored
      Dave Jones reports the following crash when find_get_pages_tag() runs
      into an exceptional entry:
      
        kernel BUG at mm/filemap.c:1347!
        RIP: find_get_pages_tag+0x1cb/0x220
        Call Trace:
          find_get_pages_tag+0x36/0x220
          pagevec_lookup_tag+0x21/0x30
          filemap_fdatawait_range+0xbe/0x1e0
          filemap_fdatawait+0x27/0x30
          sync_inodes_sb+0x204/0x2a0
          sync_inodes_one_sb+0x19/0x20
          iterate_supers+0xb2/0x110
          sys_sync+0x44/0xb0
          ia32_do_call+0x13/0x13
      
        1343                         /*
        1344                          * This function is never used on a shmem/tmpfs
        1345                          * mapping, so a swap entry won't be found here.
        1346                          */
        1347                         BUG();
      
      After commit 0cd6144a ("mm + fs: prepare for non-page entries in
      page cache radix trees") this comment and BUG() are out of date because
      exceptional entries can now appear in all mappings - as shadows of
      recently evicted pages.
      
      However, as Hugh Dickins notes,
      
        "it is truly surprising for a PAGECACHE_TAG_WRITEBACK (and probably
         any other PAGECACHE_TAG_*) to appear on an exceptional entry.
      
         I expect it comes down to an occasional race in RCU lookup of the
         radix_tree: lacking absolute synchronization, we might sometimes
         catch an exceptional entry, with the tag which really belongs with
         the unexceptional entry which was there an instant before."
      
      And indeed, not only is the tree walk lockless, the tags are also read
      in chunks, one radix tree node at a time.  There is plenty of time for
      page reclaim to swoop in and replace a page that was already looked up
      as tagged with a shadow entry.
      
      Remove the BUG() and update the comment.  While reviewing all other
      lookup sites for whether they properly deal with shadow entries of
      evicted pages, update all the comments and fix memcg file charge moving
      to not miss shmem/tmpfs swapcache pages.
      
      Fixes: 0cd6144a
      
       ("mm + fs: prepare for non-page entries in page cache radix trees")
      Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
      Reported-by: default avatarDave Jones <davej@redhat.com>
      Acked-by: default avatarHugh Dickins <hughd@google.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      139b6a6f
    • Vlastimil Babka's avatar
      mm/compaction: make isolate_freepages start at pageblock boundary · 49e068f0
      Vlastimil Babka authored
      
      
      The compaction freepage scanner implementation in isolate_freepages()
      starts by taking the current cc->free_pfn value as the first pfn.  In a
      for loop, it scans from this first pfn to the end of the pageblock, and
      then subtracts pageblock_nr_pages from the first pfn to obtain the first
      pfn for the next for loop iteration.
      
      This means that when cc->free_pfn starts at offset X rather than being
      aligned on pageblock boundary, the scanner will start at offset X in all
      scanned pageblock, ignoring potentially many free pages.  Currently this
      can happen when
      
       a) zone's end pfn is not pageblock aligned, or
      
       b) through zone->compact_cached_free_pfn with CONFIG_HOLES_IN_ZONE
          enabled and a hole spanning the beginning of a pageblock
      
      This patch fixes the problem by aligning the initial pfn in
      isolate_freepages() to pageblock boundary.  This also permits replacing
      the end-of-pageblock alignment within the for loop with a simple
      pageblock_nr_pages increment.
      
      Signed-off-by: default avatarVlastimil Babka <vbabka@suse.cz>
      Reported-by: default avatarHeesub Shin <heesub.shin@samsung.com>
      Acked-by: default avatarMinchan Kim <minchan@kernel.org>
      Cc: Mel Gorman <mgorman@suse.de>
      Acked-by: default avatarJoonsoo Kim <iamjoonsoo.kim@lge.com>
      Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
      Cc: Michal Nazarewicz <mina86@mina86.com>
      Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
      Cc: Christoph Lameter <cl@linux.com>
      Acked-by: default avatarRik van Riel <riel@redhat.com>
      Cc: Dongjun Shin <d.j.shin@samsung.com>
      Cc: Sunghwan Yun <sunghwan.yun@samsung.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      49e068f0
    • Seth Jennings's avatar
      MAINTAINERS: zswap/zbud: change maintainer email address · 0e3b7e54
      Seth Jennings authored
      
      
      sjenning@linux.vnet.ibm.com is no longer a viable entity.
      
      Signed-off-by: default avatarSeth Jennings <sjennings@variantweb.net>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      0e3b7e54
    • Rik van Riel's avatar
      mm/page-writeback.c: fix divide by zero in pos_ratio_polynom · d5c9fde3
      Rik van Riel authored
      
      
      It is possible for "limit - setpoint + 1" to equal zero, after getting
      truncated to a 32 bit variable, and resulting in a divide by zero error.
      
      Using the fully 64 bit divide functions avoids this problem.  It also
      will cause pos_ratio_polynom() to return the correct value when
      (setpoint - limit) exceeds 2^32.
      
      Also uninline pos_ratio_polynom, at Andrew's request.
      
      Signed-off-by: default avatarRik van Riel <riel@redhat.com>
      Reviewed-by: default avatarMichal Hocko <mhocko@suse.cz>
      Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
      Cc: Mel Gorman <mgorman@suse.de>
      Cc: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
      Cc: Luiz Capitulino <lcapitulino@redhat.com>
      Cc: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d5c9fde3
    • Nishanth Aravamudan's avatar
      hugetlb: ensure hugepage access is denied if hugepages are not supported · 457c1b27
      Nishanth Aravamudan authored
      
      
      Currently, I am seeing the following when I `mount -t hugetlbfs /none
      /dev/hugetlbfs`, and then simply do a `ls /dev/hugetlbfs`.  I think it's
      related to the fact that hugetlbfs is properly not correctly setting
      itself up in this state?:
      
        Unable to handle kernel paging request for data at address 0x00000031
        Faulting instruction address: 0xc000000000245710
        Oops: Kernel access of bad area, sig: 11 [#1]
        SMP NR_CPUS=2048 NUMA pSeries
        ....
      
      In KVM guests on Power, in a guest not backed by hugepages, we see the
      following:
      
        AnonHugePages:         0 kB
        HugePages_Total:       0
        HugePages_Free:        0
        HugePages_Rsvd:        0
        HugePages_Surp:        0
        Hugepagesize:         64 kB
      
      HPAGE_SHIFT == 0 in this configuration, which indicates that hugepages
      are not supported at boot-time, but this is only checked in
      hugetlb_init().  Extract the check to a helper function, and use it in a
      few relevant places.
      
      This does make hugetlbfs not supported (not registered at all) in this
      environment.  I believe this is fine, as there are no valid hugepages
      and that won't change at runtime.
      
      [akpm@linux-foundation.org: use pr_info(), per Mel]
      [akpm@linux-foundation.org: fix build when HPAGE_SHIFT is undefined]
      Signed-off-by: default avatarNishanth Aravamudan <nacc@linux.vnet.ibm.com>
      Reviewed-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
      Acked-by: default avatarMel Gorman <mgorman@suse.de>
      Cc: Randy Dunlap <rdunlap@infradead.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      457c1b27