1. 26 Apr, 2015 16 commits
    • Andy Lutomirski's avatar
      x86_64, asm: Work around AMD SYSRET SS descriptor attribute issue · 61f01dd9
      Andy Lutomirski authored
      AMD CPUs don't reinitialize the SS descriptor on SYSRET, so SYSRET with
      SS == 0 results in an invalid usermode state in which SS is apparently
      equal to __USER_DS but causes #SS if used.
      Work around the issue by setting SS to __KERNEL_DS __switch_to, thus
      ensuring that SYSRET never happens with SS set to NULL.
      This was exposed by a recent vDSO cleanup.
      Fixes: e7d6eefa
       x86/vdso32/syscall.S: Do not load __USER32_DS to %ss
      Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
      Cc: Peter Anvin <hpa@zytor.com>
      Cc: Borislav Petkov <bp@alien8.de>
      Cc: Denys Vlasenko <vda.linux@googlemail.com>
      Cc: Brian Gerst <brgerst@gmail.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 1190944f
      Linus Torvalds authored
      Pull intel drm fixes from Dave Airlie.
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/i915: vlv: fix save/restore of GFX_MAX_REQ_COUNT reg
        drm/i915: Workaround to avoid lite restore with HEAD==TAIL
        drm/i915: cope with large i2c transfers
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/intel-iommu · 9f86262d
      Linus Torvalds authored
      Pull intel iommu updates from David Woodhouse:
       "This lays a little of the groundwork for upcoming Shared Virtual
        Memory support — fixing some bogus #defines for capability bits and
        adding the new ones, and starting to use the new wider page tables
        where we can, in anticipation of actually filling in the new fields
        It also allows graphics devices to be assigned to VM guests again.
        This got broken in 3.17 by disallowing assignment of RMRR-afflicted
        devices.  Like USB, we do understand why there's an RMRR for graphics
        devices — and unlike USB, it's actually sane.  So we can make an
        exception for graphics devices, just as we do USB controllers.
        Finally, tone down the warning about the X2APIC_OPT_OUT bit, due to
        persistent requests.  X2APIC_OPT_OUT was added to the spec as a nasty
        hack to allow broken BIOSes to forbid us from using X2APIC when they
        do stupid and invasive things and would break if we did.
        Someone noticed that since Windows doesn't have full IOMMU support for
        DMA protection, setting the X2APIC_OPT_OUT bit made Windows avoid
        initialising the IOMMU on the graphics unit altogether.
        This means that it would be available for use in "driver mode", where
        the IOMMU registers are made available through a BAR of the graphics
        device and the graphics driver can do SVM all for itself.
        So they started setting the X2APIC_OPT_OUT bit on *all* platforms with
        SVM capabilities.  And even the platforms which *might*, if the
        planets had been aligned correctly, possibly have had SVM capability
        but which in practice actually don't"
      * git://git.infradead.org/intel-iommu:
        iommu/vt-d: support extended root and context entries
        iommu/vt-d: Add new extended capabilities from v2.3 VT-d specification
        iommu/vt-d: Allow RMRR on graphics devices too
        iommu/vt-d: Print x2apic opt out info instead of printing a warning
        iommu/vt-d: kill bogus ecap_niotlb_iunits()
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 85f2901b
      Linus Torvalds authored
      Pull i2c fixes from Wolfram Sang:
       "This has a mixture of merge window cleanups and bugfixes"
      * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: st: add include for pinctrl
        i2c: mux: use proper dev when removing "channel-X" symlinks
        i2c: digicolor: remove duplicate include
        i2c: Mark adapter devices with pm_runtime_no_callbacks
        i2c: pca-platform: fix broken email address
        i2c: mxs: fix broken email address
        i2c: rk3x: report number of messages transmitted
    • Linus Torvalds's avatar
      Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · f583381f
      Linus Torvalds authored
      Pull btrfs fixes from Chris Mason:
       "Filipe hit two problems in my block group cache patches.  We finalized
        the fixes last week and ran through more tests"
      * 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: prevent list corruption during free space cache processing
        Btrfs: fix inode cache writeout
    • Dave Airlie's avatar
      Merge tag 'drm-intel-next-fixes-2015-04-25' of... · 59fd7e4b
      Dave Airlie authored
      Merge tag 'drm-intel-next-fixes-2015-04-25' of git://anongit.freedesktop.org/drm-intel into drm-fixes
      three fixes for i915.
      * tag 'drm-intel-next-fixes-2015-04-25' of git://anongit.freedesktop.org/drm-intel:
        drm/i915: vlv: fix save/restore of GFX_MAX_REQ_COUNT reg
        drm/i915: Workaround to avoid lite restore with HEAD==TAIL
        drm/i915: cope with large i2c transfers
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-4.1-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 59953fba
      Linus Torvalds authored
      Pull NFS client updates from Trond Myklebust:
       "Another set of mainly bugfixes and a couple of cleanups.  No new
        functionality in this round.
        Highlights include:
        Stable patches:
         - Fix a regression in /proc/self/mountstats
         - Fix the pNFS flexfiles O_DIRECT support
         - Fix high load average due to callback thread sleeping
         - Various patches to fix the pNFS layoutcommit support
         - Do not cache pNFS deviceids unless server notifications are enabled
         - Fix a SUNRPC transport reconnection regression
         - make debugfs file creation failure non-fatal in SUNRPC
         - Another fix for circular directory warnings on NFSv4 "junctioned"
         - Fix locking around NFSv4.2 fallocate() support
         - Truncating NFSv4 file opens should also sync O_DIRECT writes
         - Prevent infinite loop in rpcrdma_ep_create()
         - Various improvements to the RDMA transport code's handling of
           memory registration
         - Various code cleanups"
      * tag 'nfs-for-4.1-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (55 commits)
        fs/nfs: fix new compiler warning about boolean in switch
        nfs: Remove unneeded casts in nfs
        NFS: Don't attempt to decode missing directory entries
        Revert "nfs: replace nfs_add_stats with nfs_inc_stats when add one"
        NFS: Rename idmap.c to nfs4idmap.c
        NFS: Move nfs_idmap.h into fs/nfs/
        NFS: Remove CONFIG_NFS_V4 checks from nfs_idmap.h
        NFS: Add a stub for GETDEVICELIST
        nfs: remove WARN_ON_ONCE from nfs_direct_good_bytes
        nfs: fix DIO good bytes calculation
        nfs: Fetch MOUNTED_ON_FILEID when updating an inode
        sunrpc: make debugfs file creation failure non-fatal
        nfs: fix high load average due to callback thread sleeping
        NFS: Reduce time spent holding the i_mutex during fallocate()
        NFS: Don't zap caches on fallocate()
        xprtrdma: Make rpcrdma_{un}map_one() into inline functions
        xprtrdma: Handle non-SEND completions via a callout
        xprtrdma: Add "open" memreg op
        xprtrdma: Add "destroy MRs" memreg op
        xprtrdma: Add "reset MRs" memreg op
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 9ec3a646
      Linus Torvalds authored
      Pull fourth vfs update from Al Viro:
       "d_inode() annotations from David Howells (sat in for-next since before
        the beginning of merge window) + four assorted fixes"
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        RCU pathwalk breakage when running into a symlink overmounting something
        fix I_DIO_WAKEUP definition
        direct-io: only inc/dec inode->i_dio_count for file systems
        fs/9p: fix readdir()
        VFS: assorted d_backing_inode() annotations
        VFS: fs/inode.c helpers: d_inode() annotations
        VFS: fs/cachefiles: d_backing_inode() annotations
        VFS: fs library helpers: d_inode() annotations
        VFS: assorted weird filesystems: d_inode() annotations
        VFS: normal filesystems (and lustre): d_inode() annotations
        VFS: security/: d_inode() annotations
        VFS: security/: d_backing_inode() annotations
        VFS: net/: d_inode() annotations
        VFS: net/unix: d_backing_inode() annotations
        VFS: kernel/: d_inode() annotations
        VFS: audit: d_backing_inode() annotations
        VFS: Fix up some ->d_inode accesses in the chelsio driver
        VFS: Cachefiles should perform fs modifications on the top layer only
        VFS: AF_UNIX sockets should call mknod on the top layer only
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-4.1-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · c8b3fd0c
      Linus Torvalds authored
      Pull more power management and ACPI updates from Rafael Wysocki:
       "These are fixes mostly (intel_pstate, ACPI core, ACPI EC driver,
        cpupower tool), a new CPU ID for the Intel RAPL driver and one
        intel_pstate driver improvement that didn't make it to my previous
        pull requests due to timing.
         - Fix a build warning in the intel_pstate driver showing up in
           non-SMP builds (Borislav Petkov)
         - Change one of the intel_pstate's P-state selection parameters for
           Baytrail and Cherrytrail CPUs to significantly improve performance
           at the cost of a small increase in energy consumption (Kristen
           Carlson Accardi)
         - Fix a NULL pointer dereference in the ACPI EC driver due to an
           unsafe list walk in the query handler removal routine (Chris
         - Get rid of a false-positive lockdep warning in the ACPI container
           hot-remove code (Rafael J Wysocki)
         - Prevent the ACPI device enumeration code from creating device
           objects of a wrong type in some cases (Rafael J Wysocki)
         - Add Skylake processors support to the Intel RAPL power capping
           driver (Brian Bian)
         - Drop the stale MAINTAINERS entry for the ACPI dock driver that is
           regarded as part of the ACPI core and maintained along with it now
           (Chao Yu)
         - Fix cpupower tool breakage caused by a library API change in libpci
           3.3.0 (Lucas Stach)"
      * tag 'pm+acpi-4.1-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / scan: Add a scan handler for PRP0001
        ACPI / scan: Annotate physical_node_lock in acpi_scan_is_offline()
        ACPI / EC: fix NULL pointer dereference in acpi_ec_remove_query_handler()
        MAINTAINERS: remove maintainship entry of docking station driver
        powercap / RAPL: Add support for Intel Skylake processors
        cpufreq: intel_pstate: Fix an annoying !CONFIG_SMP warning
        intel_pstate: Change the setpoint for Atom params
        cpupower: fix breakage from libpci API change
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · d89b3e19
      Linus Torvalds authored
      Pull crypto fixes from Herbert Xu:
       "This push fixes a build problem with img-hash under non-standard
        configurations and a serious regression with sha512_ssse3 which can
        lead to boot failures"
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: img-hash - CRYPTO_DEV_IMGTEC_HASH should depend on HAS_DMA
        crypto: x86/sha512_ssse3 - fixup for asm function prototype change
    • Linus Torvalds's avatar
      Merge tag 'platform-drivers-x86-v4.1-1' of... · 78d42567
      Linus Torvalds authored
      Merge tag 'platform-drivers-x86-v4.1-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
      Pull x86 platform driver updates from Darren Hart:
       "This series includes significant updates to the toshiba_acpi driver
        and the reintroduction of the dell-laptop keyboard backlight additions
        I had to revert previously.  Also included are various fixes for
        typos, warnings, correctness, and minor bugs.
           - add support for keyboard backlight.
           - adaptive keyboard, hotkey, USB sleep and charge, and backlight
             updates.  Update sysfs documentation.
           - fix enabling/disabling loop on recent devices
           - lock iGP IO to protect from vgaarb changes
           - Fix typos, clear gcc warnings, clarify pr_* messages, correct
             return types, update MAINTAINERS"
      * tag 'platform-drivers-x86-v4.1-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86: (25 commits)
        toshiba_acpi: Do not register vendor backlight when acpi_video bl is available
        MAINTAINERS: Add me on list of Dell laptop drivers
        platform: x86: dell-laptop: Add support for keyboard backlight
        Documentation/ABI: Update sysfs-driver-toshiba_acpi entry
        toshiba_acpi: Fix pr_* messages from USB Sleep Functions
        toshiba_acpi: Update and fix USB Sleep and Charge modes
        wmi: Use bool function return values of true/false not 1/0
        toshiba_bluetooth: Fix enabling/disabling loop on recent devices
        toshiba_bluetooth: Clean up *_add function and disable BT device at removal
        toshiba_bluetooth: Add three new functions to the driver
        toshiba_acpi: Fix the enabling of the Special Functions
        toshiba_acpi: Use the Hotkey Event Type function for keymap choosing
        toshiba_acpi: Add Hotkey Event Type function and definitions
        x86/wmi: delete unused wmi_data_lock mutex causing gcc warning
        apple-gmux: lock iGP IO to protect from vgaarb changes
        MAINTAINERS: Add missing Toshiba devices and add myself as maintainer
        toshiba_acpi: Update events in toshiba_acpi_notify
        intel-oaktrail: Fix trivial typo in comment
        thinkpad_acpi: off by one in adaptive_keyboard_hotkey_notify_hotkey()
        thinkpad_acpi: signedness bugs getting current_mode
    • Linus Torvalds's avatar
      Merge tag 'chrome-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform · 36a8032d
      Linus Torvalds authored
      Pull chrome platform updates from Olof Johansson:
       "Here's a set of updates to the Chrome OS platform drivers for this
        merge window.
        Main new things this cycle is:
         - Driver changes to expose the lightbar to users.  With this, you can
           make your own blinkenlights on Chromebook Pixels.
         - Changes in the way that the atmel_mxt trackpads are probed.  The
           laptop driver is trying to be smart and not instantiate the devices
           that don't answer to probe.  For the trackpad that can come up in
           two modes (bootloader or regular), this gets complicated since the
           driver already knows how to handle the two modes including the
           actual addresses used.  So now the laptop driver needs to know more
           too, instantiating the regular address even if the bootloader one
           is the probe that passed.
         - mfd driver improvements by Javier Martines Canillas, and a few
           bugfixes from him, kbuild and myself"
      * tag 'chrome-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform:
        platform/chrome: chromeos_laptop - instantiate Atmel at primary address
        platform/chrome: cros_ec_lpc - Depend on X86 || COMPILE_TEST
        platform/chrome: cros_ec_lpc - Include linux/io.h header file
        platform/chrome: fix platform_no_drv_owner.cocci warnings
        platform/chrome: cros_ec_lightbar - fix duplicate const warning
        platform/chrome: cros_ec_dev - fix Unknown escape '%' warning
        platform/chrome: Expose Chrome OS Lightbar to users
        platform/chrome: Create sysfs attributes for the ChromeOS EC
        mfd: cros_ec: Instantiate ChromeOS EC character device
        platform/chrome: Add Chrome OS EC userspace device interface
        platform/chrome: Add cros_ec_lpc driver for x86 devices
        mfd: cros_ec: Add char dev and virtual dev pointers
        mfd: cros_ec: Use fixed size arrays to transfer data with the EC
    • Linus Torvalds's avatar
      Merge tag 'cris-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris · 7f9f4430
      Linus Torvalds authored
      Pull arch/cris updates from Jesper Nilsson:
       "Some much needed love for the CRIS-port.
        There's a bunch of changes this time, giving the CRISv32 port a bit of
        modern makeover with device-tree, irq domain and gpiolib support, and
        more switchover to generic frameworks.
        Some small fixes and removal of the theoretical SMP support brings up
        the rear"
      * tag 'cris-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris:
        cris: fix integer overflow in ELF_ET_DYN_BASE
        CRISv32: use MMIO clocksource
        CRISv32: use generic clockevents
        CRIS: use generic headers via Kbuild
        CRIS: use generic cmpxchg.h
        CRIS: use generic atomic.h
        CRIS: use generic atomic bitops
        CRISv10: remove redundant macros from system.h
        CRIS: remove SMP code
        CRISv32: don't enable irqs in INIT_THREAD
        CRISv32: handle multiple signals
        CRISv32: prevent bogus restarts on sigreturn
        CRISv32: don't attempt syscall restart on irq exit
        Add binding documentation for CRIS
        CRIS: add Axis 88 board device tree
        CRISv32: add device tree support
        CRISv32: add irq domains support
        CRIS: enable GPIOLIB
    • Linus Torvalds's avatar
      Merge tag 'powerpc-4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux · 63905bba
      Linus Torvalds authored
      Pull powerpc fixes from Michael Ellerman:
       - fix for mm_dec_nr_pmds() from Scott.
       - fixes for oopses seen with KVM + THP from Aneesh.
       - build fixes from Aneesh & Shreyas.
      * tag 'powerpc-4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
        powerpc/mm: Fix build error with CONFIG_PPC_TRANSACTIONAL_MEM disabled
        powerpc/kvm: Fix ppc64_defconfig + PPC_POWERNV=n build error
        powerpc/mm/thp: Return pte address if we find trans_splitting.
        powerpc/mm/thp: Make page table walk safe against thp split/collapse
        KVM: PPC: Remove page table walk helpers
        KVM: PPC: Use READ_ONCE when dereferencing pte_t pointer
        powerpc/hugetlb: Call mm_dec_nr_pmds() in hugetlb_free_pmd_range()
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · eadf16a9
      Linus Torvalds authored
      Pull second batch of KVM changes from Paolo Bonzini:
       "This mostly includes the PPC changes for 4.1, which this time cover
        Book3S HV only (debugging aids, minor performance improvements and
        some cleanups).  But there are also bug fixes and small cleanups for
        ARM, x86 and s390.
        The task_migration_notifier revert and real fix is still pending
        review, but I'll send it as soon as possible after -rc1"
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (29 commits)
        KVM: arm/arm64: check IRQ number on userland injection
        KVM: arm: irqfd: fix value returned by kvm_irq_map_gsi
        KVM: VMX: Preserve host CR4.MCE value while in guest mode.
        KVM: PPC: Book3S HV: Use msgsnd for signalling threads on POWER8
        KVM: PPC: Book3S HV: Translate kvmhv_commence_exit to C
        KVM: PPC: Book3S HV: Streamline guest entry and exit
        KVM: PPC: Book3S HV: Use bitmap of active threads rather than count
        KVM: PPC: Book3S HV: Use decrementer to wake napping threads
        KVM: PPC: Book3S HV: Don't wake thread with no vcpu on guest IPI
        KVM: PPC: Book3S HV: Get rid of vcore nap_count and n_woken
        KVM: PPC: Book3S HV: Move vcore preemption point up into kvmppc_run_vcpu
        KVM: PPC: Book3S HV: Minor cleanups
        KVM: PPC: Book3S HV: Simplify handling of VCPUs that need a VPA update
        KVM: PPC: Book3S HV: Accumulate timing information for real-mode code
        KVM: PPC: Book3S HV: Create debugfs file for each guest's HPT
        KVM: PPC: Book3S HV: Add ICP real mode counters
        KVM: PPC: Book3S HV: Move virtual mode ICP functions to real-mode
        KVM: PPC: Book3S HV: Convert ICS mutex lock to spin lock
        KVM: PPC: Book3S HV: Add guest->host real mode completion counters
        KVM: PPC: Book3S HV: Add helpers for lock/unlock hpte
    • Stephen Rothwell's avatar
  2. 24 Apr, 2015 24 commits
    • Dmitry Torokhov's avatar
      platform/chrome: chromeos_laptop - instantiate Atmel at primary address · 96cba9b0
      Dmitry Torokhov authored
      The new Atmel MXT driver expects i2c client's address contain the
      primary (main address) of the chip, and calculates the expected
      bootloader address form the primary address. Unfortunately chrome_laptop
      does probe the devices and if touchpad (or touchscreen, or both) comes
      up in bootloader mode the i2c device gets instantiated with the
      bootloader address which confuses the driver.
      To work around this issue let's probe the primary address first. If the
      device is not detected at the primary address we'll probe alternative
      addresses as "dummy" devices. If any of them are found, destroy the
      dummy client and instantiate client with proper name at primary address
      Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    • Al Viro's avatar
      RCU pathwalk breakage when running into a symlink overmounting something · 3cab989a
      Al Viro authored
      Calling unlazy_walk() in walk_component() and do_last() when we find
      a symlink that needs to be followed doesn't acquire a reference to vfsmount.
      That's fine when the symlink is on the same vfsmount as the parent directory
      (which is almost always the case), but it's not always true - one _can_
      manage to bind a symlink on top of something.  And in such cases we end up
      with excessive mntput().
      Cc: stable@vger.kernel.org # since 2.6.39
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
    • Eric Sandeen's avatar
      fix I_DIO_WAKEUP definition · ac74d8d6
      Eric Sandeen authored
      I_DIO_WAKEUP is never directly used, but fix it up anyway.
      Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
    • Jens Axboe's avatar
      direct-io: only inc/dec inode->i_dio_count for file systems · fe0f07d0
      Jens Axboe authored
      do_blockdev_direct_IO() increments and decrements the inode
      ->i_dio_count for each IO operation. It does this to protect against
      truncate of a file. Block devices don't need this sort of protection.
      For a capable multiqueue setup, this atomic int is the only shared
      state between applications accessing the device for O_DIRECT, and it
      presents a scaling wall for that. In my testing, as much as 30% of
      system time is spent incrementing and decrementing this value. A mixed
      read/write workload improved from ~2.5M IOPS to ~9.6M IOPS, with
      better latencies too. Before:
      clat percentiles (usec):
       |  1.00th=[   33],  5.00th=[   34], 10.00th=[   34], 20.00th=[   34],
       | 30.00th=[   34], 40.00th=[   34], 50.00th=[   35], 60.00th=[   35],
       | 70.00th=[   35], 80.00th=[   35], 90.00th=[   37], 95.00th=[   80],
       | 99.00th=[   98], 99.50th=[  151], 99.90th=[  155], 99.95th=[  155],
       | 99.99th=[  165]
      clat percentiles (usec):
       |  1.00th=[   95],  5.00th=[  108], 10.00th=[  129], 20.00th=[  149],
       | 30.00th=[  155], 40.00th=[  161], 50.00th=[  167], 60.00th=[  171],
       | 70.00th=[  177], 80.00th=[  185], 90.00th=[  201], 95.00th=[  270],
       | 99.00th=[  390], 99.50th=[  398], 99.90th=[  418], 99.95th=[  422],
       | 99.99th=[  438]
      In other setups, Robert Elliott reported seeing good performance
      The more applications accessing the device, the worse it gets.
      Add a new direct-io flags, DIO_SKIP_DIO_COUNT, which tells
      do_blockdev_direct_IO() that it need not worry about incrementing
      or decrementing the inode i_dio_count for this caller.
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Christoph Hellwig <hch@lst.de>
      Cc: Theodore Ts'o <tytso@mit.edu>
      Cc: Elliott, Robert (Server Storage) <elliott@hp.com>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarJens Axboe <axboe@fb.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
    • Johannes Berg's avatar
      fs/9p: fix readdir() · 8e3c5005
      Johannes Berg authored
      Al Viro's IOV changes broke 9p readdir() because the new code
      didn't abort the read when it returned nothing. The original
      code checked if the combined error/length was <= 0 but in the
      new code that accidentally got changed to just an error check.
      Add back the return from the function when nothing is read.
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Fixes: e1200fe6
       ("9p: switch p9_client_read() to passing struct iov_iter *")
      Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
    • Chris Mason's avatar
      Btrfs: prevent list corruption during free space cache processing · a3bdccc4
      Chris Mason authored
      __btrfs_write_out_cache is holding the ctl->tree_lock while it prepares
      a list of bitmaps to record in the free space cache.  It was dropping
      the lock while it worked on other components, which made a window for
      free_bitmap() to free the bitmap struct without removing it from the
      This changes things to hold the lock the whole time, and also makes sure
      we hold the lock during enospc cleanup.
      Reported-by: default avatarFilipe Manana <fdmanana@suse.com>
      Signed-off-by: default avatarChris Mason <clm@fb.com>
    • Hans de Goede's avatar
      toshiba_acpi: Do not register vendor backlight when acpi_video bl is available · 358d6a2c
      Hans de Goede authored
      commit a39f46df ("toshiba_acpi: Fix regression caused by backlight extra
      check code") causes the backlight to no longer work on the Toshiba Z30,
      reverting that commit fixes this but restores the original issue fixed
      by that commit.
      Looking at the toshiba_acpi backlight code for a fix for this I noticed that
      the toshiba code is the only code under platform/x86 which unconditionally
      registers a vendor acpi backlight interface, without checking for acpi_video
      backlight support first.
      This commit adds the necessary checks bringing toshiba_acpi in line with the
      other drivers, and fixing the Z30 regression without needing to revert the
      commit causing it.
      Chances are that there will be some Toshiba models which have a non working
      acpi-video implementation while the toshiba vendor backlight interface does
      work, this commit adds an empty dmi_id table where such systems can be added,
      this is identical to how other drivers handle such systems.
      BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1206036
      BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=86521
      Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
      Reviewed-and-tested-by: default avatarAzael Avalos <coproscefalo@gmail.com>
      Signed-off-by: default avatarDarren Hart <dvhart@linux.intel.com>
    • Linus Torvalds's avatar
      Merge tag 'sound-fix-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · d19d133e
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "Here are a few fixes that have been pending since the previous pull
        request: a regression fix for HD-audio multiple SPDIF / HDMI devices,
        several ALC256 codec fixes, a couple of i915 HDMI audio fixes, and
        various small fixes.
        Nothing exciting, just boring, but things good to have"
      * tag 'sound-fix-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - fix headset mic detection problem for one more machine
        ALSA: hda/realtek - Fix Headphone Mic doesn't recording for ALC256
        ALSA: hda - fix "num_steps = 0" error on ALC256
        ALSA: usb-audio: Fix audio output on Roland SC-D70 sound module
        ALSA: hda - add AZX_DCAPS_I915_POWERWELL to Baytrail
        ALSA: hda - only sync BCLK to the display clock for Haswell & Broadwell
        ALSA: hda - Mute headphone pin on suspend on XPS13 9333
        sound/oss: fix deadlock in sequencer_ioctl(SNDCTL_SEQ_OUTOFBAND)
        ALSA: asound.h - use SNDRV_CTL_ELEM_ID_NAME_MAXLEN
        ALSA: hda - potential (but unlikely) uninitialized variable
        ALSA: hda - Fix regression for slave SPDIF setups
        ALSA: intel8x0: Check pci_iomap() success for DEVICE_ALI
        ALSA: hda - simplify azx_has_pm_runtime
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · c6668726
      Linus Torvalds authored
      Pull SCSI target updates from Nicholas Bellinger:
       "Lots of activity in target land the last months.
        The highlights include:
         - Convert fabric drivers tree-wide to target_register_template() (hch
           + bart)
         - iser-target hardening fixes + v1.0 improvements (sagi)
         - Convert iscsi_thread_set usage to kthread.h + kill
           iscsi_target_tq.c (sagi + nab)
         - Add support for T10-PI WRITE_STRIP + READ_INSERT operation (mkp +
           sagi + nab)
         - DIF fixes for CONFIG_DEBUG_SG=y + UNMAP file emulation (akinobu +
           sagi + mkp)
         - Extended TCMU ABI v2 for future BIDI + DIF support (andy + ilias)
         - Fix COMPARE_AND_WRITE handling for NO_ALLLOC drivers (hch + nab)
        Thanks to everyone who contributed this round with new features,
        bug-reports, fixes, cleanups and improvements.
        Looking forward, it's currently shaping up to be a busy v4.2 as well"
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (69 commits)
        target: Put TCMU under a new config option
        target: Version 2 of TCMU ABI
        target: fix tcm_mod_builder.py
        target/file: Fix UNMAP with DIF protection support
        target/file: Fix SG table for prot_buf initialization
        target/file: Fix BUG() when CONFIG_DEBUG_SG=y and DIF protection enabled
        target: Make core_tmr_abort_task() skip TMFs
        target/sbc: Update sbc_dif_generate pr_debug output
        target/sbc: Make internal DIF emulation honor ->prot_checks
        target/sbc: Return INVALID_CDB_FIELD if DIF + sess_prot_type disabled
        target: Ensure sess_prot_type is saved across session restart
        target/rd: Don't pass incomplete scatterlist entries to sbc_dif_verify_*
        target: Remove the unused flag SCF_ACK_KREF
        target: Fix two sparse warnings
        target: Fix COMPARE_AND_WRITE with SG_TO_MEM_NOALLOC handling
        target: simplify the target template registration API
        target: simplify target_xcopy_init_pt_lun
        target: remove the unused SCF_CMD_XCOPY_PASSTHROUGH flag
        target/rd: reduce code duplication in rd_execute_rw()
        tcm_loop: fixup tpgt string to integer conversion
    • Linus Torvalds's avatar
      Merge tag 'pwm/for-4.1-rc1' of... · 06b45f2a
      Linus Torvalds authored
      Merge tag 'pwm/for-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
      Pull pwm changes from Thierry Reding:
       "Not much has been happening in PWM land lately, so this contains
        mostly minor fixes that didn't seem urgent enough for a late
        pull-request last cycle"
      * tag 'pwm/for-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
        pwm: Remove __init initializer for pwm_add_table()
        pwm: samsung: Fix output race on disabling
        pwm: mxs: Fix period divider computation
        pwm: atmel-hlcdc: Add errata handling for sama5d4
        pwm: pca9685: Constify struct regmap_config
        pwm: imx-pwm: add explicit compatible strings and required clock properties
    • Linus Torvalds's avatar
      Merge tag 'dma-buf-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf · b3f4ef0b
      Linus Torvalds authored
      Pull dma-buf updates from Sumit Semwal:
       "Minor cleanup only; this could've gone in for the 4.0 merge window,
        but for a copy-paste stupidity from me.
        It has been in the for-next since then, and no issues reported.
         - cleanup of dma_buf_export()
         - correction of copy-paste stupidity while doing the cleanup"
      * tag 'dma-buf-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf:
        staging: android: ion: fix wrong init of dma_buf_export_info
        dma-buf: cleanup dma_buf_export() to make it easily extensible
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma · d6a4c0e5
      Linus Torvalds authored
      Pull slave-dmaengine updates from Vinod Koul:
       - new drivers for:
              - Ingenic JZ4780 controller
              - APM X-Gene controller
              - Freescale RaidEngine device
              - Renesas USB Controller
        - remove device_alloc_chan_resources dummy handlers
        - sh driver cleanups for peri peri and related emmc and asoc patches
          as well
        - fixes and enhancements spread over the drivers
      * 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (59 commits)
        dmaengine: dw: don't prompt for DW_DMAC_CORE
        dmaengine: shdmac: avoid unused variable warnings
        dmaengine: fix platform_no_drv_owner.cocci warnings
        dmaengine: pch_dma: fix memory leak on failure path in pch_dma_probe()
        dmaengine: at_xdmac: unlock spin lock before return
        dmaengine: xgene: devm_ioremap() returns NULL on error
        dmaengine: xgene: buffer overflow in xgene_dma_init_channels()
        dmaengine: usb-dmac: Fix dereferencing freed memory 'desc'
        dmaengine: sa11x0: report slave capabilities to upper layers
        dmaengine: vdma: Fix compilation warnings
        dmaengine: fsl_raid: statify fsl_re_chan_probe
        dmaengine: Driver support for FSL RaidEngine device.
        dmaengine: xgene_dma_init_ring_mngr() can be static
        Documentation: dma: Add documentation for the APM X-Gene SoC DMA device DTS binding
        arm64: dts: Add APM X-Gene SoC DMA device and DMA clock DTS nodes
        dmaengine: Add support for APM X-Gene SoC DMA engine driver
        dmaengine: usb-dmac: Add Renesas USB DMA Controller (USB-DMAC) driver
        dmaengine: renesas,usb-dmac: Add device tree bindings documentation
        dmaengine: edma: fixed wrongly initialized data parameter to the edma callback
        dmaengine: ste_dma40: fix implicit conversion
    • Linus Torvalds's avatar
      Merge tag 'md/4.1' of git://neil.brown.name/md · 474095e4
      Linus Torvalds authored
      Pull md updates from Neil Brown:
       "More updates that usual this time.  A few have performance impacts
        which hould mostly be positive, but RAID5 (in particular) can be very
        work-load ensitive...  We'll have to wait and see.
         - "experimental" code for managing md/raid1 across a cluster using
           DLM.  Code is not ready for general use and triggers a WARNING if
           used.  However it is looking good and mostly done and having in
           mainline will help co-ordinate development.
         - RAID5/6 can now batch multiple (4K wide) stripe_heads so as to
           handle a full (chunk wide) stripe as a single unit.
         - RAID6 can now perform read-modify-write cycles which should help
           performance on larger arrays: 6 or more devices.
         - RAID5/6 stripe cache now grows and shrinks dynamically.  The value
           set is used as a minimum.
         - Resync is now allowed to go a little faster than the 'mininum' when
           there is competing IO.  How much faster depends on the speed of the
           devices, so the effective minimum should scale with device speed to
           some extent"
      * tag 'md/4.1' of git://neil.brown.name/md: (58 commits)
        md/raid5: don't do chunk aligned read on degraded array.
        md/raid5: allow the stripe_cache to grow and shrink.
        md/raid5: change ->inactive_blocked to a bit-flag.
        md/raid5: move max_nr_stripes management into grow_one_stripe and drop_one_stripe
        md/raid5: pass gfp_t arg to grow_one_stripe()
        md/raid5: introduce configuration option rmw_level
        md/raid5: activate raid6 rmw feature
        md/raid6 algorithms: xor_syndrome() for SSE2
        md/raid6 algorithms: xor_syndrome() for generic int
        md/raid6 algorithms: improve test program
        md/raid6 algorithms: delta syndrome functions
        raid5: handle expansion/resync case with stripe batching
        raid5: handle io error of batch list
        RAID5: batch adjacent full stripe write
        raid5: track overwrite disk count
        raid5: add a new flag to track if a stripe can be batched
        raid5: use flex_array for scribble data
        md raid0: access mddev->queue (request queue member) conditionally because it is not set when accessed from dm-raid
        md: allow resync to go faster when there is competing IO.
        md: remove 'go_faster' option from ->sync_request()
    • Linus Torvalds's avatar
      Merge tag 'devicetree-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · d56a669c
      Linus Torvalds authored
      Pull second batch of devicetree updates from Rob Herring:
       "As Grant mentioned in the first devicetree pull request, here is the
        2nd batch of DT changes for 4.1.  The main remaining item here is the
        endianness bindings and related 8250 driver support.
         - DT endianness specification bindings
         - big-endian 8250 serial support
         - DT overlay unittest updates
         - various DT doc updates
         - compile fixes for OF_IRQ=n"
      * tag 'devicetree-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
        frv: add io{read,write}{16,32}be functions
        mn10300: add io{read,write}{16,32}be functions
        Documentation: DT bindings: add doc for Altera's SoCFPGA platform
        of: base: improve of_get_next_child() kernel-doc
        Doc: dt: arch_timer: discourage clock-frequency use
        of: unittest: overlay: Keep track of created overlays
        of/fdt: fix allocation size for device node path
        serial: of_serial: Support big-endian register accesses
        serial: 8250: Add support for big-endian MMIO accesses
        of: Document {little,big,native}-endian bindings
        of/fdt: Add endianness helper function for early init code
        of: Add helper function to check MMIO register endianness
        of/fdt: Remove "reg" data prints from early_init_dt_scan_memory
        of: add vendor prefix for Artesyn
        of: Add dummy of_irq_to_resource_table() for IRQ_OF=n
        of: OF_IRQ should depend on IRQ_DOMAIN
    • Linus Torvalds's avatar
      Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 836ee487
      Linus Torvalds authored
      Pull initial ACPI support for arm64 from Will Deacon:
       "This series introduces preliminary ACPI 5.1 support to the arm64
        kernel using the "hardware reduced" profile.  We don't support any
        peripherals yet, so it's fairly limited in scope:
         - MEMORY init (UEFI)
         - ACPI discovery (RSDP via UEFI)
         - CPU init (FADT)
         - GIC init (MADT)
         - SMP boot (MADT + PSCI)
         - ACPI Kconfig options (dependent on EXPERT)
        ACPI for arm64 has been in development for a while now and hardware
        has been available that can boot with either FDT or ACPI tables.  This
        has been made possible by both changes to the ACPI spec to cater for
        ARM-based machines (known as "hardware-reduced" in ACPI parlance) but
        also a Linaro-driven effort to get this supported on top of the Linux
        kernel.  This pull request is the result of that work.
        These changes allow us to initialise the CPUs, interrupt controller,
        and timers via ACPI tables, with memory information and cmdline coming
        from EFI.  We don't support a hybrid ACPI/FDT scheme.  Of course,
        there is still plenty of work to do (a serial console would be nice!)
        but I expect that to happen on a per-driver basis after this core
        series has been merged.
        Anyway, the diff stat here is fairly horrible, but splitting this up
        and merging it via all the different subsystems would have been
        extremely painful.  Instead, we've got all the relevant Acks in place
        and I've not seen anything other than trivial (Kconfig) conflicts in
        -next (for completeness, I've included my resolution below).  Nearly
        half of the insertions fall under Documentation/.
        So, we'll see how this goes.  Right now, it all depends on EXPERT and
        I fully expect people to use FDT by default for the immediate future"
      * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (31 commits)
        ARM64 / ACPI: make acpi_map_gic_cpu_interface() as void function
        ARM64 / ACPI: Ignore the return error value of acpi_map_gic_cpu_interface()
        ARM64 / ACPI: fix usage of acpi_map_gic_cpu_interface
        ARM64: kernel: acpi: honour acpi=force command line parameter
        ARM64: kernel: acpi: refactor ACPI tables init and checks
        ARM64: kernel: psci: let ACPI probe PSCI version
        ARM64: kernel: psci: factor out probe function
        ACPI: move arm64 GSI IRQ model to generic GSI IRQ layer
        ARM64 / ACPI: Don't unflatten device tree if acpi=force is passed
        ARM64 / ACPI: additions of ACPI documentation for arm64
        Documentation: ACPI for ARM64
        ARM64 / ACPI: Enable ARM64 in Kconfig
        XEN / ACPI: Make XEN ACPI depend on X86
        ARM64 / ACPI: Select ACPI_REDUCED_HARDWARE_ONLY if ACPI is enabled on ARM64
        clocksource / arch_timer: Parse GTDT to initialize arch timer
        irqchip: Add GICv2 specific ACPI boot support
        ARM64 / ACPI: Introduce ACPI_IRQ_MODEL_GIC and register device's gsi
        ACPI / processor: Make it possible to get CPU hardware ID via GICC
        ACPI / processor: Introduce phys_cpuid_t for CPU hardware ID
        ARM64 / ACPI: Parse MADT for SMP initialization
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · fb65d872
      Linus Torvalds authored
      Pull ARM fixes from Russell King:
       "A few fixes for the recently merged development updates:
         - the update to convert a code branch in the procinfo structure
           forgot to update the nommu code.
         - VDSO only supported for V7 CPUs and later.
         - VDSO build creates files which should be ignored by git but are not.
         - ensure that make arch/arm/vdso/ doesn't build if it isn't enabled"
      * 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        ARM: 8344/1: VDSO: honor CONFIG_VDSO in Makefile
        ARM: 8343/1: VDSO: add build artifacts to .gitignore
        ARM: Fix nommu booting
        ARM: 8342/1: VDSO: depend on CPU_V7
    • Linus Torvalds's avatar
      Merge tag 'nios2-v4.1-rc1' of git://git.rocketboards.org/linux-socfpga-next · 05f0c553
      Linus Torvalds authored
      Pull arch/nios2 updates from Ley Foon Tan:
       - update cache management code
       - rework trap handler with new define trap #.
       - fix on check header warning.
      * tag 'nios2-v4.1-rc1' of git://git.rocketboards.org/linux-socfpga-next:
        nios2: rework cache
        nios2: Add types.h header required for __u32 type
        nios2: rework trap handler
        nios2: remove end address checking for initda
    • Linus Torvalds's avatar
      Merge tag 'blackfin-for-linus' of... · 668b54a1
      Linus Torvalds authored
      Merge tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux
      Pull blackfin updates from Steven Miao.
      * tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
        eth: bf609 eth clock: add pclk clock for stmmac driver probe
        blackfin: Wire up missing syscalls
        arch: blackfin: kernel: kgdb: Remove unused function
        dma: fix build error after update to v3.19
        blackfin: io: define __raw_readx/writex with bfin_readx/writex
        bf609: add resources for lcd nl8048
        pm: sometimes wake up from suspend to RAM would fail
        debug-mmrs: Eliminate all traces of the USB_PHY_TEST MMR
        bf609: remove softswitch i2c configuration from adv7842 and adv7511 platform data
        bf609: add platform data for soft switch devices on the video extenders
        bf609: enable soft switch gpio driver by default
        bf609: add gpio soft switch platform data for mcp23017 i2c devices
        bf609: use new SND_BF6XX_PCM to choose audio pcm driver
        bug[220] kgdb: change the smp cross core function entry
        arch: blackfin: kernel: setup.c: Cleaning up missing null-terminate in conjunction with strncpy
        blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP
    • Linus Torvalds's avatar
      Merge tag 'metag-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag · fab1e550
      Linus Torvalds authored
      Pull Metag architecture updates from James Hogan:
       "Just the one change for v4.1-rc1.  A minor cleanup of copy_thread()"
      * tag 'metag-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
        metag: copy_thread(): rename 'arg' argument to 'kthread_arg'
    • Linus Torvalds's avatar
      Merge tag 'arc-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc · c76397e9
      Linus Torvalds authored
      Pull ARC updates from Vineet Gupta:
       - perf fixes/improvements
       - misc cleanups
      * tag 'arc-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
        ARC: perf: don't add code for impossible case
        ARC: perf: Rename DT binding to not confuse with power mgmt
        ARC: perf: add user space attribution in callchains
        ARC: perf: Add kernel callchain support
        ARC: perf: support cache hit/miss ratio
        ARC: perf: Add some comments/debug stuff
        ARC: perf: make @arc_pmu static global
        ARC: mem init spring cleaning - No functional changes
        ARC: Fix RTT boot printing
        ARC: fold __builtin_constant_p() into test_bit()
        ARC: rename unhandled exception handler
        ARC: cosmetic: Remove unused ECR bitfield masks
        ARC: Fix WRITE_BCR
        ARC: [nsimosci] Update defconfig
        arc: copy_thread(): rename 'arg' argument to 'kthread_arg'
    • Linus Torvalds's avatar
      Merge branch 'for-4.1' of git://linux-nfs.org/~bfields/linux · 860448cf
      Linus Torvalds authored
      Pull nfsd updates from Bruce Fields:
       "A quiet cycle this time; this is basically entirely bugfixes.
        The few that aren't cc'd to stable are cleanup or seemed unlikely to
        affect anyone much"
      * 'for-4.1' of git://linux-nfs.org/~bfields/linux:
        uapi: Remove kernel internal declaration
        nfsd: fix nsfd startup race triggering BUG_ON
        nfsd: eliminate NFSD_DEBUG
        nfsd4: fix READ permission checking
        nfsd4: disallow SEEK with special stateids
        nfsd4: disallow ALLOCATE with special stateids
        nfsd: add NFSEXP_PNFS to the exflags array
        nfsd: Remove duplicate macro define for max sec label length
        nfsd: allow setting acls with unenforceable DENYs
        nfsd: NFSD_FAULT_INJECTION depends on DEBUG_FS
        nfsd: remove unused status arg to nfsd4_cleanup_open_state
        nfsd: remove bogus setting of status in nfsd4_process_open2
        NFSD: Use correct reply size calculating function
        NFSD: Using path_equal() for checking two paths
    • Linus Torvalds's avatar
      Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · ba0e4ae8
      Linus Torvalds authored
      Pull btrfs updates from Chris Mason:
       "I've been running these through a longer set of load tests because my
        commits change the free space cache writeout.  It fixes commit stalls
        on large filesystems (~20T space used and up) that we have been
        triggering here.  We were seeing new writers blocked for 10 seconds or
        more during commits, which is far from good.
        Josef and I fixed up ENOSPC aborts when deleting huge files (3T or
        more), that are triggered because our metadata reservations were not
        properly accounting for crcs and were not replenishing during the
        Also in this series, a number of qgroup fixes from Fujitsu and Dave
        Sterba collected most of the pending cleanups from the list"
      * 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (93 commits)
        btrfs: quota: Update quota tree after qgroup relationship change.
        btrfs: quota: Automatically update related qgroups or mark INCONSISTENT flags when assigning/deleting a qgroup relations.
        btrfs: qgroup: clear STATUS_FLAG_ON in disabling quota.
        btrfs: Update btrfs qgroup status item when rescan is done.
        btrfs: qgroup: Fix dead judgement on qgroup_rescan_leaf() return value.
        btrfs: Don't allow subvolid >= (1 << BTRFS_QGROUP_LEVEL_SHIFT) to be created
        btrfs: Check qgroup level in kernel qgroup assign.
        btrfs: qgroup: allow to remove qgroup which has parent but no child.
        btrfs: qgroup: return EINVAL if level of parent is not higher than child's.
        btrfs: qgroup: do a reservation in a higher level.
        Btrfs: qgroup, Account data space in more proper timings.
        Btrfs: qgroup: Introduce a may_use to account space_info->bytes_may_use.
        Btrfs: qgroup: free reserved in exceeding quota.
        Btrfs: qgroup: cleanup, remove an unsued parameter in btrfs_create_qgroup().
        btrfs: qgroup: fix limit args override whole limit struct
        btrfs: qgroup: update limit info in function btrfs_run_qgroups().
        btrfs: qgroup: consolidate the parameter of fucntion update_qgroup_limit_item().
        btrfs: qgroup: update qgroup in memory at the same time when we update it in btree.
        btrfs: qgroup: inherit limit info from srcgroup in creating snapshot.
        btrfs: Support busy loop of write and delete
    • Linus Torvalds's avatar
      Merge tag 'xfs-for-linus-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs · 1aef882f
      Linus Torvalds authored
      Pull xfs update from Dave Chinner:
       "This update contains:
         - RENAME_WHITEOUT support
         - conversion of per-cpu superblock accounting to use generic counters
         - new inode mmap lock so that we can lock page faults out of
           truncate, hole punch and other direct extent manipulation functions
           to avoid racing mmap writes from causing data corruption
         - rework of direct IO submission and completion to solve data
           corruption issue when running concurrent extending DIO writes.
           Also solves problem of running IO completion transactions in
           interrupt context during size extending AIO writes.
         - FALLOC_FL_INSERT_RANGE support for inserting holes into a file via
           direct extent manipulation to avoid needing to copy data within the
         - attribute block header field overflow fix for 64k block size
         - Lots of changes to log messaging to be more informative and concise
           when errors occur.  Also prevent a lot of unnecessary log spamming
           due to cascading failures in error conditions.
         - lots of cleanups and bug fixes
        One thing of note is the direct IO fixes that we merged last week
        after the window opened.  Even though a little late, they fix a user
        reported data corruption and have been pretty well tested.  I figured
        there was not much point waiting another 2 weeks for -rc1 to be
        released just so I could send them to you..."
      * tag 'xfs-for-linus-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs: (49 commits)
        xfs: using generic_file_direct_write() is unnecessary
        xfs: direct IO EOF zeroing needs to drain AIO
        xfs: DIO write completion size updates race
        xfs: DIO writes within EOF don't need an ioend
        xfs: handle DIO overwrite EOF update completion correctly
        xfs: DIO needs an ioend for writes
        xfs: move DIO mapping size calculation
        xfs: factor DIO write mapping from get_blocks
        xfs: unlock i_mutex in xfs_break_layouts
        xfs: kill unnecessary firstused overflow check on attr3 leaf removal
        xfs: use larger in-core attr firstused field and detect overflow
        xfs: pass attr geometry to attr leaf header conversion functions
        xfs: disallow ro->rw remount on norecovery mount
        xfs: xfs_shift_file_space can be static
        xfs: Add support FALLOC_FL_INSERT_RANGE for fallocate
        fs: Add support FALLOC_FL_INSERT_RANGE for fallocate
        xfs: Fix incorrect positive ENOMEM return
        xfs: xfs_mru_cache_insert() should use GFP_NOFS
        xfs: %pF is only for function pointers
        xfs: fix shadow warning in xfs_da3_root_split()
    • Linus Torvalds's avatar
      x86: fix special __probe_kernel_write() tail zeroing case · d869844b
      Linus Torvalds authored
      Commit cae2a173
       ("x86: clean up/fix 'copy_in_user()' tail zeroing")
      fixed the failure case tail zeroing of one special case of the x86-64
      generic user-copy routine, namely when used for the user-to-user case
      But in the process it broke an even more unusual case: using the user
      copy routine for kernel-to-kernel copying.
      Now, normally kernel-kernel copies are obviously done using memcpy(),
      but we have a couple of special cases when we use the user-copy
      functions.  One is when we pass a kernel buffer to a regular user-buffer
      routine, using set_fs(KERNEL_DS).  That's a "normal" case, and continued
      to work fine, because it never takes any faults (with the possible
      exception of a silent and successful vmalloc fault).
      But Jan Beulich pointed out another, very unusual, special case: when we
      use the user-copy routines not because it's a path that expects a user
      pointer, but for a couple of ftrace/kgdb cases that want to do a kernel
      copy, but do so using "unsafe" buffers, and use the user-copy routine to
      gracefully handle faults.  IOW, for probe_kernel_write().
      And that broke for the case of a faulting kernel destination, because we
      saw the kernel destination and wanted to try to clear the tail of the
      buffer.  Which doesn't work, since that's what faults.
      This only triggers for things like kgdb and ftrace users (eg trying
      setting a breakpoint on read-only memory), but it's definitely a bug.
      The fix is to not compare against the kernel address start (TASK_SIZE),
      but instead use the same limits "access_ok()" uses.
      Reported-and-tested-by: default avatarJan Beulich <jbeulich@suse.com>
      Cc: stable@vger.kernel.org # 4.0
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>