1. 15 Dec, 2017 35 commits
  2. 14 Dec, 2017 5 commits
    • Linus Torvalds's avatar
      Merge tag '4.15-rc-smb3' of git://git.samba.org/sfrench/cifs-2.6 · d455df0b
      Linus Torvalds authored
      Pull cifs fixes from Steve French:
       "Small SMB3 fixes for stable and 4.15rc"
      
      * tag '4.15-rc-smb3' of git://git.samba.org/sfrench/cifs-2.6:
        CIFS: don't log STATUS_NOT_FOUND errors for DFS
        cifs: fix NULL deref in SMB2_read
      d455df0b
    • Linus Torvalds's avatar
      Merge tag 'drm-misc-fixes-2017-12-14' of git://anongit.freedesktop.org/drm/drm-misc · e375922f
      Linus Torvalds authored
      Pull drm fixes from Daniel Vetter:
      
       - two fixes for new core features
      
       - a corner case fix for the connnector_iter fix from last week (this
         one is cc: stable)
      
       - one vc4 fix
      
      * tag 'drm-misc-fixes-2017-12-14' of git://anongit.freedesktop.org/drm/drm-misc:
        drm/drm_lease: Prevent deadlock in case drm_lease_create() fails
        drm: rework delayed connector cleanup in connector_iter
        drm: Update edid-derived drm_display_info fields at edid property set [v2]
        drm/vc4: Release fence after signalling
      e375922f
    • Marius Vlad's avatar
      drm/drm_lease: Prevent deadlock in case drm_lease_create() fails · bd36d3ba
      Marius Vlad authored
      This case can been seen when creating the lease with the same objects passed.
      
      [  605.515097] 2 locks held by testapp/3337:
      [  605.519027]  #0:  (&dev->mode_config.idr_mutex){......}, at: [<ffff0000085f1664>] drm_mode_create_lease_ioctl+0x384/0x858
      [  605.530045]  #1:  (&dev->mode_config.idr_mutex){......}, at: [<ffff0000085f11bc>] drm_lease_destroy+0x2c/0x110
      
      Which was causing the process to hang:
      
      [  605.398827] [<ffff0000080856cc>] __switch_to+0x94/0xa8
      [  605.404030] [<ffff000008c05d00>] __schedule+0x1b0/0x698
      [  605.409322] [<ffff000008c06224>] schedule+0x3c/0xa8
      [  605.414260] [<ffff000008c06628>] schedule_preempt_disabled+0x20/0x38
      [  605.420677] [<ffff000008c07370>] mutex_lock_nested+0x158/0x340
      [  605.426572] [<ffff0000085f11bc>] drm_lease_destroy+0x2c/0x110
      [  605.432389] [<ffff0000085cecf0>] drm_master_put+0xc0/0xc8
      [  605.437845] [<ffff0000085f175c>] drm_mode_create_lease_ioctl+0x47c/0x858
      [  605.444612] [<ffff0000085d4460>] drm_ioctl+0x198/0x448
      [  605.449811] [<ffff000008201134>] do_vfs_ioctl+0xa4/0x748
      [  605.455192] [<ffff000008201864>] SyS_ioctl+0x8c/0xa0
      [  605.460216] [<ffff000008082f4c>] __sys_trace_return+0x0/0x4
      
      drm_mode_create_lease_ioctl() calls drm_lease_create() which acquires a lock
      on dev->mode_config.idr_mutex. In case of failure, drm_lease_create() calls
      drm_master_put() which in turn tries to acquire the same lock when calling
      drm_lease_destroy().
      
      v2: - Reverse the order at exit in case of fail, so that unlocking takes place
      before dropping the reference.
          - Include detail information about deadlock (Daniel Vetter)
      Signed-off-by: default avatarMarius Vlad <marius-cristian.vlad@nxp.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Link: https://patchwork.freedesktop.org/patch/msgid/20171213181048.32719-1-marius-cristian.vlad@nxp.com
      bd36d3ba
    • Linus Torvalds's avatar
      Merge tag 'xfs-4.15-fixes-5' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux · 7c5cac1b
      Linus Torvalds authored
      Pull xfs fixes from Darrick Wong:
       "Here are a few more bug fixes & cleanups for 4.15-rc4:
      
         - clean up duplicate includes
      
         - remove ancient 'no-alloc' crap code that occasionally caused hard
           fs shutdowns due to lack of proper space reservations
      
         - fix regression in FIEMAP behavior when reporting xattr extents"
      
      * tag 'xfs-4.15-fixes-5' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
        xfs: make iomap_begin functions trim iomaps consistently
        xfs: remove "no-allocation" reservations for file creations
        fs: xfs: remove duplicate includes
      7c5cac1b
    • Linus Torvalds's avatar
      Merge tag 'riscv-for-linus-4.15-rc4-riscv_fixes' of... · 4e746cf4
      Linus Torvalds authored
      Merge tag 'riscv-for-linus-4.15-rc4-riscv_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/linux
      
      Pull RISC-V fixes from Palmer Dabbelt:
       "This contains three small fixes:
      
         - A fix to a typo in sys_riscv_flush_icache. This only effects error
           handling, but I think it's a small and obvious enough change that
           it's sane outside the merge window.
      
         - The addition of smp_mb__after_spinlock(), which was recently
           removed due to an incorrect comment. This is largly a comment
           change (as there's a big one now), and while it's necessary for
           complience with the RISC-V memory model the lack of this fence
           shouldn't manifest as a bug on current implementations.
           Nonetheless, it still seems saner to have the fence in 4.15.
      
         - The removal of some of the HVC_RISCV_SBI driver that snuck into the
           arch port. This is compile-time dead code in 4.15 (as the driver
           isn't in yet), and during the review process we found a better way
           to implement early printk on RISC-V. While this change doesn't do
           anything, it will make staging our HVC driver easier: without this
           change the HVC driver we hope to upstream won't build on 4.15
           (because the 4.15 arch code would reference a function that no
           longer exists).
      
        I don't think this is the last patch set we'll want for 4.15: I think
        I'll want to remove some of the first-level irqchip driver that snuck
        in as well, which will look a lot like the HVC patch here. This is
        pending some asm-generic cleanup I'm doing that I haven't quite gotten
        clean enough to send out yet, though, but hopefully it'll be ready by
        next week (and still OK for that late)"
      
       * tag 'riscv-for-linus-4.15-rc4-riscv_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/linux:
        RISC-V: Remove unused CONFIG_HVC_RISCV_SBI code
        RISC-V: Resurrect smp_mb__after_spinlock()
        RISC-V: Logical vs Bitwise typo
      4e746cf4