Commit 6f0edbb8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2023-08-25-11-07' of... 

Merge tag 'mm-hotfixes-stable-2023-08-25-11-07' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull misc fixes from Andrew Morton:
 "18 hotfixes. 13 are cc:stable and the remainder pertain to post-6.4
  issues or aren't considered suitable for a -stable backport"

* tag 'mm-hotfixes-stable-2023-08-25-11-07' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  shmem: fix smaps BUG sleeping while atomic
  selftests: cachestat: catch failing fsync test on tmpfs
  selftests: cachestat: test for cachestat availability
  maple_tree: disable mas_wr_append() when other readers are possible
  madvise:madvise_free_pte_range(): don't use mapcount() against large folio for sharing check
  madvise:madvise_free_huge_pmd(): don't use mapcount() against large folio for sharing check
  madvise:madvise_cold_or_pageout_pte_range(): don't use mapcount() against large folio for sharing check
  mm: multi-gen LRU: don't spin during memcg release
  mm: memory-failure: fix unexpected return value in soft_offline_page()
  radix tree: remove unused variable
  mm: add a call to flush_cache_vmap() in vmap_pfn()
  selftests/mm: FOLL_LONGTERM need to be updated to 0x100
  nilfs2: fix general protection fault in nilfs_lookup_dirty_data_buffers()
  mm/gup: handle cont-PTE hugetlb pages correctly in gup_must_unshare() via GUP-fast
  selftests: cgroup: fix test_kmem_basic less than error
  mm: enable page walking API to lock vmas during the walk
  smaps: use vm_normal_page_pmd() instead of follow_trans_huge_pmd()
  mm/gup: reintroduce FOLL_NUMA as FOLL_HONOR_NUMA_FAULT
parents 4942fed8 e5548f85

arch/powerpc/mm/book3s64/subpage_prot.c

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ static int subpage_walk_pmd_entry(pmd_t *pmd, unsigned long addr, 


static const struct mm_walk_ops subpage_walk_ops = {

	.pmd_entry	= subpage_walk_pmd_entry,

	.walk_lock	= PGWALK_WRLOCK_VERIFY,

};



static void subpage_mark_vma_nohuge(struct mm_struct *mm, unsigned long addr,

arch/riscv/mm/pageattr.c

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ static const struct mm_walk_ops pageattr_ops = { 
	.pmd_entry = pageattr_pmd_entry,

	.pte_entry = pageattr_pte_entry,

	.pte_hole = pageattr_pte_hole,

	.walk_lock = PGWALK_RDLOCK,

};



static int __set_memory(unsigned long addr, int numpages, pgprot_t set_mask,

arch/s390/mm/gmap.c

+5 −0
Original line number Diff line number Diff line
@@ -2514,6 +2514,7 @@ static int thp_split_walk_pmd_entry(pmd_t *pmd, unsigned long addr, 


static const struct mm_walk_ops thp_split_walk_ops = {

	.pmd_entry	= thp_split_walk_pmd_entry,

	.walk_lock	= PGWALK_WRLOCK_VERIFY,

};



static inline void thp_split_mm(struct mm_struct *mm)
@@ -2565,6 +2566,7 @@ static int __zap_zero_pages(pmd_t *pmd, unsigned long start, 


static const struct mm_walk_ops zap_zero_walk_ops = {

	.pmd_entry	= __zap_zero_pages,

	.walk_lock	= PGWALK_WRLOCK,

};



/*
@@ -2655,6 +2657,7 @@ static const struct mm_walk_ops enable_skey_walk_ops = { 
	.hugetlb_entry		= __s390_enable_skey_hugetlb,

	.pte_entry		= __s390_enable_skey_pte,

	.pmd_entry		= __s390_enable_skey_pmd,

	.walk_lock		= PGWALK_WRLOCK,

};



int s390_enable_skey(void)
@@ -2692,6 +2695,7 @@ static int __s390_reset_cmma(pte_t *pte, unsigned long addr, 


static const struct mm_walk_ops reset_cmma_walk_ops = {

	.pte_entry		= __s390_reset_cmma,

	.walk_lock		= PGWALK_WRLOCK,

};



void s390_reset_cmma(struct mm_struct *mm)
@@ -2728,6 +2732,7 @@ static int s390_gather_pages(pte_t *ptep, unsigned long addr, 


static const struct mm_walk_ops gather_pages_ops = {

	.pte_entry = s390_gather_pages,

	.walk_lock = PGWALK_RDLOCK,

};



/*

fs/nilfs2/segment.c

+5 −0
Original line number Diff line number Diff line
@@ -725,6 +725,11 @@ static size_t nilfs_lookup_dirty_data_buffers(struct inode *inode, 
		struct folio *folio = fbatch.folios[i];



		folio_lock(folio);

		if (unlikely(folio->mapping != mapping)) {

			/* Exclude folios removed from the address space */

			folio_unlock(folio);

			continue;

		}

		head = folio_buffers(folio);

		if (!head) {

			create_empty_buffers(&folio->page, i_blocksize(inode), 0);

fs/proc/task_mmu.c

+6 −2
Original line number Diff line number Diff line
@@ -587,8 +587,7 @@ static void smaps_pmd_entry(pmd_t *pmd, unsigned long addr, 
	bool migration = false;



	if (pmd_present(*pmd)) {

		/* FOLL_DUMP will return -EFAULT on huge zero page */

		page = follow_trans_huge_pmd(vma, addr, pmd, FOLL_DUMP);

		page = vm_normal_page_pmd(vma, addr, *pmd);

	} else if (unlikely(thp_migration_supported() && is_swap_pmd(*pmd))) {

		swp_entry_t entry = pmd_to_swp_entry(*pmd);
@@ -758,12 +757,14 @@ static int smaps_hugetlb_range(pte_t *pte, unsigned long hmask, 
static const struct mm_walk_ops smaps_walk_ops = {

	.pmd_entry		= smaps_pte_range,

	.hugetlb_entry		= smaps_hugetlb_range,

	.walk_lock		= PGWALK_RDLOCK,

};



static const struct mm_walk_ops smaps_shmem_walk_ops = {

	.pmd_entry		= smaps_pte_range,

	.hugetlb_entry		= smaps_hugetlb_range,

	.pte_hole		= smaps_pte_hole,

	.walk_lock		= PGWALK_RDLOCK,

};



/*
@@ -1245,6 +1246,7 @@ static int clear_refs_test_walk(unsigned long start, unsigned long end, 
static const struct mm_walk_ops clear_refs_walk_ops = {

	.pmd_entry		= clear_refs_pte_range,

	.test_walk		= clear_refs_test_walk,

	.walk_lock		= PGWALK_WRLOCK,

};



static ssize_t clear_refs_write(struct file *file, const char __user *buf,
@@ -1622,6 +1624,7 @@ static const struct mm_walk_ops pagemap_ops = { 
	.pmd_entry	= pagemap_pmd_range,

	.pte_hole	= pagemap_pte_hole,

	.hugetlb_entry	= pagemap_hugetlb_range,

	.walk_lock	= PGWALK_RDLOCK,

};



/*
@@ -1935,6 +1938,7 @@ static int gather_hugetlb_stats(pte_t *pte, unsigned long hmask, 
static const struct mm_walk_ops show_numa_ops = {

	.hugetlb_entry = gather_hugetlb_stats,

	.pmd_entry = gather_pte_stats,

	.walk_lock = PGWALK_RDLOCK,

};



/*