1. 22 Sep, 2017 9 commits
    • Linus Torvalds's avatar
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 4d9af767
      Linus Torvalds authored
      Pull arm64 fixes from Catalin Marinas:
      
       - #ifdef CONFIG_EFI around __efi_fpsimd_begin/end
      
       - Assembly code alignment reduced to 4 bytes from 16
      
       - Ensure the kernel is compiled for LP64 (there are some arm64
         compilers around defaulting to ILP32)
      
       - Fix arm_pmu_acpi memory leak on the error path
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        drivers/perf: arm_pmu_acpi: Release memory obtained by kasprintf
        arm64: ensure the kernel is compiled for LP64
        arm64: relax assembly code alignment from 16 byte to 4 byte
        arm64: efi: Don't include EFI fpsimd save/restore code in non-EFI kernels
      4d9af767
    • Tobias Klauser's avatar
      arch: remove unused *_segments() macros/functions · c17c0204
      Tobias Klauser authored
      Some architectures define the no-op macros/functions copy_segments,
      release_segments and forget_segments. These are used nowhere in the
      tree, so removed them.
      Signed-off-by: default avatarTobias Klauser <tklauser@distanz.ch>
      Acked-by: Vineet Gupta <vgupta@synopsys.com>   [for arch/arc]
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      c17c0204
    • Linus Torvalds's avatar
      Merge tag 'for-linus-4.14b-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 0a8abd97
      Linus Torvalds authored
      Pull xen fixes from Juergen Gross:
       "A fix for a missing __init annotation and two cleanup patches"
      
      * tag 'for-linus-4.14b-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xen, arm64: drop dummy lookup_address()
        xen: don't compile pv-specific parts if XEN_PV isn't configured
        xen: x86: mark xen_find_pt_base as __init
      0a8abd97
    • Linus Torvalds's avatar
      Merge tag 'powerpc-4.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux · d6396a73
      Linus Torvalds authored
      Pull powerpc fixes from Michael Ellerman:
       "It turns out our single-fix pull from last week was too good to be
        true. I missed a few fixes in that pull that had already come in
        because I was on leave, but also we hadn't found the bugs yet. So this
        week it's a bit bigger, though not ridiculous. Hopefully things will
        settle down from here on.
      
        Four fixes for the new instruction emulation code. A fix for CPU
        offline on bare metal machines when certain idle states are not
        supported, and a fix for a device_node refcounting oops during CPU
        hotplug, caused by recent changes.
      
        Going to stable are a fix for an oops during core dump on machines
        that have TM (Transactional Memory) disabled. Reordering some EEH
        initialisation to avoid trashing memory, and another device_node
        refcounting fix.
      
        And a few other minor things.
      
       Thanks to: Anton Blanchard, Benjamin Herrenschmidt, Cyril Bur, Gautham
       R. Shenoy, Gustavo Romero, Kamalesh Babulal, Matthew Weber, Matt Weber,
       Naveen N. Rao, Nicholas Piggin, Pavithra Prakash, Ravi Bangoria, Ronak
       Desai, Scott Wood, Tyrel Datwyler"
      
      * tag 'powerpc-4.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
        powerpc/pseries: Fix parent_dn reference leak in add_dt_node()
        powerpc/pseries: Fix "OF: ERROR: Bad of_node_put() on /cpus" during DLPAR
        powerpc/eeh: Create PHB PEs after EEH is initialized
        powerpc/kprobes: Update optprobes to use emulate_update_regs()
        powerpc/powernv: Clear LPCR[PECE1] via stop-api only for deep state offline
        powerpc/sstep: mullw should calculate a 64 bit signed result
        powerpc/sstep: Fix issues with mcrf
        powerpc/sstep: Fix issues with set_cr0()
        powerpc/tm: Flush TM only if CPU has TM feature
        powerpc/sysrq: Fix oops whem ppmu is not registered
        powerpc/configs: Update for CONFIG_SND changes
        powerpc/e6500: Update machine check for L1D cache err
      d6396a73
    • Linus Torvalds's avatar
      Merge branch '4.14-fixes' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 7e6d8f83
      Linus Torvalds authored
      Pull MIPS fixes from Ralf Baechle:
      
       - Fix a build error on MSP71xx which used to rely on somehow magically
         <asm/setup.h> being pulled in which no longer happens.
      
       - Fix the __write_64bit_c0_split inline assembler where there was the
         theoretical possibility of GCC interpret the constraints such that
         bad code could result.
      
       - A __init was causing section mismatch errors on Alchemy. Just to be
         on the safe side, Manuel's patch does away with all of them.
      
       - Fix perf event init.
      
      * '4.14-fixes' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: PCI: fix pcibios_map_irq section mismatch
        MIPS: Fix input modify in __write_64bit_c0_split()
        MIPS: MSP71xx: Include asm/setup.h
        MIPS: Fix perf event init
      7e6d8f83
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · c8107ed9
      Linus Torvalds authored
      Pull s390 fixes from Martin Schwidefsky:
      
       - A couple of bug fixes: memory management, perf, cio, dasd and
         scm_blk.
      
       - A larger change in regard to the CPU topology to improve performance
         for systems running under z/VM or KVM.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/topology: enable / disable topology dynamically
        s390/topology: alternative topology for topology-less machines
        s390/mm: fix write access check in gup_huge_pmd()
        s390/mm: make pmdp_invalidate() do invalidation only
        s390/cio: recover from bad paths
        s390/scm_blk: consistently use blk_status_t as error type
        s390/dasd: fix race during dasd initialization
        s390/perf: fix bug when creating per-thread event
      c8107ed9
    • Linus Torvalds's avatar
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 7a6d0071
      Linus Torvalds authored
      Pull crypto fixes from Herbert Xu:
       - Fix compiler warnings in inside-secure
       - Fix LS1021A support in caam
       - Avoid using RBP in x86 crypto code
       - Fix bug in talitos that prevents hashing with algif
       - Fix bugs talitos hashing code that cause incorrect hash result
       - Fix memory freeing path bug in drbg
       - Fix af_alg crash when two SG lists are chained
      
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: af_alg - update correct dst SGL entry
        crypto: caam - fix LS1021A support on ARMv7 multiplatform kernel
        crypto: inside-secure - fix gcc-4.9 warnings
        crypto: talitos - Don't provide setkey for non hmac hashing algs
        crypto: talitos - fix hashing
        crypto: talitos - fix sha224
        crypto: x86/twofish - Fix RBP usage
        crypto: sha512-avx2 - Fix RBP usage
        crypto: x86/sha256-ssse3 - Fix RBP usage
        crypto: x86/sha256-avx2 - Fix RBP usage
        crypto: x86/sha256-avx - Fix RBP usage
        crypto: x86/sha1-ssse3 - Fix RBP usage
        crypto: x86/sha1-avx2 - Fix RBP usage
        crypto: x86/des3_ede - Fix RBP usage
        crypto: x86/cast6 - Fix RBP usage
        crypto: x86/cast5 - Fix RBP usage
        crypto: x86/camellia - Fix RBP usage
        crypto: x86/blowfish - Fix RBP usage
        crypto: drbg - fix freeing of resources
      7a6d0071
    • Arvind Yadav's avatar
      drivers/perf: arm_pmu_acpi: Release memory obtained by kasprintf · a88dc7ba
      Arvind Yadav authored
      Free memory region, if arm_pmu_acpi_probe is not successful.
      Acked-by: default avatarWill Deacon <will.deacon@arm.com>
      Signed-off-by: default avatarArvind Yadav <arvind.yadav.cs@gmail.com>
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      a88dc7ba
    • Linus Torvalds's avatar
      Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm · 6e80ecdd
      Linus Torvalds authored
      Pull libnvdimm fixes from Dan Williams:
       "A crash fix and corresponding regression test enabling for the crash
        scenario. The unit test for this crash is available in ndctl-v58.2.
      
        This branch has received a build success notification from the
        0day-kbuild robot over 148 configs. The fix is tagged for -stable /
        backport to 4.13"
      
      * 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
        libnvdimm, namespace: fix btt claim class crash
        tools/testing/nvdimm: disable labels for nfit_test.1
      6e80ecdd
  2. 21 Sep, 2017 13 commits
    • Linus Torvalds's avatar
      Merge tag 'kbuild-fixes-v4.14' of... · 4a704d6d
      Linus Torvalds authored
      Merge tag 'kbuild-fixes-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
      
      Pull Kbuild fixes from Masahiro Yamada:
       "Here are some early Kbuild fixes.
      
        The in-kernel firmware was removed during the previous merge window.
        Since then, some bug reports of broken rpm building are flying in ML.
        We need to fix it now.
      
        Summary:
      
         - remove firmware install from rpm-pkg / deb-pkg
      
         - fix mismatch between release number and UTS_VERSION for rpm-pkg"
      
      * tag 'kbuild-fixes-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
        kbuild: rpm-pkg: fix version number handling
        kbuild: deb-pkg: remove firmware package support
        kbuild: rpm-pkg: delete firmware_install to fix build error
      4a704d6d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 449cd5d2
      Linus Torvalds authored
      Pull misc fixes from Al Viro:
       "A couple of regression fixes, one for this merge window, one for the
        previous cycle"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        ipc/shm: Fix order of parameters when calling copy_compat_shmid_to_user
        iov_iter: fix page_copy_sane for compound pages
      449cd5d2
    • Linus Torvalds's avatar
      Merge tag 'mtd/fixes-for-4.14-rc2' of git://git.infradead.org/linux-mtd · d9fde269
      Linus Torvalds authored
      Pull mtd fixes from Boris Brezillon:
       "SPI NOR:
         - Fix the SFDP parsing code (bugs reported by Geert Uytterhoeven)
      
        NAND:
         - Fix a resource leak in the lpc32xx_mlc driver
         - Fix a build warning in the core"
      
      * tag 'mtd/fixes-for-4.14-rc2' of git://git.infradead.org/linux-mtd:
        mtd: nand: remove unused blockmask variable
        mtd: nand: lpc32xx_mlc: Fix an error handling path in lpc32xx_nand_probe()
        mtd: spi-nor: fix DMA unsafe buffer issue in spi_nor_read_sfdp()
        mtd: spi-nor: Check consistency of the memory size extracted from the SFDP
      d9fde269
    • Linus Torvalds's avatar
      Merge tag 'drm-fixes-for-v4.14-rc2' of git://people.freedesktop.org/~airlied/linux · b6e78a6f
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "amdkfd, i915 and exynos fixes.
      
        I've ended up on unplanned + planned leave this week, but there were
        some fixes I decided to dequeue, some amdkfd bits missed the next pull
        but they are pretty trivial, so I included them.
      
        I'm not sure I'll see much else for rc2, lots of people are at XDC"
      
      * tag 'drm-fixes-for-v4.14-rc2' of git://people.freedesktop.org/~airlied/linux:
        drm/exynos/hdmi: Fix unsafe list iteration
        drm: exynos: include linux/irq.h
        drm/exynos: Fix suspend/resume support
        drm/exynos: Fix locking in the suspend/resume paths
        drm/i915: Remove unused 'in_vbl' from i915_get_crtc_scanoutpos()
        drm/i915/cnp: set min brightness from VBT
        Revert "drm/i915/bxt: Disable device ready before shutdown command"
        drm/i915/bxt: set min brightness from VBT
        drm/i915: Fix an error handling in 'intel_framebuffer_init()'
        drm/i915/gvt: Fix incorrect PCI BARs reporting
        drm/amdkfd: pass queue's mqd when destroying mqd
        drm/amdkfd: remove memset before memcpy
        uapi linux/kfd_ioctl.h: only use __u32 and __u64
      b6e78a6f
    • Linus Torvalds's avatar
      Merge tag 'dma-mapping-4.14-2' of git://git.infradead.org/users/hch/dma-mapping · 20c29a97
      Linus Torvalds authored
      Pull dma mapping fix from Christoph Hellwig:
       "A fix for a fix that went in this merge window from Arnd"
      
      * tag 'dma-mapping-4.14-2' of git://git.infradead.org/users/hch/dma-mapping:
        dma-coherent: fix rmem_dma_device_init regression
      20c29a97
    • Manuel Lauss's avatar
      MIPS: PCI: fix pcibios_map_irq section mismatch · 8eba3651
      Manuel Lauss authored
      Drop  the __init from pcibios_map_irq() to make this section mis-
      match go away:
      
      WARNING: vmlinux.o(.text+0x56acd4): Section mismatch in reference from the function pcibios_scanbus() to the function .init.text:pcibios_map_irq()
      The function pcibios_scanbus() references
      the function __init pcibios_map_irq().
      This is often because pcibios_scanbus lacks a __init
      annotation or the annotation of pcibios_map_irq is wrong.
      
      Run-Tested only on Alchemy.
      Signed-off-by: default avatarManuel Lauss <manuel.lauss@gmail.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/17267/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      8eba3651
    • James Hogan's avatar
      MIPS: Fix input modify in __write_64bit_c0_split() · c22c8043
      James Hogan authored
      The inline asm in __write_64bit_c0_split() modifies the 64-bit input
      operand by shifting the high register left by 32, and constructing the
      full 64-bit value in the low register (even on a 32-bit kernel), so if
      that value is used again it could cause breakage as GCC would assume the
      registers haven't changed when they have.
      
      To quote the GCC extended asm documentation:
      > Warning: Do not modify the contents of input-only operands (except for
      > inputs tied to outputs). The compiler assumes that on exit from the
      > asm statement these operands contain the same values as they had
      > before executing the statement.
      
      Avoid modifying the input by using a temporary variable as an output
      which is modified instead of the input and not otherwise used. The asm
      is always __volatile__ so GCC shouldn't optimise it out. The low
      register of the temporary output is written before the high register of
      the input is read, so we have two constraint alternatives, one where
      both use the same registers (for when the input value isn't subsequently
      used), and one with an early clobber on the output in case the low
      output uses the same register as the high input. This allows the
      resulting assembly to remain mostly unchanged.
      
      A diff of a MIPS32r6 kernel reveals only three differences, two in
      relation to write_c0_r10k_diag() in cpu_probe() (register allocation
      rearranged slightly but otherwise identical), and one in relation to
      write_c0_cvmmemctl2() in kvm_vz_local_flush_guesttlb_all(), but the
      octeon CPU is only supported on 64-bit kernels where
      __write_64bit_c0_split() isn't used so that shouldn't matter in
      practice. So there currently doesn't appear to be anything broken by
      this bug.
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/17315/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      c22c8043
    • Arnd Bergmann's avatar
      MIPS: MSP71xx: Include asm/setup.h · 9bbe7dc0
      Arnd Bergmann authored
      msp71xx_defconfig can not be built at the in v4.14-rc1
      
      arch/mips/pmcs-msp71xx/msp_smp.c:72:2: error: implicit declaration of function 'set_vi_handler' [-Werror=implicit-function-declaration]
      
      I don't know what caused the regression, but including the right
      header is the obvious fix.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/17309/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      9bbe7dc0
    • Tyrel Datwyler's avatar
      powerpc/pseries: Fix parent_dn reference leak in add_dt_node() · b537ca6f
      Tyrel Datwyler authored
      A reference to the parent device node is held by add_dt_node() for the
      node to be added. If the call to dlpar_configure_connector() fails
      add_dt_node() returns ENOENT and that reference is not freed.
      
      Add a call to of_node_put(parent_dn) prior to bailing out after a
      failed dlpar_configure_connector() call.
      
      Fixes: 8d5ff320 ("powerpc/pseries: Make dlpar_configure_connector parent node aware")
      Cc: stable@vger.kernel.org # v3.12+
      Signed-off-by: default avatarTyrel Datwyler <tyreld@linux.vnet.ibm.com>
      Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
      b537ca6f
    • Tyrel Datwyler's avatar
      powerpc/pseries: Fix "OF: ERROR: Bad of_node_put() on /cpus" during DLPAR · 087ff6a5
      Tyrel Datwyler authored
      Commit 215ee763 ("powerpc: pseries: remove dlpar_attach_node
      dependency on full path") reworked dlpar_attach_node() to no longer
      look up the parent node "/cpus", but instead to have the parent node
      passed by the caller in the function parameter list.
      
      As a result dlpar_attach_node() is no longer responsible for freeing
      the reference to the parent node. However, commit 215ee763 failed
      to remove the of_node_put(parent) call in dlpar_attach_node(), or to
      take into account that the reference to the parent in the caller
      dlpar_cpu_add() needs to be held until after dlpar_attach_node()
      returns.
      
      As a result doing repeated cpu add/remove dlpar operations will
      eventually result in the following error:
      
        OF: ERROR: Bad of_node_put() on /cpus
        CPU: 0 PID: 10896 Comm: drmgr Not tainted 4.13.0-autotest #1
        Call Trace:
         dump_stack+0x15c/0x1f8 (unreliable)
         of_node_release+0x1a4/0x1c0
         kobject_put+0x1a8/0x310
         kobject_del+0xbc/0xf0
         __of_detach_node_sysfs+0x144/0x210
         of_detach_node+0xf0/0x180
         dlpar_detach_node+0xc4/0x120
         dlpar_cpu_remove+0x280/0x560
         dlpar_cpu_release+0xbc/0x1b0
         arch_cpu_release+0x6c/0xb0
         cpu_release_store+0xa0/0x100
         dev_attr_store+0x68/0xa0
         sysfs_kf_write+0xa8/0xf0
         kernfs_fop_write+0x2cc/0x400
         __vfs_write+0x5c/0x340
         vfs_write+0x1a8/0x3d0
         SyS_write+0xa8/0x1a0
         system_call+0x58/0x6c
      
      Fix the issue by removing the of_node_put(parent) call from
      dlpar_attach_node(), and ensuring that the reference to the parent
      node is properly held and released by the caller dlpar_cpu_add().
      
      Fixes: 215ee763 ("powerpc: pseries: remove dlpar_attach_node dependency on full path")
      Signed-off-by: default avatarTyrel Datwyler <tyreld@linux.vnet.ibm.com>
      Reported-by: default avatarAbdul Haleem <abdhalee@linux.vnet.ibm.com>
      [mpe: Add a comment in the code and frob the change log slightly]
      Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
      087ff6a5
    • Benjamin Herrenschmidt's avatar
      powerpc/eeh: Create PHB PEs after EEH is initialized · 3e77adee
      Benjamin Herrenschmidt authored
      Otherwise we end up not yet having computed the right diag data size
      on powernv where EEH initialization is delayed, thus causing memory
      corruption later on when calling OPAL.
      
      Fixes: 5cb1f8fd ("powerpc/powernv/pci: Dynamically allocate PHB diag data")
      Cc: stable@vger.kernel.org # v4.13+
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Acked-by: default avatarRussell Currey <ruscur@russell.cc>
      Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
      3e77adee
    • Will Deacon's avatar
      ipc/shm: Fix order of parameters when calling copy_compat_shmid_to_user · 58aff0af
      Will Deacon authored
      Commit 553f770e ("ipc: move compat shmctl to native") moved the
      compat IPC syscall handling into ipc/shm.c and refactored the struct
      accessors in the process. Unfortunately, the call to
      copy_compat_shmid_to_user when handling a compat {IPC,SHM}_STAT command
      gets the arguments the wrong way round, passing a kernel stack address
      as the user buffer (destination) and the user buffer as the kernel stack
      address (source).
      
      This patch fixes the parameter ordering so the buffers are accessed
      correctly.
      
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      58aff0af
    • Petar Penkov's avatar
      iov_iter: fix page_copy_sane for compound pages · a90bcb86
      Petar Penkov authored
      Issue is that if the data crosses a page boundary inside a compound
      page, this check will incorrectly trigger a WARN_ON.
      
      To fix this, compute the order using the head of the compound page and
      adjust the offset to be relative to that head.
      
      Fixes: 72e809ed ("iov_iter: sanity checks for copy to/from page
      primitives")
      Signed-off-by: default avatarPetar Penkov <ppenkov@google.com>
      CC: Al Viro <viro@zeniv.linux.org.uk>
      CC: Eric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      a90bcb86
  3. 20 Sep, 2017 18 commits