1. 01 Aug, 2020 2 commits
  2. 31 Jul, 2020 6 commits
    • Ingo Molnar's avatar
      Merge branch 'linus' into locking/core, to resolve conflict · 28cff52e
      Ingo Molnar authored
      Conflicts:
      	arch/arm/include/asm/percpu.h
      
      As Stephen Rothwell noted, there's a conflict between this commit
      in locking/core:
      
        a21ee605 ("lockdep: Change hardirq{s_enabled,_context} to per-cpu variables")
      
      and this fresh upstream commit:
      
        aa54ea90 ("ARM: percpu.h: fix build error")
      
      a21ee605 is a simpler solution to the dependency problem and doesn't
      further increase header hell - so this conflict resolution effectively
      reverts aa54ea90 and uses the a21ee605 solution.
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      28cff52e
    • Marco Elver's avatar
      kcsan: Improve IRQ state trace reporting · 92c209ac
      Marco Elver authored
      To improve the general usefulness of the IRQ state trace events with
      KCSAN enabled, save and restore the trace information when entering and
      exiting the KCSAN runtime as well as when generating a KCSAN report.
      
      Without this, reporting the IRQ trace events (whether via a KCSAN report
      or outside of KCSAN via a lockdep report) is rather useless due to
      continuously being touched by KCSAN. This is because if KCSAN is
      enabled, every instrumented memory access causes changes to IRQ trace
      events (either by KCSAN disabling/enabling interrupts or taking
      report_lock when generating a report).
      
      Before "lockdep: Prepare for NMI IRQ state tracking", KCSAN avoided
      touching the IRQ trace events via raw_local_irq_save/restore() and
      lockdep_off/on().
      
      Fixes: 248591f5 ("kcsan: Make KCSAN compatible with new IRQ state tracking")
      Signed-off-by: default avatarMarco Elver <elver@google.com>
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      Link: https://lore.kernel.org/r/20200729110916.3920464-2-elver@google.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
      92c209ac
    • Marco Elver's avatar
      lockdep: Refactor IRQ trace events fields into struct · 0584df9c
      Marco Elver authored
      Refactor the IRQ trace events fields, used for printing information
      about the IRQ trace events, into a separate struct 'irqtrace_events'.
      
      This improves readability by separating the information only used in
      reporting, as well as enables (simplified) storing/restoring of
      irqtrace_events snapshots.
      
      No functional change intended.
      Signed-off-by: default avatarMarco Elver <elver@google.com>
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      Link: https://lore.kernel.org/r/20200729110916.3920464-1-elver@google.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
      0584df9c
    • Linus Torvalds's avatar
      Merge tag 'drm-fixes-2020-07-31' of git://anongit.freedesktop.org/drm/drm · d8b9faec
      Linus Torvalds authored
      Pull more drm fixes from Dave Airlie:
       "As mentioned previously this contains the nouveau regression fix.
      
        amdgpu had three fixes outstanding as well, one revert, an info leak
        and use after free. The use after free is a bit trickier than I'd
        like, and I've personally gone over it to confirm I'm happy that it is
        doing what it says.
      
        nouveau:
         - final modifiers regression fix
      
        amdgpu:
         - Revert a fix which caused other regressions
         - Fix potential kernel info leak
         - Fix a use-after-free bug that was uncovered by another change in 5.7"
      
      * tag 'drm-fixes-2020-07-31' of git://anongit.freedesktop.org/drm/drm:
        drm/nouveau: Accept 'legacy' format modifiers
        Revert "drm/amdgpu: Fix NULL dereference in dpm sysfs handlers"
        drm/amd/display: Clear dm_state for fast updates
        drm/amdgpu: Prevent kernel-infoleak in amdgpu_info_ioctl()
      d8b9faec
    • Dave Airlie's avatar
      Merge tag 'amd-drm-fixes-5.8-2020-07-30' of... · 887c909d
      Dave Airlie authored
      Merge tag 'amd-drm-fixes-5.8-2020-07-30' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
      
      amd-drm-fixes-5.8-2020-07-30:
      
      amdgpu:
      - Revert a fix which caused other regressions
      - Fix potential kernel info leak
      - Fix a use-after-free bug that was uncovered by another change in 5.7
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      From: Alex Deucher <alexdeucher@gmail.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20200730154338.244104-1-alexander.deucher@amd.com
      887c909d
    • James Jones's avatar
      drm/nouveau: Accept 'legacy' format modifiers · faa0fcf9
      James Jones authored
      Accept the DRM_FORMAT_MOD_NVIDIA_16BX2_BLOCK()
      family of modifiers to handle broken userspace
      Xorg modesetting and Mesa drivers. Existing Mesa
      drivers are still aware of only these older
      format modifiers which do not differentiate
      between different variations of the block linear
      layout. When the format modifier support flag was
      flipped in the nouveau kernel driver, the X.org
      modesetting driver began attempting to use its
      format modifier-enabled framebuffer path. Because
      the set of format modifiers advertised by the
      kernel prior to this change do not intersect with
      the set of format modifiers advertised by Mesa,
      allocating GBM buffers using format modifiers
      fails and the modesetting driver falls back to
      non-modifier allocation. However, it still later
      queries the modifier of the GBM buffer when
      creating its DRM-KMS framebuffer object, receives
      the old-format modifier from Mesa, and attempts
      to create a framebuffer with it. Since the kernel
      is still not aware of these formats, this fails.
      
      Userspace should not be attempting to query format
      modifiers of GBM buffers allocated with a non-
      format-modifier-aware allocation path, but to
      avoid breaking existing userspace behavior, this
      change accepts the old-style format modifiers when
      creating framebuffers and applying them to planes
      by translating them to the equivalent new-style
      modifier. To accomplish this, some layout
      parameters must be assumed to match properties of
      the device targeted by the relevant ioctls. To
      avoid perpetuating misuse of the old-style
      modifiers, this change does not advertise support
      for them. Doing so would imply compatibility
      between devices with incompatible memory layouts.
      
      Tested with Xorg 1.20 modesetting driver,
      weston@c46c70dac84a4b3030cd05b380f9f410536690fc,
      gnome & KDE wayland desktops from Ubuntu 18.04,
      and sway 1.5
      Reported-by: default avatarKirill A. Shutemov <kirill@shutemov.name>
      Fixes: fa4f4c21 ("drm/nouveau/kms: Support NVIDIA format modifiers")
      Link: https://lkml.org/lkml/2020/6/30/1251Signed-off-by: default avatarJames Jones <jajones@nvidia.com>
      Acked-by: default avatarBen Skeggs <bskeggs@redhat.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      faa0fcf9
  3. 30 Jul, 2020 12 commits
  4. 29 Jul, 2020 20 commits