Skip to content
  1. Sep 10, 2023
  2. Jul 17, 2023
  3. Jul 15, 2023
    • Linus Torvalds's avatar
      Merge tag 'spi-fix-v6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · 831fe284
      Linus Torvalds authored
      Pull spi fixes from Mark Brown:
       "A couple of fairly minor driver specific fixes here, plus a bunch of
        maintainership and admin updates. Nothing too remarkable"
      
      * tag 'spi-fix-v6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
        mailmap: add entry for Jonas Gorski
        MAINTAINERS: add myself for spi-bcm63xx
        spi: s3c64xx: clear loopback bit after loopback test
        spi: bcm63xx: fix max prepend length
        MAINTAINERS: Add myself as a maintainer for Microchip SPI
      831fe284
    • Linus Torvalds's avatar
      Merge tag 'regmap-fix-v6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap · 393ea781
      Linus Torvalds authored
      Pull regmap fix from Mark Brown:
       "One fix for an out of bounds access in the interupt code here"
      
      * tag 'regmap-fix-v6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
        regmap-irq: Fix out-of-bounds access when allocating config buffers
      393ea781
    • Linus Torvalds's avatar
      Merge tag 'iommu-fixes-v6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 82678ab2
      Linus Torvalds authored
      Pull iommu fixes from Joerg Roedel:
      
       - Fix a regression causing a crash on sysfs access of iommu-group
         specific files
      
       - Fix signedness bug in SVA code
      
      * tag 'iommu-fixes-v6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
        iommu/sva: Fix signedness bug in iommu_sva_alloc_pasid()
        iommu: Fix crash during syfs iommu_groups/N/type
      82678ab2
    • Linus Torvalds's avatar
      Merge tag 'x86_urgent_for_6.5_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · b6e6cc1f
      Linus Torvalds authored
      Pull x86 CFI fixes from Peter Zijlstra:
       "Fix kCFI/FineIBT weaknesses
      
        The primary bug Alyssa noticed was that with FineIBT enabled function
        prologues have a spurious ENDBR instruction:
      
          __cfi_foo:
      	endbr64
      	subl	$hash, %r10d
      	jz	1f
      	ud2
      	nop
          1:
          foo:
      	endbr64 <--- *sadface*
      
        This means that any indirect call that fails to target the __cfi
        symbol and instead targets (the regular old) foo+0, will succeed due
        to that second ENDBR.
      
        Fixing this led to the discovery of a single indirect call that was
        still doing this: ret_from_fork(). Since that's an assembly stub the
        compiler would not generate the proper kCFI indirect call magic and it
        would not get patched.
      
        Brian came up with the most comprehensive fix -- convert the thing to
        C with only a very thin asm wrapper. This ensures the kernel thread
        boostrap is a proper kCFI call.
      
        While discussing all this, Kees noted that kCFI hashes could/should be
        poisoned to seal all functions whose address is never taken, further
        limiting the valid kCFI targets -- much like we already do for IBT.
      
        So what was a 'simple' observation and fix cascaded into a bunch of
        inter-related CFI infrastructure fixes"
      
      * tag 'x86_urgent_for_6.5_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/cfi: Only define poison_cfi() if CONFIG_X86_KERNEL_IBT=y
        x86/fineibt: Poison ENDBR at +0
        x86: Rewrite ret_from_fork() in C
        x86/32: Remove schedule_tail_wrapper()
        x86/cfi: Extend ENDBR sealing to kCFI
        x86/alternative: Rename apply_ibt_endbr()
        x86/cfi: Extend {JMP,CAKK}_NOSPEC comment
      b6e6cc1f
    • Linus Torvalds's avatar
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · be522ac7
      Linus Torvalds authored
      Pull SCSI fixes from James Bottomley:
       "This is a bunch of small driver fixes and a larger rework of zone disk
        handling (which reaches into blk and nvme).
      
        The aacraid array-bounds fix is now critical since the security people
        turned on -Werror for some build tests, which now fail without it"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        scsi: storvsc: Handle SRB status value 0x30
        scsi: block: Improve checks in blk_revalidate_disk_zones()
        scsi: block: virtio_blk: Set zone limits before revalidating zones
        scsi: block: nullblk: Set zone limits before revalidating zones
        scsi: nvme: zns: Set zone limits before revalidating zones
        scsi: sd_zbc: Set zone limits before revalidating zones
        scsi: ufs: core: Add support for qTimestamp attribute
        scsi: aacraid: Avoid -Warray-bounds warning
        scsi: ufs: ufs-mediatek: Add dependency for RESET_CONTROLLER
        scsi: ufs: core: Update contact email for monitor sysfs nodes
        scsi: scsi_debug: Remove dead code
        scsi: qla2xxx: Use vmalloc_array() and vcalloc()
        scsi: fnic: Use vmalloc_array() and vcalloc()
        scsi: qla2xxx: Fix error code in qla2x00_start_sp()
        scsi: qla2xxx: Silence a static checker warning
        scsi: lpfc: Fix a possible data race in lpfc_unregister_fcf_rescan()
      be522ac7
    • Linus Torvalds's avatar
      Merge tag 'block-6.5-2023-07-14' of git://git.kernel.dk/linux · b3bd86a0
      Linus Torvalds authored
      Pull block fixes from Jens Axboe:
      
       - NVMe pull request via Keith:
            - Don't require quirk to use duplicate namespace identifiers
              (Christoph, Sagi)
            - One more BOGUS_NID quirk (Pankaj)
            - IO timeout and error hanlding fixes for PCI (Keith)
            - Enhanced metadata format mask fix (Ankit)
            - Association race condition fix for fibre channel (Michael)
            - Correct debugfs error checks (Minjie)
            - Use PAGE_SECTORS_SHIFT where needed (Damien)
            - Reduce kernel logs for legacy nguid attribute (Keith)
            - Use correct dma direction when unmapping metadata (Ming)
      
       - Fix for a flush handling regression in this release (Christoph)
      
       - Fix for batched request time stamping (Chengming)
      
       - Fix for a regression in the mq-deadline position calculation (Bart)
      
       - Lockdep fix for blk-crypto (Eric)
      
       - Fix for a regression in the Amiga partition handling changes
         (Michael)
      
      * tag 'block-6.5-2023-07-14' of git://git.kernel.dk/linux:
        block: queue data commands from the flush state machine at the head
        blk-mq: fix start_time_ns and alloc_time_ns for pre-allocated rq
        nvme-pci: fix DMA direction of unmapping integrity data
        nvme: don't reject probe due to duplicate IDs for single-ported PCIe devices
        block/mq-deadline: Fix a bug in deadline_from_pos()
        nvme: ensure disabling pairs with unquiesce
        nvme-fc: fix race between error recovery and creating association
        nvme-fc: return non-zero status code when fails to create association
        nvme: fix parameter check in nvme_fault_inject_init()
        nvme: warn only once for legacy uuid attribute
        block: remove dead struc request->completion_data field
        nvme: fix the NVME_ID_NS_NVM_STS_MASK definition
        nvmet: use PAGE_SECTORS_SHIFT
        nvme: add BOGUS_NID quirk for Samsung SM953
        blk-crypto: use dynamic lock class for blk_crypto_profile::lock
        block/partition: fix signedness issue for Amiga partitions
      b3bd86a0
    • Linus Torvalds's avatar
      Merge tag 'io_uring-6.5-2023-07-14' of git://git.kernel.dk/linux · ec17f164
      Linus Torvalds authored
      Pull io_uring fix from Jens Axboe:
       "Just a single tweak for the wait logic in io_uring"
      
      * tag 'io_uring-6.5-2023-07-14' of git://git.kernel.dk/linux:
        io_uring: Use io_schedule* in cqring wait
      ec17f164
    • Linus Torvalds's avatar
      Merge tag 'riscv-for-linus-6.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux · 2772d7df
      Linus Torvalds authored
      Pull RISC-V fixes from Palmer Dabbelt:
      
       - fix a formatting error in the hwprobe documentation
      
       - fix a spurious warning in the RISC-V PMU driver
      
       - fix memory detection on rv32 (problem does not manifest on any known
         system)
      
       - avoid parsing legacy parsing of I in ACPI ISA strings
      
      * tag 'riscv-for-linus-6.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
        RISC-V: Don't include Zicsr or Zifencei in I from ACPI
        riscv: mm: fix truncation warning on RV32
        perf: RISC-V: Remove PERF_HES_STOPPED flag checking in riscv_pmu_start()
        Documentation: RISC-V: hwprobe: Fix a formatting error
      2772d7df
    • Linus Torvalds's avatar
      Merge tag 'pm-6.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · bde7f150
      Linus Torvalds authored
      Pull power management fixes from Rafael Wysocki:
       "These fix hibernation (after recent changes), frequency QoS and the
        sparc cpufreq driver.
      
        Specifics:
      
         - Unbreak the /sys/power/resume interface after recent changes (Azat
           Khuzhin).
      
         - Allow PM_QOS_DEFAULT_VALUE to be used with frequency QoS (Chungkai
           Yang).
      
         - Remove __init from cpufreq callbacks in the sparc driver, because
           they may be called after initialization too (Viresh Kumar)"
      
      * tag 'pm-6.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        cpufreq: sparc: Don't mark cpufreq callbacks with __init
        PM: QoS: Restore support for default value on frequency QoS
        PM: hibernate: Fix writing maj:min to /sys/power/resume
      bde7f150
    • Rafael J. Wysocki's avatar
      Merge branches 'pm-sleep' and 'pm-qos' · d121758d
      Rafael J. Wysocki authored
      Merge a PM QoS fix and a hibernation fix for 6.5-rc2.
      
       - Unbreak the /sys/power/resume interface after recent changes (Azat
         Khuzhin).
      
       - Allow PM_QOS_DEFAULT_VALUE to be used with frequency QoS (Chungkai
         Yang).
      
      * pm-sleep:
        PM: hibernate: Fix writing maj:min to /sys/power/resume
      
      * pm-qos:
        PM: QoS: Restore support for default value on frequency QoS
      d121758d
    • Shyam Prasad N's avatar
      cifs: fix mid leak during reconnection after timeout threshold · 69cba9d3
      Shyam Prasad N authored
      When the number of responses with status of STATUS_IO_TIMEOUT
      exceeds a specified threshold (NUM_STATUS_IO_TIMEOUT), we reconnect
      the connection. But we do not return the mid, or the credits
      returned for the mid, or reduce the number of in-flight requests.
      
      This bug could result in the server->in_flight count to go bad,
      and also cause a leak in the mids.
      
      This change moves the check to a few lines below where the
      response is decrypted, even of the response is read from the
      transform header. This way, the code for returning the mids
      can be reused.
      
      Also, the cifs_reconnect was reconnecting just the transport
      connection before. In case of multi-channel, this may not be
      what we want to do after several timeouts. Changed that to
      reconnect the session and the tree too.
      
      Also renamed NUM_STATUS_IO_TIMEOUT to a more appropriate name
      MAX_STATUS_IO_TIMEOUT.
      
      Fixes: 8e670f77
      
       ("Handle STATUS_IO_TIMEOUT gracefully")
      Signed-off-by: default avatarShyam Prasad N <sprasad@microsoft.com>
      Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
      69cba9d3
    • Shyam Prasad N's avatar
      cifs: is_network_name_deleted should return a bool · c071b34f
      Shyam Prasad N authored
      
      
      Currently, is_network_name_deleted and it's implementations
      do not return anything if the network name did get deleted.
      So the function doesn't fully achieve what it advertizes.
      
      Changed the function to return a bool instead. It will now
      return true if the error returned is STATUS_NETWORK_NAME_DELETED
      and the share (tree id) was found to be connected. It returns
      false otherwise.
      
      Signed-off-by: default avatarShyam Prasad N <sprasad@microsoft.com>
      Acked-by: default avatarPaulo Alcantara (SUSE) <pc@manguebit.com>
      Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
      c071b34f
    • Linus Torvalds's avatar
      Merge tag 'drm-fixes-2023-07-14-1' of git://anongit.freedesktop.org/drm/drm · 3a97a299
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "There were a bunch of fixes lined up for 2 weeks, so we have quite a
        few scattered fixes, mostly amdgpu and i915, but ttm has a bunch and
        nouveau makes an appearance.
      
        So a bit busier than usual for rc2, but nothing seems out of the
        ordinary.
      
        fbdev:
         - dma: Fix documented default preferred_bpp value
      
        ttm:
         - fix warning that we shouldn't mix && and ||
         - never consider pinned BOs for eviction&swap
         - Don't leak a resource on eviction error
         - Don't leak a resource on swapout move error
         - fix bulk_move corruption when adding a entry
      
        client:
         - Send hotplug event after registering a client
      
        dma-buf:
         - keep the signaling time of merged fences v3
         - fix an error pointer vs NULL bug
      
        sched:
         - wait for all deps in kill jobs
         - call set fence parent from scheduled
      
        i915:
         - Don't preserve dpll_hw_state for slave crtc in Bigjoiner
         - Consider OA buffer boundary when zeroing out reports
         - Remove dead code from gen8_pte_encode
         - Fix one wrong caching mode enum usage
      
        amdgpu:
         - SMU i2c locking fix
         - Fix a possible deadlock in process restoration for ROCm apps
         - Disable PCIe lane/speed switching on Intel platforms (the platforms
           don't support it)
      
        nouveau:
         - disp: fix HDMI on gt215+
         - disp/g94: enable HDMI
         - acr: Abort loading ACR if no firmware was found
         - bring back blit subchannel for pre nv50 GPUs
         - Fix drm_dp_remove_payload() invocation
      
        ivpu:
         - Fix VPU register access in irq disable
         - Clear specific interrupt status bits on C0
      
        bridge:
         - dw_hdmi: fix connector access for scdc
         - ti-sn65dsi86: Fix auxiliary bus lifetime
      
        panel:
         - simple: Add connector_type for innolux_at043tn24
         - simple: Add Powertip PH800480T013 drm_display_mode flags"
      
      * tag 'drm-fixes-2023-07-14-1' of git://anongit.freedesktop.org/drm/drm: (32 commits)
        drm/nouveau: bring back blit subchannel for pre nv50 GPUs
        drm/nouveau/acr: Abort loading ACR if no firmware was found
        drm/amd: Align SMU11 SMU_MSG_OverridePcieParameters implementation with SMU13
        drm/amd: Move helper for dynamic speed switch check out of smu13
        drm/amd/pm: conditionally disable pcie lane/speed switching for SMU13
        drm/amd/pm: share the code around SMU13 pcie parameters update
        drm/amdgpu: avoid restore process run into dead loop.
        drm/amd/pm: fix smu i2c data read risk
        drm/nouveau/disp/g94: enable HDMI
        drm/nouveau/disp: fix HDMI on gt215+
        drm/client: Send hotplug event after registering a client
        drm/i915: Fix one wrong caching mode enum usage
        drm/i915: Remove dead code from gen8_pte_encode
        drm/i915/perf: Consider OA buffer boundary when zeroing out reports
        drm/i915: Don't preserve dpll_hw_state for slave crtc in Bigjoiner
        drm/ttm: never consider pinned BOs for eviction&swap
        drm/fbdev-dma: Fix documented default preferred_bpp value
        dma-buf: fix an error pointer vs NULL bug
        accel/ivpu: Clear specific interrupt status bits on C0
        accel/ivpu: Fix VPU register access in irq disable
        ...
      3a97a299
    • Linus Torvalds's avatar
      Merge tag 'ceph-for-6.5-rc2' of https://github.com/ceph/ceph-client · ddbd9161
      Linus Torvalds authored
      Pull ceph fix from Ilya Dryomov:
       "A fix to prevent a potential buffer overrun in the messenger, marked
        for stable"
      
      * tag 'ceph-for-6.5-rc2' of https://github.com/ceph/ceph-client:
        libceph: harden msgr2.1 frame segment length checks
      ddbd9161
  4. Jul 14, 2023
    • Christoph Hellwig's avatar
      block: queue data commands from the flush state machine at the head · 9f87fc4d
      Christoph Hellwig authored
      We used to insert the data commands following a pre-flush to the head
      of the queue until commit 1e82fadf ("blk-mq: do not do head insertions
      post-pre-flush commands").  Not doing this seems to cause hangs of
      such commands on NFS workloads when exported from file systems with
      SATA SSDs.  I have no idea why this would starve these workloads,
      but doing a semantic revert of this patch (which looks quite different
      due to various other changes) fixes the hangs.
      
      Fixes: 1e82fadf
      
       ("blk-mq: do not do head insertions post-pre-flush commands")
      Reported-by: default avatarChuck Lever <chuck.lever@oracle.com>
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Tested-by: default avatarChuck Lever <chuck.lever@oracle.com>
      Link: https://lore.kernel.org/r/20230714143014.11879-1-hch@lst.de
      
      
      Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
      9f87fc4d
    • Dan Carpenter's avatar
      iommu/sva: Fix signedness bug in iommu_sva_alloc_pasid() · c20ecf7b
      Dan Carpenter authored
      The ida_alloc_range() function returns negative error codes on error.
      On success it returns values in the min to max range (inclusive).  It
      never returns more then INT_MAX even if "max" is higher.  It never
      returns values in the 0 to (min - 1) range.
      
      The bug is that "min" is an unsigned int so negative error codes will
      be promoted to high positive values errors treated as success.
      
      Fixes: 1a14bf0f
      
       ("iommu/sva: Use GFP_KERNEL for pasid allocation")
      Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
      Reviewed-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
      Link: https://lore.kernel.org/r/6b32095d-7491-4ebb-a850-12e96209eaaf@kili.mountain
      
      
      Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
      c20ecf7b
    • Jason Gunthorpe's avatar
      iommu: Fix crash during syfs iommu_groups/N/type · 911476ef
      Jason Gunthorpe authored
      The err_restore_domain flow was accidently inserted into the success path
      in commit 1000dccd ("iommu: Allow IOMMU_RESV_DIRECT to work on
      ARM"). It should only happen if iommu_create_device_direct_mappings()
      fails. This caused the domains the be wrongly changed and freed whenever
      the sysfs is used, resulting in an oops:
      
        BUG: kernel NULL pointer dereference, address: 0000000000000000
        #PF: supervisor read access in kernel mode
        #PF: error_code(0x0000) - not-present page
        PGD 0 P4D 0
        Oops: 0000 [#1] PREEMPT SMP NOPTI
        CPU: 1 PID: 3417 Comm: avocado Not tainted 6.4.0-rc4-next-20230602 #3
        Hardware name: Dell Inc. PowerEdge R6515/07PXPY, BIOS 2.3.6 07/06/2021
        RIP: 0010:__iommu_attach_device+0xc/0xa0
        Code: c0 c3 cc cc cc cc 48 89 f0 c3 cc cc cc cc 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 0f 1f 44 00 00 41 54 55 48 8b 47 08 <48> 8b 00 48 85 c0 74 74 48 89 f5 e8 64 12 49 00 41 89 c4 85 c0 74
        RSP: 0018:ffffabae0220bd48 EFLAGS: 00010246
        RAX: 0000000000000000 RBX: ffff9ac04f70e410 RCX: 0000000000000001
        RDX: ffff9ac044db20c0 RSI: ffff9ac044fa50d0 RDI: ffff9ac04f70e410
        RBP: ffff9ac044fa50d0 R08: 1000000100209001 R09: 00000000000002dc
        R10: 0000000000000000 R11: 0000000000000000 R12: ffff9ac043d54700
        R13: ffff9ac043d54700 R14: 0000000000000001 R15: 0000000000000001
        FS:  00007f02e30ae000(0000) GS:ffff9afeb2440000(0000) knlGS:0000000000000000
        CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
        CR2: 0000000000000000 CR3: 000000012afca006 CR4: 0000000000770ee0
        PKRU: 55555554
        Call Trace:
         <TASK>
         ? __die+0x24/0x70
         ? page_fault_oops+0x82/0x150
         ? __iommu_queue_command_sync+0x80/0xc0
         ? exc_page_fault+0x69/0x150
         ? asm_exc_page_fault+0x26/0x30
         ? __iommu_attach_device+0xc/0xa0
         ? __iommu_attach_device+0x1c/0xa0
         __iommu_device_set_domain+0x42/0x80
         __iommu_group_set_domain_internal+0x5d/0x160
         iommu_setup_default_domain+0x318/0x400
         iommu_group_store_type+0xb1/0x200
         kernfs_fop_write_iter+0x12f/0x1c0
         vfs_write+0x2a2/0x3b0
         ksys_write+0x63/0xe0
         do_syscall_64+0x3f/0x90
         entry_SYSCALL_64_after_hwframe+0x6e/0xd8
        RIP: 0033:0x7f02e2f14a6f
      
      Reorganize the error flow so that the success branch and error branches
      are clearer.
      
      Fixes: 1000dccd
      
       ("iommu: Allow IOMMU_RESV_DIRECT to work on ARM")
      Reported-by: default avatarDheeraj Kumar Srivastava <dheerajkumar.srivastava@amd.com>
      Tested-by: default avatarVasant Hegde <vasant.hegde@amd.com>
      Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
      Reviewed-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
      Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
      Link: https://lore.kernel.org/r/0-v1-5bd8cc969d9e+1f1-iommu_set_def_fix_jgg@nvidia.com
      
      
      Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
      911476ef
    • Masami Hiramatsu (Google)'s avatar
      tracing/probes: Fix to record 0-length data_loc in fetch_store_string*() if fails · 797311bc
      Masami Hiramatsu (Google) authored
      Fix to record 0-length data to data_loc in fetch_store_string*() if it fails
      to get the string data.
      Currently those expect that the data_loc is updated by store_trace_args() if
      it returns the error code. However, that does not work correctly if the
      argument is an array of strings. In that case, store_trace_args() only clears
      the first entry of the array (which may have no error) and leaves other
      entries. So it should be cleared by fetch_store_string*() itself.
      Also, 'dyndata' and 'maxlen' in store_trace_args() should be updated
      only if it is used (ret > 0 and argument is a dynamic data.)
      
      Link: https://lore.kernel.org/all/168908496683.123124.4761206188794205601.stgit@devnote2/
      
      Fixes: 40b53b77
      
       ("tracing: probeevent: Add array type support")
      Cc: stable@vger.kernel.org
      Reviewed-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
      Signed-off-by: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
      797311bc
    • Dave Airlie's avatar
      Merge tag 'amd-drm-fixes-6.5-2023-07-12' of... · 38d88d5e
      Dave Airlie authored
      Merge tag 'amd-drm-fixes-6.5-2023-07-12' of https://gitlab.freedesktop.org/agd5f/linux
      
       into drm-fixes
      
      amd-drm-fixes-6.5-2023-07-12:
      
      amdgpu:
      - SMU i2c locking fix
      - Fix a possible deadlock in process restoration for ROCm apps
      - Disable PCIe lane/speed switching on Intel platforms (the platforms don't support it)
      
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      
      From: Alex Deucher <alexander.deucher@amd.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20230712184009.7740-1-alexander.deucher@amd.com
      38d88d5e
    • Dave Airlie's avatar
      Merge tag 'drm-intel-fixes-2023-07-13' of... · 864e029f
      Dave Airlie authored
      Merge tag 'drm-intel-fixes-2023-07-13' of git://anongit.freedesktop.org/drm/drm-intel
      
       into drm-fixes
      
      - Don't preserve dpll_hw_state for slave crtc in Bigjoiner (Stanislav Lisovskiy)
      - Consider OA buffer boundary when zeroing out reports [perf] (Umesh Nerlige Ramappa)
      - Remove dead code from gen8_pte_encode (Tvrtko Ursulin)
      - Fix one wrong caching mode enum usage (Tvrtko Ursulin)
      
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/ZK+nHLCltaxoxVw/@tursulin-desk
      864e029f
    • Dave Airlie's avatar
      Merge tag 'drm-misc-fixes-2023-07-13' of ssh://git.freedesktop.org/git/drm/drm-misc into drm-fixes · b7a57386
      Dave Airlie authored
      
      
      A couple of nouveau patches addressing improving HDMI support and
      firmware handling, a fix for TTM to skip pinned BO when evicting, and a
      fix for the fbdev documentation.
      
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      
      From: Maxime Ripard <mripard@redhat.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/nq3ke75juephbex5acfyi5t6bxv22nhmfcpfhru55haj2nv3us@gehrlmjbqgjk
      b7a57386
    • Linus Torvalds's avatar
      Merge tag 'erofs-for-6.5-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs · 4b810bf0
      Linus Torvalds authored
      Pull erofs fixes from Gao Xiang:
       "Three patches address regressions related to post-EOF unexpected
        behaviors and fsdax unavailability of chunk-based regular files.
      
        The other two patches mainly get rid of kmap_atomic() and simplify
        z_erofs_transform_plain().
      
         - Fix two unexpected loop cases when reading beyond EOF
      
         - Fix fsdax unavailability for chunk-based regular files
      
         - Get rid of the remaining kmap_atomic()
      
         - Minor cleanups"
      
      * tag 'erofs-for-6.5-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs:
        erofs: fix fsdax unavailability for chunk-based regular files
        erofs: avoid infinite loop in z_erofs_do_read_page() when reading beyond EOF
        erofs: avoid useless loops in z_erofs_pcluster_readmore() when reading beyond EOF
        erofs: simplify z_erofs_transform_plain()
        erofs: get rid of the remaining kmap_atomic()
      4b810bf0
    • Linus Torvalds's avatar
      Merge tag 'net-6.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · b1983d42
      Linus Torvalds authored
      Pull networking fixes from Paolo Abeni:
       "Including fixes from netfilter, wireless and ebpf.
      
        Current release - regressions:
      
         - netfilter: conntrack: gre: don't set assured flag for clash entries
      
         - wifi: iwlwifi: remove 'use_tfh' config to fix crash
      
        Previous releases - regressions:
      
         - ipv6: fix a potential refcount underflow for idev
      
         - icmp6: ifix null-ptr-deref of ip6_null_entry->rt6i_idev in
           icmp6_dev()
      
         - bpf: fix max stack depth check for async callbacks
      
         - eth: mlx5e:
            - check for NOT_READY flag state after locking
            - fix page_pool page fragment tracking for XDP
      
         - eth: igc:
            - fix tx hang issue when QBV gate is closed
            - fix corner cases for TSN offload
      
         - eth: octeontx2-af: Move validation of ptp pointer before its usage
      
         - eth: ena: fix shift-out-of-bounds in exponential backoff
      
        Previous releases - always broken:
      
         - core: prevent skb corruption on frag list segmentation
      
         - sched:
            - cls_fw: fix improper refcount update leads to use-after-free
            - sch_qfq: account for stab overhead in qfq_enqueue
      
         - netfilter:
            - report use refcount overflow
            - prevent OOB access in nft_byteorder_eval
      
         - wifi: mt7921e: fix init command fail with enabled device
      
         - eth: ocelot: fix oversize frame dropping for preemptible TCs
      
         - eth: fec: recycle pages for transmitted XDP frames"
      
      * tag 'net-6.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (79 commits)
        selftests: tc-testing: add test for qfq with stab overhead
        net/sched: sch_qfq: account for stab overhead in qfq_enqueue
        selftests: tc-testing: add tests for qfq mtu sanity check
        net/sched: sch_qfq: reintroduce lmax bound check for MTU
        wifi: cfg80211: fix receiving mesh packets without RFC1042 header
        wifi: rtw89: debug: fix error code in rtw89_debug_priv_send_h2c_set()
        net: txgbe: fix eeprom calculation error
        net/sched: make psched_mtu() RTNL-less safe
        net: ena: fix shift-out-of-bounds in exponential backoff
        netdevsim: fix uninitialized data in nsim_dev_trap_fa_cookie_write()
        net/sched: flower: Ensure both minimum and maximum ports are specified
        MAINTAINERS: Add another mailing list for QUALCOMM ETHQOS ETHERNET DRIVER
        docs: netdev: update the URL of the status page
        wifi: iwlwifi: remove 'use_tfh' config to fix crash
        xdp: use trusted arguments in XDP hints kfuncs
        bpf: cpumap: Fix memory leak in cpu_map_update_elem
        wifi: airo: avoid uninitialized warning in airo_get_rate()
        octeontx2-pf: Add additional check for MCAM rules
        net: dsa: Removed unneeded of_node_put in felix_parse_ports_node
        net: fec: use netdev_err_once() instead of netdev_err()
        ...
      b1983d42
    • Linus Torvalds's avatar
      Merge tag 'trace-v6.5-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace · ebc27aac
      Linus Torvalds authored
      Pull tracing fixes from Steven Rostedt:
      
       - Fix some missing-prototype warnings
      
       - Fix user events struct args (did not include size of struct)
      
         When creating a user event, the "struct" keyword is to denote that
         the size of the field will be passed in. But the parsing failed to
         handle this case.
      
       - Add selftest to struct sizes for user events
      
       - Fix sample code for direct trampolines.
      
         The sample code for direct trampolines attached to handle_mm_fault().
         But the prototype changed and the direct trampoline sample code was
         not updated. Direct trampolines needs to have the arguments correct
         otherwise it can fail or crash the system.
      
       - Remove unused ftrace_regs_caller_ret() prototype.
      
       - Quiet false positive of FORTIFY_SOURCE
      
         Due to backward compatibility, the structure used to save stack
         traces in the kernel had a fixed size of 8. This structure is
         exported to user space via the tracing format file. A change was made
         to allow more than 8 functions to be recorded, and user space now
         uses the size field to know how many functions are actually in the
         stack.
      
         But the structure still has size of 8 (even though it points into the
         ring buffer that has the required amount allocated to hold a full
         stack.
      
         This was fine until the fortifier noticed that the
         memcpy(&entry->caller, stack, size) was greater than the 8 functions
         and would complain at runtime about it.
      
         Hide this by using a pointer to the stack location on the ring buffer
         instead of using the address of the entry structure caller field.
      
       - Fix a deadloop in reading trace_pipe that was caused by a mismatch
         between ring_buffer_empty() returning false which then asked to read
         the data, but the read code uses rb_num_of_entries() that returned
         zero, and causing a infinite "retry".
      
       - Fix a warning caused by not using all pages allocated to store ftrace
         functions, where this can happen if the linker inserts a bunch of
         "NULL" entries, causing the accounting of how many pages needed to be
         off.
      
       - Fix histogram synthetic event crashing when the start event is
         removed and the end event is still using a variable from it
      
       - Fix memory leak in freeing iter->temp in tracing_release_pipe()
      
      * tag 'trace-v6.5-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
        tracing: Fix memory leak of iter->temp when reading trace_pipe
        tracing/histograms: Add histograms to hist_vars if they have referenced variables
        tracing: Stop FORTIFY_SOURCE complaining about stack trace caller
        ftrace: Fix possible warning on checking all pages used in ftrace_process_locs()
        ring-buffer: Fix deadloop issue on reading trace_pipe
        tracing: arm64: Avoid missing-prototype warnings
        selftests/user_events: Test struct size match cases
        tracing/user_events: Fix struct arg size match check
        x86/ftrace: Remove unsued extern declaration ftrace_regs_caller_ret()
        arm64: ftrace: Add direct call trampoline samples support
        samples: ftrace: Save required argument registers in sample trampolines
      ebc27aac
    • Linus Torvalds's avatar
      Merge tag 'for-linus-6.5-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 15999328
      Linus Torvalds authored
      Pull xen fixes from Juergen Gross:
      
       - a cleanup of the Xen related ELF-notes
      
       - a fix for virtio handling in Xen dom0 when running Xen in a VM
      
      * tag 'for-linus-6.5-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xen/virtio: Fix NULL deref when a bridge of PCI root bus has no parent
        x86/Xen: tidy xen-head.S
      15999328
    • Linus Torvalds's avatar
      Merge tag 'sh-for-v6.5-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux · 9350cd01
      Linus Torvalds authored
      Pull sh fixes from John Paul Adrian Glaubitz:
       "The sh updates introduced multiple regressions.
      
        In particular, the change a8ac2961 ("sh: Avoid using IRQ0 on SH3
        and SH4") causes several boards to hang during boot due to incorrect
        IRQ numbers.
      
        Geert Uytterhoeven has contributed patches that handle the virq offset
        in the IRQ code for the dreamcast, highlander and r2d boards while
        Artur Rojek has contributed a patch which handles the virq offset for
        the hd64461 companion chip"
      
      * tag 'sh-for-v6.5-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux:
        sh: hd64461: Handle virq offset for offchip IRQ base and HD64461 IRQ
        sh: mach-dreamcast: Handle virq offset in cascaded IRQ demux
        sh: mach-highlander: Handle virq offset in cascaded IRL demux
        sh: mach-r2d: Handle virq offset in cascaded IRL demux
      9350cd01
    • Jens Axboe's avatar
      Merge tag 'nvme-6.5-2023-07-13' of git://git.infradead.org/nvme into block-6.5 · 90b46229
      Jens Axboe authored
      Pull NVMe fixes from Keith:
      
      "nvme fixes for Linux 6.5
      
       - Don't require quirk to use duplicate namespace identifiers
         (Christoph, Sagi)
       - One more BOGUS_NID quirk (Pankaj)
       - IO timeout and error hanlding fixes for PCI (Keith)
       - Enhanced metadata format mask fix (Ankit)
       - Association race condition fix for fibre channel (Michael)
       - Correct debugfs error checks (Minjie)
       - Use PAGE_SECTORS_SHIFT where needed (Damien)
       - Reduce kernel logs for legacy nguid attribute (Keith)
       - Use correct dma direction when unmapping metadata (Ming)"
      
      * tag 'nvme-6.5-2023-07-13' of git://git.infradead.org/nvme:
        nvme-pci: fix DMA direction of unmapping integrity data
        nvme: don't reject probe due to duplicate IDs for single-ported PCIe devices
        nvme: ensure disabling pairs with unquiesce
        nvme-fc: fix race between error recovery and creating association
        nvme-fc: return non-zero status code when fails to create association
        nvme: fix parameter check in nvme_fault_inject_init()
        nvme: warn only once for legacy uuid attribute
        nvme: fix the NVME_ID_NS_NVM_STS_MASK definition
        nvmet: use PAGE_SECTORS_SHIFT
        nvme: add BOGUS_NID quirk for Samsung SM953
      90b46229
    • Chengming Zhou's avatar
      blk-mq: fix start_time_ns and alloc_time_ns for pre-allocated rq · 5c17f45e
      Chengming Zhou authored
      The iocost rely on rq start_time_ns and alloc_time_ns to tell saturation
      state of the block device. Most of the time request is allocated after
      rq_qos_throttle() and its alloc_time_ns or start_time_ns won't be affected.
      
      But for plug batched allocation introduced by the commit 47c122e3
      
      
      ("block: pre-allocate requests if plug is started and is a batch"), we can
      rq_qos_throttle() after the allocation of the request. This is what the
      blk_mq_get_cached_request() does.
      
      In this case, the cached request alloc_time_ns or start_time_ns is much
      ahead if blocked in any qos ->throttle().
      
      Fix it by setting alloc_time_ns and start_time_ns to now when the allocated
      request is actually used.
      
      Signed-off-by: default avatarChengming Zhou <zhouchengming@bytedance.com>
      Acked-by: default avatarTejun Heo <tj@kernel.org>
      Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
      Link: https://lore.kernel.org/r/20230710105516.2053478-1-chengming.zhou@linux.dev
      
      
      Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
      5c17f45e