Commit 09d95bc8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2025-09-27-22-35' of... 

Merge tag 'mm-hotfixes-stable-2025-09-27-22-35' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull misc fixes from Andrew Morton:
 "7 hotfixes. 4 are cc:stable and the remainder address post-6.16 issues
  or aren't considered necessary for -stable kernels. 6 of these fixes
  are for MM.

  All singletons, please see the changelogs for details"

* tag 'mm-hotfixes-stable-2025-09-27-22-35' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  include/linux/pgtable.h: convert arch_enter_lazy_mmu_mode() and friends to static inlines
  mm/damon/sysfs: do not ignore callback's return value in damon_sysfs_damon_call()
  mailmap: add entry for Bence Csókás
  fs/proc/task_mmu: check p->vec_buf for NULL
  kmsan: fix out-of-bounds access to shadow memory
  mm/hugetlb: fix copy_hugetlb_page_range() to use ->pt_share_count
  mm/hugetlb: fix folio is still mapped when deleted
parents 51a24b7d 7e89979f

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ Ben M Cahill <ben.m.cahill@intel.com> 
Ben Widawsky <bwidawsk@kernel.org> <ben@bwidawsk.net>

Ben Widawsky <bwidawsk@kernel.org> <ben.widawsky@intel.com>

Ben Widawsky <bwidawsk@kernel.org> <benjamin.widawsky@intel.com>

Bence Csókás <bence98@sch.bme.hu> <csokas.bence@prolan.hu>

Benjamin Poirier <benjamin.poirier@gmail.com> <bpoirier@suse.de>

Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@gmail.com>

Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@redhat.com>

fs/hugetlbfs/inode.c

+6 −4
Original line number Diff line number Diff line
@@ -517,14 +517,16 @@ static bool remove_inode_single_folio(struct hstate *h, struct inode *inode, 


	/*

	 * If folio is mapped, it was faulted in after being

	 * unmapped in caller.  Unmap (again) while holding

	 * the fault mutex.  The mutex will prevent faults

	 * until we finish removing the folio.

	 * unmapped in caller or hugetlb_vmdelete_list() skips

	 * unmapping it due to fail to grab lock.  Unmap (again)

	 * while holding the fault mutex.  The mutex will prevent

	 * faults until we finish removing the folio.  Hold folio

	 * lock to guarantee no concurrent migration.

	 */

	folio_lock(folio);

	if (unlikely(folio_mapped(folio)))

		hugetlb_unmap_file_folio(h, mapping, folio, index);



	folio_lock(folio);

	/*

	 * We must remove the folio from page cache before removing

	 * the region/ reserve map (hugetlb_unreserve_pages).  In

fs/proc/task_mmu.c

+3 −0
Original line number Diff line number Diff line
@@ -2417,6 +2417,9 @@ static void pagemap_scan_backout_range(struct pagemap_scan_private *p, 
{

	struct page_region *cur_buf = &p->vec_buf[p->vec_buf_index];



	if (!p->vec_buf)

		return;



	if (cur_buf->start != addr)

		cur_buf->end = addr;

	else

include/linux/mm_types.h

+5 −0
Original line number Diff line number Diff line
@@ -631,6 +631,11 @@ static inline int ptdesc_pmd_pts_count(struct ptdesc *ptdesc) 
{

	return atomic_read(&ptdesc->pt_share_count);

}



static inline bool ptdesc_pmd_is_shared(struct ptdesc *ptdesc)

{

	return !!ptdesc_pmd_pts_count(ptdesc);

}

#else

static inline void ptdesc_pmd_pts_init(struct ptdesc *ptdesc)

{

include/linux/pgtable.h

+3 −3
Original line number Diff line number Diff line
@@ -232,9 +232,9 @@ static inline int pmd_dirty(pmd_t pmd) 
 * and the mode cannot be used in interrupt context.

 */

#ifndef __HAVE_ARCH_ENTER_LAZY_MMU_MODE

#define arch_enter_lazy_mmu_mode()	do {} while (0)

#define arch_leave_lazy_mmu_mode()	do {} while (0)

#define arch_flush_lazy_mmu_mode()	do {} while (0)

static inline void arch_enter_lazy_mmu_mode(void) {}

static inline void arch_leave_lazy_mmu_mode(void) {}

static inline void arch_flush_lazy_mmu_mode(void) {}

#endif



#ifndef pte_batch_hint