1. 11 Jul, 2017 2 commits
    • Oliver O'Halloran's avatar
      powerpc/asm: Mark cr0 as clobbered in mftb() · 2400fd82
      Oliver O'Halloran authored
      The workaround for the CELL timebase bug does not correctly mark cr0 as
      being clobbered. This means GCC doesn't know that the asm block changes cr0 and
      might leave the result of an unrelated comparison in cr0 across the block, which
      we then trash, leading to basically random behaviour.
      
      Fixes: 859deea9 ("[POWERPC] Cell timebase bug workaround")
      Cc: stable@vger.kernel.org # v2.6.19+
      Signed-off-by: default avatarOliver O'Halloran <oohall@gmail.com>
      [mpe: Tweak change log and flag for stable]
      Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
      2400fd82
    • Nicholas Piggin's avatar
      powerpc/powernv: Fix local TLB flush for boot and MCE on POWER9 · 41d0c2ec
      Nicholas Piggin authored
      There are two cases outside the normal address space management
      where a CPU's local TLB is to be flushed:
      
        1. Host boot; in case something has left stale entries in the
           TLB (e.g., kexec).
      
        2. Machine check; to clean corrupted TLB entries.
      
      CPU state restore from deep idle states also flushes the TLB.
      However this seems to be a side effect of reusing the boot code to set
      CPU state, rather than a requirement itself.
      
      The current flushing has a number of problems with ISA v3.0B:
      
      - The current radix mode of the MMU is not taken into account. tlbiel
        is undefined if the R field does not match the current radix mode.
      
      - ISA v3.0B hash must flush the partition and process table caches.
      
      - ISA v3.0B radix must flush partition and process scoped translations,
        partition and process table caches, and also the page walk cache.
      
      Add POWER9 cases to handle these, with radix vs hash determined by the
      host MMU mode.
      Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
      Reviewed-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
      Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
      41d0c2ec
  2. 10 Jul, 2017 5 commits
    • Benjamin Herrenschmidt's avatar
      powerpc/mm/radix: Synchronize updates to the process table · 3a6a0470
      Benjamin Herrenschmidt authored
      When writing to the process table, we need to ensure the store is
      visible to a subsequent access by the MMU. We assume we never have
      the PID active while doing the update, so a ptesync/isync pair
      should hopefully be a big enough hammer for our purpose.
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
      3a6a0470
    • Benjamin Herrenschmidt's avatar
      powerpc/mm/radix: Properly clear process table entry · c6bb0b8d
      Benjamin Herrenschmidt authored
      On radix, the process table entry we want to clear when destroying a
      context is entry 0, not entry 1. This has no *immediate* consequence
      on Power9, but it can cause other bugs to become worse.
      
      Fixes: 7e381c0f ("powerpc/mm/radix: Add mmu context handling callback for radix")
      Cc: stable@vger.kernel.org # v4.7+
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Reviewed-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
      Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
      c6bb0b8d
    • Benjamin Herrenschmidt's avatar
      powerpc/powernv: Tell OPAL about our MMU mode on POWER9 · 1c0eaf0f
      Benjamin Herrenschmidt authored
      That will allow OPAL to configure the CPU in an optimal way.
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Signed-off-by: default avatarMichael Neuling <mikey@neuling.org>
      Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
      1c0eaf0f
    • Balbir Singh's avatar
      powerpc/kexec: Fix radix to hash kexec due to IAMR/AMOR · 1e2a516e
      Balbir Singh authored
      This patch fixes a crash seen while doing a kexec from radix mode to
      hash mode. Key 0 is special in hash and used in the RPN by default, we
      set the key values to 0 today. In radix mode key 0 is used to control
      supervisor<->user access. In hash key 0 is used by default, so the
      first instruction after the switch causes a crash on kexec.
      
      Commit 3b10d009 ("powerpc/mm/radix: Prevent kernel execution of
      user space") introduced the setting of IAMR and AMOR values to prevent
      execution of user mode instructions from supervisor mode. We need to
      clean up these SPR's on kexec.
      
      Fixes: 3b10d009 ("powerpc/mm/radix: Prevent kernel execution of user space")
      Cc: stable@vger.kernel.org # v4.10+
      Reported-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Signed-off-by: default avatarBalbir Singh <bsingharora@gmail.com>
      Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
      1e2a516e
    • Linus Torvalds's avatar
      Merge tag 'drm-for-v4.13' of git://people.freedesktop.org/~airlied/linux · af3c8d98
      Linus Torvalds authored
      Pull drm updates from Dave Airlie:
       "This is the main pull request for the drm, I think I've got one later
        driver pull for mediatek SoC driver, I'm undecided on if it needs to
        go to you yet.
      
        Otherwise summary below:
      
        Core drm:
         - Atomic add driver private objects
         - Deprecate preclose hook in modern drivers
         - MST bandwidth tracking
         - Use kvmalloc in more places
         - Add mode_valid hook for crtc/encoder/bridge
         - Reduce sync_file construction time
         - Documentation updates
         - New DRM synchronisation object support
      
        New drivers:
         - pl111 - pl111 CLCD display controller
      
        Panel:
         - Innolux P079ZCA panel driver
         - Add NL12880B20-05, NL192108AC18-02D, P320HVN03 panels
         - panel-samsung-s6e3ha2: Add s6e3hf2 panel support
      
        i915:
         - SKL+ watermark fixes
         - G4x/G33 reset improvements
         - DP AUX backlight improvements
         - Buffer based GuC/host communication
         - New getparam for (sub)slice infomation
         - Cannonlake and Coffeelake initial patches
         - Execbuf optimisations
      
        radeon/amdgpu:
         - Lots of Vega10 bug fixes
         - Preliminary raven support
         - KIQ support for compute rings
         - MEC queue management rework
         - DCE6 Audio support
         - SR-IOV improvements
         - Better radeon/amdgpu selection support
      
        nouveau:
         - HDMI stereoscopic support
         - Display code rework for >= GM20x GPUs
      
        msm:
         - GEM rework for fine-grained locking
         - Per-process pagetable work
         - HDMI fixes for Snapdragon 820.
      
        vc4:
         - Remove 256MB CMA limit from vc4
         - Add out-fence support
         - Add support for cygnus
         - Get/set tiling ioctls support
         - Add T-format tiling support for scanout
      
        zte:
         - add VGA support.
      
        etnaviv:
         - Thermal throttle support for newer GPUs
         - Restore userspace buffer cache performance
         - dma-buf sync fix
      
        stm:
         - add stm32f429 display support
      
        exynos:
         - Rework vblank handling
         - Fixup sw-trigger code
      
        sun4i:
         - V3s display engine support
         - HDMI support for older SoCs
         - Preliminary work on dual-pipeline SoCs.
      
        rcar-du:
         - VSP work
      
        imx-drm:
         - Remove counter load enable from PRE
         - Double read/write reduction flag support
      
        tegra:
         - Documentation for the host1x and drm driver.
         - Lots of staging ioctl fixes due to grate project work.
      
        omapdrm:
         - dma-buf fence support
         - TILER rotation fixes"
      
      * tag 'drm-for-v4.13' of git://people.freedesktop.org/~airlied/linux: (1270 commits)
        drm: Remove unused drm_file parameter to drm_syncobj_replace_fence()
        drm/amd/powerplay: fix bug fail to remove sysfs when rmmod amdgpu.
        amdgpu: Set cik/si_support to 1 by default if radeon isn't built
        drm/amdgpu/gfx9: fix driver reload with KIQ
        drm/amdgpu/gfx8: fix driver reload with KIQ
        drm/amdgpu: Don't call amd_powerplay_destroy() if we don't have powerplay
        drm/ttm: Fix use-after-free in ttm_bo_clean_mm
        drm/amd/amdgpu: move get memory type function from early init to sw init
        drm/amdgpu/cgs: always set reference clock in mode_info
        drm/amdgpu: fix vblank_time when displays are off
        drm/amd/powerplay: power value format change for Vega10
        drm/amdgpu/gfx9: support the amdgpu.disable_cu option
        drm/amd/powerplay: change PPSMC_MSG_GetCurrPkgPwr for Vega10
        drm/amdgpu: Make amdgpu_cs_parser_init static (v2)
        drm/amdgpu/cs: fix a typo in a comment
        drm/amdgpu: Fix the exported always on CU bitmap
        drm/amdgpu/gfx9: gfx_v9_0_enable_gfx_static_mg_power_gating() can be static
        drm/amdgpu/psp: upper_32_bits/lower_32_bits for address setup
        drm/amd/powerplay/cz: print message if smc message fails
        drm/amdgpu: fix typo in amdgpu_debugfs_test_ib_init
        ...
      af3c8d98
  3. 09 Jul, 2017 14 commits
    • David Howells's avatar
      afs: Add metadata xattrs · d3e3b7ea
      David Howells authored
      Add xattrs to allow the user to get/set metadata in lieu of having pioctl()
      available.  The following xattrs are now available:
      
       - "afs.cell"
      
         The name of the cell in which the vnode's volume resides.
      
       - "afs.fid"
      
         The volume ID, vnode ID and vnode uniquifier of the file as three hex
         numbers separated by colons.
      
       - "afs.volume"
      
         The name of the volume in which the vnode resides.
      
      For example:
      
      	# getfattr -d -m ".*" /mnt/scratch
      	getfattr: Removing leading '/' from absolute path names
      	# file: mnt/scratch
      	afs.cell="mycell.myorg.org"
      	afs.fid="10000b:1:1"
      	afs.volume="scratch"
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d3e3b7ea
    • Marc Dionne's avatar
      afs: Ignore AFS_ACE_READ and AFS_ACE_WRITE for directories · fd249821
      Marc Dionne authored
      The AFS_ACE_READ and AFS_ACE_WRITE permission bits should not
      be used to make access decisions for the directory itself.  They
      are meant to control access for the objects contained in that
      directory.
      
      Reading a directory is allowed if the AFS_ACE_LOOKUP bit is set.
      This would cause an incorrect access denied error for a directory
      with AFS_ACE_LOOKUP but not AFS_ACE_READ.
      
      The AFS_ACE_WRITE bit does not allow operations that modify the
      directory.  For a directory with AFS_ACE_WRITE but neither
      AFS_ACE_INSERT nor AFS_ACE_DELETE, this would result in trying
      operations that would ultimately be denied by the server.
      Signed-off-by: default avatarMarc Dionne <marc.dionne@auristor.com>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      fd249821
    • Cong Wang's avatar
      mqueue: fix a use-after-free in sys_mq_notify() · f991af3d
      Cong Wang authored
      The retry logic for netlink_attachskb() inside sys_mq_notify()
      is nasty and vulnerable:
      
      1) The sock refcnt is already released when retry is needed
      2) The fd is controllable by user-space because we already
         release the file refcnt
      
      so we when retry but the fd has been just closed by user-space
      during this small window, we end up calling netlink_detachskb()
      on the error path which releases the sock again, later when
      the user-space closes this socket a use-after-free could be
      triggered.
      
      Setting 'sock' to NULL here should be sufficient to fix it.
      Reported-by: default avatarGeneBlue <geneblue.mail@gmail.com>
      Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Manfred Spraul <manfred@colorfullife.com>
      Cc: stable@kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      f991af3d
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 2b976203
      Linus Torvalds authored
      Pull x86 fixes from Thomas Gleixner:
       "The x86 updates contain:
      
         - A fix for a longstanding PAT bug, where PAT was reported on CPUs
           that do not support it, which leads to wrong caching attributes and
           missing MTRR updates
      
         - Prevent overwriting of the e820 firmware table, which causes kexec
           kernels to lose the fake mptable which is stored there.
      
         - Cleanup of the UV/BAU code, removing unused code and making local
           functions static"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/boot/e820: Introduce the bootloader provided e820_table_firmware[] table
        x86/boot/e820: Rename the e820_table_firmware to e820_table_kexec
        x86/boot/e820: Avoid overwriting e820_table_firmware
        x86/mm/pat: Don't report PAT on CPUs that don't support it
        x86/platform/uv/BAU: Minor cleanup, make some local functions static
      2b976203
    • Linus Torvalds's avatar
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 8d97a6c3
      Linus Torvalds authored
      Pull timers fixlet from Thomas Gleixner:
       "Add Frederic Weisbecker as NOHZ/dyntick maintainer"
      
      [ And an unmentioned and unrelated typo fix in the same commit? Hmm.. ]
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        MAINTAINERS: Add Frederic Weisbecker as nohz/dyntics maintainer
      8d97a6c3
    • Linus Torvalds's avatar
      Merge branch 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 4d3c4a42
      Linus Torvalds authored
      Pull smp/hotplug fix from Thomas Gleixner:
       "A single fix for a brown paperbag bug:
      
        The unparking of the initial percpu threads of an upcoming CPU happens
        right now on the idle task, but that's wrong as the unpark function
        might sleep. Move it to the control CPU."
      
      * 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        smp/hotplug: Move unparking of percpu threads to the control CPU
      4d3c4a42
    • Linus Torvalds's avatar
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 4fde846a
      Linus Torvalds authored
      Pull scheduler fixes from Thomas Gleixner:
       "This scheduler update provides:
      
         - The (hopefully) final fix for the vtime accounting issues which
           were around for quite some time
      
         - Use types known to user space in UAPI headers to unbreak user space
           builds
      
         - Make load balancing respect the current scheduling domain again
           instead of evaluating unrelated CPUs"
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched/headers/uapi: Fix linux/sched/types.h userspace compilation errors
        sched/fair: Fix load_balance() affinity redo path
        sched/cputime: Accumulate vtime on top of nsec clocksource
        sched/cputime: Move the vtime task fields to their own struct
        sched/cputime: Rename vtime fields
        sched/cputime: Always set tsk->vtime_snap_whence after accounting vtime
        vtime, sched/cputime: Remove vtime_account_user()
        Revert "sched/cputime: Refactor the cputime_adjust() code"
      4fde846a
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · c3931a87
      Linus Torvalds authored
      Pull perf fixes from Thomas Gleixner:
       "A couple of fixes for perf and kprobes:
      
         - Add he missing exclude_kernel attribute for the precise_ip level so
           !CAP_SYS_ADMIN users get the proper results.
      
         - Warn instead of failing completely when perf has no unwind support
           for a particular architectiure built in.
      
         - Ensure that jprobes are at function entry and not at some random
           place"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        kprobes: Ensure that jprobe probepoints are at function entry
        kprobes: Simplify register_jprobes()
        kprobes: Rename [arch_]function_offset_within_entry() to [arch_]kprobe_on_func_entry()
        perf unwind: Do not fail due to missing unwind support
        perf evsel: Set attr.exclude_kernel when probing max attr.precise_ip
      c3931a87
    • Linus Torvalds's avatar
      Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · c8b2ba83
      Linus Torvalds authored
      Pull locking fixes from Thomas Gleixner:
      
       - Fix the EINTR logic in rwsem-spinlock to avoid double locking by a
         writer and a reader
      
       - Add a missing include to qspinlocks
      
      * 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        locking/qspinlock: Explicitly include asm/prefetch.h
        locking/rwsem-spinlock: Fix EINTR branch in __down_write_common()
      c8b2ba83
    • Linus Torvalds's avatar
      Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7cb328c3
      Linus Torvalds authored
      Pull irq fixes from Thomas Gleixner:
      
       - A few fixes mopping up the fallout of the big irq overhaul
      
       - Move the interrupt resource management logic out of the spin locked,
         irq disabled region to avoid unnecessary restrictions of the resource
         callbacks
      
       - Preparation for reworking the per cpu irq request function.
      
      * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        irqdomain: Allow ACPI device nodes to be used as irqdomain identifiers
        genirq/debugfs: Remove redundant NULL pointer check
        genirq: Allow to pass the IRQF_TIMER flag with percpu irq request
        genirq/timings: Move free timings out of spinlocked region
        genirq: Move irq resource handling out of spinlocked region
        genirq: Add mutex to irq desc to serialize request/free_irq()
        genirq: Move bus locking into __setup_irq()
        genirq: Force inlining of __irq_startup_managed to prevent build failure
        genirq/debugfs: Fix build for !CONFIG_IRQ_DOMAIN
      7cb328c3
    • Linus Torvalds's avatar
      Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 19bf2e0e
      Linus Torvalds authored
      Pull objtool fix from Thomas Gleixner:
       "A fix to the objtool sibling call detection logic to distinguish
        normal jumps inside a function from a real sibling call"
      
      * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        objtool: Fix sibling call detection logic
      19bf2e0e
    • Linus Torvalds's avatar
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · bc2c6421
      Linus Torvalds authored
      Pull ext4 updates from Ted Ts'o:
       "The first major feature for ext4 this merge window is the largedir
        feature, which allows ext4 directories to support over 2 billion
        directory entries (assuming ~64 byte file names; in practice, users
        will run into practical performance limits first.) This feature was
        originally written by the Lustre team, and credit goes to Artem
        Blagodarenko from Seagate for getting this feature upstream.
      
        The second major major feature allows ext4 to support extended
        attribute values up to 64k. This feature was also originally from
        Lustre, and has been enhanced by Tahsin Erdogan from Google with a
        deduplication feature so that if multiple files have the same xattr
        value (for example, Windows ACL's stored by Samba), only one copy will
        be stored on disk for encoding and caching efficiency.
      
        We also have the usual set of bug fixes, cleanups, and optimizations"
      
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (47 commits)
        ext4: fix spelling mistake: "prellocated" -> "preallocated"
        ext4: fix __ext4_new_inode() journal credits calculation
        ext4: skip ext4_init_security() and encryption on ea_inodes
        fs: generic_block_bmap(): initialize all of the fields in the temp bh
        ext4: change fast symlink test to not rely on i_blocks
        ext4: require key for truncate(2) of encrypted file
        ext4: don't bother checking for encryption key in ->mmap()
        ext4: check return value of kstrtoull correctly in reserved_clusters_store
        ext4: fix off-by-one fsmap error on 1k block filesystems
        ext4: return EFSBADCRC if a bad checksum error is found in ext4_find_entry()
        ext4: return EIO on read error in ext4_find_entry
        ext4: forbid encrypting root directory
        ext4: send parallel discards on commit completions
        ext4: avoid unnecessary stalls in ext4_evict_inode()
        ext4: add nombcache mount option
        ext4: strong binding of xattr inode references
        ext4: eliminate xattr entry e_hash recalculation for removes
        ext4: reserve space for xattr entries/names
        quota: add get_inode_usage callback to transfer multi-inode charges
        ext4: xattr inode deduplication
        ...
      bc2c6421
    • Linus Torvalds's avatar
      Merge tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt · 58f587cb
      Linus Torvalds authored
      Pull fscrypt updates from Ted Ts'o:
       "Add support for 128-bit AES and some cleanups to fscrypt"
      
      * tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt:
        fscrypt: make ->dummy_context() return bool
        fscrypt: add support for AES-128-CBC
        fscrypt: inline fscrypt_free_filename()
      58f587cb
    • Linus Torvalds's avatar
      Merge branch 'waitid-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · e28e9e3e
      Linus Torvalds authored
      Pull waitid fix from Al Viro.
      
      * 'waitid-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        fix waitid(2) breakage
      e28e9e3e
  4. 08 Jul, 2017 19 commits
    • Linus Torvalds's avatar
      Merge tag 'pci-v4.13-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · f263fbb8
      Linus Torvalds authored
      Pull PCI updates from Bjorn Helgaas:
      
        - add sysfs max_link_speed/width, current_link_speed/width (Wong Vee
          Khee)
      
        - make host bridge IRQ mapping much more generic (Matthew Minter,
          Lorenzo Pieralisi)
      
        - convert most drivers to pci_scan_root_bus_bridge() (Lorenzo
          Pieralisi)
      
        - mutex sriov_configure() (Jakub Kicinski)
      
        - mutex pci_error_handlers callbacks (Christoph Hellwig)
      
        - split ->reset_notify() into ->reset_prepare()/reset_done()
          (Christoph Hellwig)
      
        - support multiple PCIe portdrv interrupts for MSI as well as MSI-X
          (Gabriele Paoloni)
      
        - allocate MSI/MSI-X vector for Downstream Port Containment (Gabriele
          Paoloni)
      
        - fix MSI IRQ affinity pre/post/min_vecs issue (Michael Hernandez)
      
        - test INTx masking during enumeration, not at run-time (Piotr Gregor)
      
        - avoid using device_may_wakeup() for runtime PM (Rafael J. Wysocki)
      
        - restore the status of PCI devices across hibernation (Chen Yu)
      
        - keep parent resources that start at 0x0 (Ard Biesheuvel)
      
        - enable ECRC only if device supports it (Bjorn Helgaas)
      
        - restore PRI and PASID state after Function-Level Reset (CQ Tang)
      
        - skip DPC event if device is not present (Keith Busch)
      
        - check domain when matching SMBIOS info (Sujith Pandel)
      
        - mark Intel XXV710 NIC INTx masking as broken (Alex Williamson)
      
        - avoid AMD SB7xx EHCI USB wakeup defect (Kai-Heng Feng)
      
        - work around long-standing Macbook Pro poweroff issue (Bjorn Helgaas)
      
        - add Switchtec "running" status flag (Logan Gunthorpe)
      
        - fix dra7xx incorrect RW1C IRQ register usage (Arvind Yadav)
      
        - modify xilinx-nwl IRQ chip for legacy interrupts (Bharat Kumar
          Gogada)
      
        - move VMD SRCU cleanup after bus, child device removal (Jon Derrick)
      
        - add Faraday clock handling (Linus Walleij)
      
        - configure Rockchip MPS and reorganize (Shawn Lin)
      
        - limit Qualcomm TLP size to 2K (hardware issue) (Srinivas Kandagatla)
      
        - support Tegra MSI 64-bit addressing (Thierry Reding)
      
        - use Rockchip normal (not privileged) register bank (Shawn Lin)
      
        - add HiSilicon Kirin SoC PCIe controller driver (Xiaowei Song)
      
        - add Sigma Designs Tango SMP8759 PCIe controller driver (Marc
          Gonzalez)
      
        - add MediaTek PCIe host controller support (Ryder Lee)
      
        - add Qualcomm IPQ4019 support (John Crispin)
      
        - add HyperV vPCI protocol v1.2 support (Jork Loeser)
      
        - add i.MX6 regulator support (Quentin Schulz)
      
      * tag 'pci-v4.13-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (113 commits)
        PCI: tango: Add Sigma Designs Tango SMP8759 PCIe host bridge support
        PCI: Add DT binding for Sigma Designs Tango PCIe controller
        PCI: rockchip: Use normal register bank for config accessors
        dt-bindings: PCI: Add documentation for MediaTek PCIe
        PCI: Remove __pci_dev_reset() and pci_dev_reset()
        PCI: Split ->reset_notify() method into ->reset_prepare() and ->reset_done()
        PCI: xilinx: Make of_device_ids const
        PCI: xilinx-nwl: Modify IRQ chip for legacy interrupts
        PCI: vmd: Move SRCU cleanup after bus, child device removal
        PCI: vmd: Correct comment: VMD domains start at 0x10000, not 0x1000
        PCI: versatile: Add local struct device pointers
        PCI: tegra: Do not allocate MSI target memory
        PCI: tegra: Support MSI 64-bit addressing
        PCI: rockchip: Use local struct device pointer consistently
        PCI: rockchip: Check for clk_prepare_enable() errors during resume
        MAINTAINERS: Remove Wenrui Li as Rockchip PCIe driver maintainer
        PCI: rockchip: Configure RC's MPS setting
        PCI: rockchip: Reconfigure configuration space header type
        PCI: rockchip: Split out rockchip_pcie_cfg_configuration_accesses()
        PCI: rockchip: Move configuration accesses into rockchip_pcie_cfg_atu()
        ...
      f263fbb8
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md · 026d15f6
      Linus Torvalds authored
      Pull MD update from Shaohua Li:
      
       - fixed deadlock in MD suspend and a potential bug in bio allocation
         (Neil Brown)
      
       - fixed signal issue (Mikulas Patocka)
      
       - fixed typo in FailFast test (Guoqing Jiang)
      
       - other trival fixes
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md:
        MD: fix sleep in atomic
        MD: fix a null dereference
        md: use a separate bio_set for synchronous IO.
        md: change the initialization value for a spare device spot to MD_DISK_ROLE_SPARE
        md/raid1: remove unused bio in sync_request_write
        md/raid10: fix FailFast test for wrong device
        md: don't use flush_signals in userspace processes
        md: fix deadlock between mddev_suspend() and md_write_start()
      026d15f6
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 43d01209
      Linus Torvalds authored
      Pull input updates from Dmitry Torokhov:
      
       - a new driver for STM FingerTip touchscreen
      
       - a new driver for D-Link DIR-685 touch keys
      
       - updated list of supported devices in xpad driver
      
       - other assorted updates and fixes
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (23 commits)
        MAINTAINERS: update input subsystem patterns
        Input: introduce KEY_ASSISTANT
        Input: xpad - sync supported devices with XBCD
        Input: xpad - sync supported devices with 360Controller
        Input: xen-kbdfront - use string constants from PV protocol
        Input: stmfts - mark all PM functions as __maybe_unused
        Input: add support for the STMicroelectronics FingerTip touchscreen
        Input: add D-Link DIR-685 touchkeys driver
        Input: s3c2410_ts - handle return value of clk_prepare_enable
        Input: axp20x-pek - add wakeup support
        Input: synaptics-rmi4 - use %phN to form F34 configuration ID
        Input: synaptics-rmi4 - change a char type to u8
        Input: sparse-keymap - remove sparse_keymap_free()
        Input: tsc2007 - move header file out of I2C realm
        Input: mms114 - move header file out of I2C realm
        Input: mcs - move header file out of I2C realm
        Input: lm8323 - move header file out of I2C realm
        Input: elantech - force relative mode on a certain module
        Input: elan_i2c - add support for fetching chip type on newer hardware
        Input: elan_i2c - check if device is there before really probing
        ...
      43d01209
    • Linus Torvalds's avatar
      Merge tag 'dmaengine-4.13-rc1' of git://git.infradead.org/users/vkoul/slave-dma · 2ceedf97
      Linus Torvalds authored
      Pull dmaengine updates from Vinod Koul:
      
       - removal of AVR32 support in dw driver as AVR32 is gone
      
       - new driver for Broadcom stream buffer accelerator (SBA) RAID driver
      
       - add support for Faraday Technology FTDMAC020 in amba-pl08x driver
      
       - IOMMU support in pl330 driver
      
       - updates to bunch of drivers
      
      * tag 'dmaengine-4.13-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (36 commits)
        dmaengine: qcom_hidma: correct API violation for submit
        dmaengine: zynqmp_dma: Remove max len check in zynqmp_dma_prep_memcpy
        dmaengine: tegra-apb: Really fix runtime-pm usage
        dmaengine: fsl_raid: make of_device_ids const.
        dmaengine: qcom_hidma: allow ACPI/DT parameters to be overridden
        dmaengine: fsldma: set BWC, DAHTS and SAHTS values correctly
        dmaengine: Kconfig: Simplify the help text for MXS_DMA
        dmaengine: pl330: Delete unused functions
        dmaengine: Replace WARN_TAINT_ONCE() with pr_warn_once()
        dmaengine: Kconfig: Extend the dependency for MXS_DMA
        dmaengine: mxs: Use %zu for printing a size_t variable
        dmaengine: ste_dma40: Cleanup scatterlist layering violations
        dmaengine: imx-dma: cleanup scatterlist layering violations
        dmaengine: use proper name for the R-Car SoC
        dmaengine: imx-sdma: Fix compilation warning.
        dmaengine: imx-sdma: Handle return value of clk_prepare_enable
        dmaengine: pl330: Add IOMMU support to slave tranfers
        dmaengine: DW DMAC: Handle return value of clk_prepare_enable
        dmaengine: pl08x: use GENMASK() to create bitmasks
        dmaengine: pl08x: Add support for Faraday Technology FTDMAC020
        ...
      2ceedf97
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm · 09b56d5a
      Linus Torvalds authored
      Pull ARM updates from Russell King:
      
       - add support for ftrace-with-registers, which is needed for kgraft and
         other ftrace tools
      
       - support for mremap() for the sigpage/vDSO so that checkpoint/restore
         can work
      
       - add timestamps to each line of the register dump output
      
       - remove the unused KTHREAD_SIZE from nommu
      
       - align the ARM bitops APIs with the generic API (using unsigned long
         pointers rather than void pointers)
      
       - make the configuration of userspace Thumb support an expert option so
         that we can default it on, and avoid some hard to debug userspace
         crashes
      
      * 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
        ARM: 8684/1: NOMMU: Remove unused KTHREAD_SIZE definition
        ARM: 8683/1: ARM32: Support mremap() for sigpage/vDSO
        ARM: 8679/1: bitops: Align prototypes to generic API
        ARM: 8678/1: ftrace: Adds support for CONFIG_DYNAMIC_FTRACE_WITH_REGS
        ARM: make configuration of userspace Thumb support an expert option
        ARM: 8673/1: Fix __show_regs output timestamps
      09b56d5a
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next · fe1b5180
      Linus Torvalds authored
      Pull sparc updates from David Miller:
      
       1) Queued spinlocks and rwlocks for sparc64, from Babu Moger.
      
       2) Some const'ification from Arvind Yadav.
      
       3) LDC/VIO driver infrastructure changes to facilitate future upcoming
          drivers, from Jag Raman.
      
       4) Initialize sched_clock() et al. early so that the initial printk
          timestamps are all done while the implementation is available and
          functioning. From Pavel Tatashin.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next: (38 commits)
        sparc: kernel: pmc: make of_device_ids const.
        sparc64: fix typo in property
        sparc64: add port_id to VIO device metadata
        sparc64: Enhance search for VIO device in MDESC
        sparc64: enhance VIO device probing
        sparc64: check if a client is allowed to register for MDESC notifications
        sparc64: remove restriction on VIO device name size
        sparc64: refactor code to obtain cfg_handle property from MDESC
        sparc64: add MDESC node name property to VIO device metadata
        sparc64: mdesc: use __GFP_REPEAT action modifier for VM allocation
        sparc64: expand MDESC interface
        sparc64: skip handshake for LDC channels in RAW mode
        sparc64: specify the device class in VIO version info. packet
        sparc64: ensure VIO operations are defined while being used
        sparc: kernel: apc: make of_device_ids const
        sparc/time: make of_device_ids const
        sparc64: broken %tick frequency on spitfire cpus
        sparc64: use prom interface to get %stick frequency
        sparc64: optimize functions that access tick
        sparc64: add hot-patched and inlined get_tick()
        ...
      fe1b5180
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 8b6b3172
      Linus Torvalds authored
      Pull networking fixes from David Miller:
       "Mostly fixing some light fallout from the changes that went into the
        merge window.
      
         1) Fix memory leaks on network namespace teardown in netfilter, from
            Liping Zhang.
      
         2) When comparing ipv6 nexthops, we have to take the lightweight
            tunnel state into account as well. From David Ahern.
      
         3) Fix socket option object length check in the new TLS code, from
            Matthias Rosenfelder.
      
         4) Fix memory leak in nfp driver flower support, from Jakub Kicinski.
      
         5) Several netlink attribute validation fixes in cfg80211, from
            Srinivas Dasari.
      
         6) Fix context array leak in virtio_net, from Jason Wang.
      
         7) SKB use after free in hns driver, from Yusheng Lin.
      
         8) Fix socket leak on accept() in RDS, from Sowmini Varadhan. Also
            add a WARN_ON() to sock_graft() so other protocol stacks don't
            trip over this as well"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (26 commits)
        net: ethernet: mediatek: remove useless code in mtk_probe()
        mpls: fix uninitialized in_label var warning in mpls_getroute
        doc: SKB_GSO_[IPIP|SIT] have been replaced
        bonding: avoid NETDEV_CHANGEMTU event when unregistering slave
        net/sock: add WARN_ON(parent->sk) in sock_graft()
        rds: tcp: use sock_create_lite() to create the accept socket
        net: hns: Fix a skb used after free bug
        net: hns: Fix a wrong op phy C45 code
        net: macb: Adding Support for Jumbo Frames up to 10240 Bytes in SAMA5D3
        net: Update networking MAINTAINERS entry.
        virtio-net: fix leaking of ctx array
        cfg80211: Validate frequencies nested in NL80211_ATTR_SCAN_FREQUENCIES
        cfg80211: Define nla_policy for NL80211_ATTR_LOCAL_MESH_POWER_MODE
        cfg80211: Check if NAN service ID is of expected size
        cfg80211: Check if PMKID attribute is of expected size
        arcnet: com20020-pci: Fix an error handling path in 'com20020pci_probe()'
        nfp: flower: add missing clean up call to avoid memory leaks
        vrf: fix bug_on triggered by rx when destroying a vrf
        ptp: dte: Use LL suffix for 64-bit constants
        sctp: set the value of flowi6_oif to sk_bound_dev_if to make sctp_v6_get_dst to find the correct route entry.
        ...
      8b6b3172
    • Linus Torvalds's avatar
      Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · b8d4c1f9
      Linus Torvalds authored
      Pull misc filesystem updates from Al Viro:
       "Assorted normal VFS / filesystems stuff..."
      
      * 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        dentry name snapshots
        Make statfs properly return read-only state after emergency remount
        fs/dcache: init in_lookup_hashtable
        minix: Deinline get_block, save 2691 bytes
        fs: Reorder inode_owner_or_capable() to avoid needless
        fs: warn in case userspace lied about modprobe return
      b8d4c1f9
    • Linus Torvalds's avatar
      Merge branch 'for-spi' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 090a81d8
      Linus Torvalds authored
      Pull spi uaccess delousing from Al Viro:
       "Getting rid of pointless __get_user() and friends in drivers/spi.
      
        [ the only reason it's on a separate branch is that I hoped it would
          be picked by spi folks; looks like mail asking them to grab it got
          lost and I hadn't followed up on that ]"
      
      * 'for-spi' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        spidev: quit messing with access_ok()
      090a81d8
    • Linus Torvalds's avatar
      Merge branch 'work.__copy_in_user' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 46ace66b
      Linus Torvalds authored
      Pull __copy_in_user removal from Al Viro:
       "There used to be 6 places in the entire tree calling __copy_in_user(),
        all of them bogus.
      
        Four got killed off in work.drm branch, this takes care of the
        remaining ones and kills the definition of that sucker"
      
      * 'work.__copy_in_user' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        kill __copy_in_user()
        sanitize do_i2c_smbus_ioctl()
      46ace66b
    • Al Viro's avatar
      fix waitid(2) breakage · 634a8160
      Al Viro authored
      We lose the distinction between "found a PID" and "nothing, but that's not
      an error" a bit too early in waitid().  Easily fixed, fortunately...
      Reported-by: default avatarMarkus Trippelsdorf <markus@trippelsdorf.de>
      Fixes: 67d7ddde ("waitid(2): leave copyout of siginfo to syscall itself")
      Tested-by: default avatarMarkus Trippelsdorf <markus@trippelsdorf.de>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      634a8160
    • Gustavo A. R. Silva's avatar
      net: ethernet: mediatek: remove useless code in mtk_probe() · e8df7603
      Gustavo A. R. Silva authored
      Remove useless local variables _match_, _soc_ and the code related.
      
      Notice that
      
      const struct of_device_id of_mtk_match[] = {
              { .compatible = "mediatek,mt2701-eth" },
              {},
      };
      
      So match->data is NULL.
      Suggested-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: default avatarGustavo A. R. Silva <garsilva@embeddedor.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e8df7603
    • Roopa Prabhu's avatar
      mpls: fix uninitialized in_label var warning in mpls_getroute · a906c1aa
      Roopa Prabhu authored
      Fix the below warning generated by static checker:
          net/mpls/af_mpls.c:2111 mpls_getroute()
          error: uninitialized symbol 'in_label'."
      
      Fixes: 397fc9e5 ("mpls: route get support")
      Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: default avatarRoopa Prabhu <roopa@cumulusnetworks.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a906c1aa
    • Nicolas Dichtel's avatar
      doc: SKB_GSO_[IPIP|SIT] have been replaced · 11bafd54
      Nicolas Dichtel authored
      Those enum values don't exist anymore.
      
      Fixes: 7e13318d ("net: define gso types for IPx over IPv4 and IPv6")
      CC: Tom Herbert <tom@herbertland.com>
      Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      11bafd54
    • WANG Cong's avatar
      bonding: avoid NETDEV_CHANGEMTU event when unregistering slave · f51048c3
      WANG Cong authored
      As Hongjun/Nicolas summarized in their original patch:
      
      "
      When a device changes from one netns to another, it's first unregistered,
      then the netns reference is updated and the dev is registered in the new
      netns. Thus, when a slave moves to another netns, it is first
      unregistered. This triggers a NETDEV_UNREGISTER event which is caught by
      the bonding driver. The driver calls bond_release(), which calls
      dev_set_mtu() and thus triggers NETDEV_CHANGEMTU (the device is still in
      the old netns).
      "
      
      This is a very special case, because the device is being unregistered
      no one should still care about the NETDEV_CHANGEMTU event triggered
      at this point, we can avoid broadcasting this event on this path,
      and avoid touching inetdev_event()/addrconf_notify() path.
      
      It requires to export __dev_set_mtu() to bonding driver.
      Reported-by: default avatarHongjun Li <hongjun.li@6wind.com>
      Reported-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
      Cc: Jay Vosburgh <j.vosburgh@gmail.com>
      Cc: Veaceslav Falico <vfalico@gmail.com>
      Cc: Andy Gospodarek <andy@greyhouse.net>
      Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f51048c3
    • David S. Miller's avatar
      Merge branch 'rds-tcp-sock_graft-leak' · 5dc314f8
      David S. Miller authored
      Sowmini Varadhan says:
      
      ====================
      rds-tcp: sock_graft() leak
      
      Following up on the discussion at
        https://www.spinics.net/lists/netdev/msg442859.html
      - make rds_tcp_accept_one() call sock_create_lite()
      - add a WARN_ON() to sock_graft()
      
      Tested by running an infinite while() loop that does
      (module-load; rds-stress; module-unload) and monitors
      TCP slabinfo while the test is running.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      5dc314f8
    • Sowmini Varadhan's avatar
      net/sock: add WARN_ON(parent->sk) in sock_graft() · 0ffdaf5b
      Sowmini Varadhan authored
      sock_graft() unilaterally sets up parent->sk based on the
      assumption that the existing parent->sk is null. If this
      condition is not true, then the existing parent->sk would
      be leaked, so add a WARN_ON() to alert callers who may fall
      in this category.
      Signed-off-by: default avatarSowmini Varadhan <sowmini.varadhan@oracle.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0ffdaf5b
    • Sowmini Varadhan's avatar
      rds: tcp: use sock_create_lite() to create the accept socket · 0933a578
      Sowmini Varadhan authored
      There are two problems with calling sock_create_kern() from
      rds_tcp_accept_one()
      1. it sets up a new_sock->sk that is wasteful, because this ->sk
         is going to get replaced by inet_accept() in the subsequent ->accept()
      2. The new_sock->sk is a leaked reference in sock_graft() which
         expects to find a null parent->sk
      
      Avoid these problems by calling sock_create_lite().
      Signed-off-by: default avatarSowmini Varadhan <sowmini.varadhan@oracle.com>
      Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@oracle.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0933a578
    • David S. Miller's avatar
      Merge branch 'hns-fixes' · 9dc351da
      David S. Miller authored
      Lin Yun Sheng says:
      
      ====================
      Bugfixs for hns ethernet driver
      
      This patchset fix skb used after free and C45 op code issues
      in hns driver.
      
      Patch V2:
      	1. Remove ndev->feature checking in TX description patch.
      	2. Add Fixes: Tag in patch description.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9dc351da