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

Pull hotfixes from Andrew Morton: "Mainly MM fixes. About half for issues which were introduced after 5.18 and the remainder for longer-term issues" * tag 'mm-hotfixes-stable-2022-07-11' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: mm: split huge PUD on wp_huge_pud fallback nilfs2: fix incorrect masking of permission flags for symlinks mm/rmap: fix dereferencing invalid subpage pointer in try_to_migrate_one() riscv/mm: fix build error while PAGE_TABLE_CHECK enabled without MMU Documentation: highmem: use literal block for code example in highmem.h comment mm: sparsemem: fix missing higher order allocation splitting mm/damon: use set_huge_pte_at() to make huge pte old sh: convert nommu io{re,un}map() to static inline functions mm: userfaultfd: fix UFFDIO_CONTINUE on fallocated shmem pages

Linus Torvalds committed 4 years ago

Commit 8e59a6a2 parents b537439 14c99d69 files · +63 −38Browse files

Unified · Split

9 files

arch/riscv/Kconfig +1 −1
arch/sh/include/asm/io.h +6 −2
fs/nilfs2/nilfs.h +3 −0
include/linux/highmem.h +9 −9
mm/damon/vaddr.c +1 −2
mm/memory.c +14 −13
mm/rmap.c +17 −10
mm/sparse-vmemmap.c +8 −0
mm/userfaultfd.c +4 −1

arch/riscv/Kconfig+1−1

@@ -38,7 +38,7 @@ config RISCV · 37 unmodified lines
38	select ARCH_SUPPORTS_ATOMIC_RMW	38	select ARCH_SUPPORTS_ATOMIC_RMW
39	select ARCH_SUPPORTS_DEBUG_PAGEALLOC if MMU	39	select ARCH_SUPPORTS_DEBUG_PAGEALLOC if MMU
40	select ARCH_SUPPORTS_HUGETLBFS if MMU	40	select ARCH_SUPPORTS_HUGETLBFS if MMU
41	select ARCH_SUPPORTS_PAGE_TABLE_CHECK	41	select ARCH_SUPPORTS_PAGE_TABLE_CHECK if MMU
42	select ARCH_USE_MEMTEST	42	select ARCH_USE_MEMTEST
43	select ARCH_USE_QUEUED_RWLOCKS	43	select ARCH_USE_QUEUED_RWLOCKS
44	select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU	44	select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU

arch/sh/include/asm/io.h+6−2

 #endif /* CONFIG_HAVE_IOREMAP_PROT */
 #else /* CONFIG_MMU */
-#define iounmap(addr)		do { } while (0)
+static inline void __iomem *ioremap(phys_addr_t offset, size_t size)
-#define ioremap(offset, size)	((void __iomem *)(unsigned long)(offset))
+{
+	return (void __iomem *)(unsigned long)offset;
+}
+static inline void iounmap(volatile void __iomem *addr) { }
 #endif /* CONFIG_MMU */
 #define ioremap_uc	ioremap

fs/nilfs2/nilfs.h+3−0

@@ -198,6 +198,9 @@ static inline int nilfs_acl_chmod(struct inode *inode) · 197 unmodified lines
198		198
199	static inline int nilfs_init_acl(struct inode inode, struct inode dir)	199	static inline int nilfs_init_acl(struct inode inode, struct inode dir)
200	{	200	{
		201	if (S_ISLNK(inode->i_mode))
		202	return 0;
		203
201	inode->i_mode &= ~current_umask();	204	inode->i_mode &= ~current_umask();
202	return 0;	205	return 0;
203	}	206	}

include/linux/highmem.h+9−9

mm/damon/vaddr.c+1−2

@@ -336,8 +336,7 @@ static void damon_hugetlb_mkold(pte_t pte, struct mm_struct mm, · 335 unmodified lines
336	if (pte_young(entry)) {	336	if (pte_young(entry)) {
337	referenced = true;	337	referenced = true;
338	entry = pte_mkold(entry);	338	entry = pte_mkold(entry);
339	huge_ptep_set_access_flags(vma, addr, pte, entry,	339	set_huge_pte_at(mm, addr, pte, entry);
340	vma->vm_flags & VM_WRITE);
341	}	340	}
342		341
343	#ifdef CONFIG_MMU_NOTIFIER	342	#ifdef CONFIG_MMU_NOTIFIER

mm/memory.c+14−13

 static vm_fault_t create_huge_pud(struct vm_fault *vmf)
 {
+#if defined(CONFIG_TRANSPARENT_HUGEPAGE) &&			\
+	defined(CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD)
+	/* No support for anonymous transparent PUD pages yet */
+	if (vma_is_anonymous(vmf->vma))
+		return VM_FAULT_FALLBACK;
+	if (vmf->vma->vm_ops->huge_fault)
+		return vmf->vma->vm_ops->huge_fault(vmf, PE_SIZE_PUD);
+#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
+	return VM_FAULT_FALLBACK;
+}
+static vm_fault_t wp_huge_pud(struct vm_fault *vmf, pud_t orig_pud)
+{
 #if defined(CONFIG_TRANSPARENT_HUGEPAGE) &&			\
 	defined(CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD)
 	/* No support for anonymous transparent PUD pages yet */
 split:
 	/* COW or write-notify not handled on PUD level: split pud.*/
 	__split_huge_pud(vmf->vma, vmf->pud, vmf->address);
-#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
+#endif /* CONFIG_TRANSPARENT_HUGEPAGE && CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD */
-	return VM_FAULT_FALLBACK;
-}
-static vm_fault_t wp_huge_pud(struct vm_fault *vmf, pud_t orig_pud)
-{
-#ifdef CONFIG_TRANSPARENT_HUGEPAGE
-	/* No support for anonymous transparent PUD pages yet */
-	if (vma_is_anonymous(vmf->vma))
-		return VM_FAULT_FALLBACK;
-	if (vmf->vma->vm_ops->huge_fault)
-		return vmf->vma->vm_ops->huge_fault(vmf, PE_SIZE_PUD);
-#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
 	return VM_FAULT_FALLBACK;
 }

mm/rmap.c+17−10

 		/* Unexpected PMD-mapped THP? */
 		VM_BUG_ON_FOLIO(!pvmw.pte, folio);
-		subpage = folio_page(folio,
+		if (folio_is_zone_device(folio)) {
-				pte_pfn(*pvmw.pte) - folio_pfn(folio));
+			/*
+			 * Our PTE is a non-present device exclusive entry and
+			 * calculating the subpage as for the common case would
+			 * result in an invalid pointer.
+			 *
+			 * Since only PAGE_SIZE pages can currently be
+			 * migrated, just set it to page. This will need to be
+			 * changed when hugepage migrations to device private
+			 * memory are supported.
+			 */
+			VM_BUG_ON_FOLIO(folio_nr_pages(folio) > 1, folio);
+			subpage = &folio->page;
+		} else {
+			subpage = folio_page(folio,
+					pte_pfn(*pvmw.pte) - folio_pfn(folio));
+		}
 		address = pvmw.address;
 		anon_exclusive = folio_test_anon(folio) &&
 				 PageAnonExclusive(subpage);
 			/*
 			 * No need to invalidate here it will synchronize on
 			 * against the special swap migration pte.
-			 *
-			 * The assignment to subpage above was computed from a
-			 * swap PTE which results in an invalid pointer.
-			 * Since only PAGE_SIZE pages can currently be
-			 * migrated, just set it to page. This will need to be
-			 * changed when hugepage migrations to device private
-			 * memory are supported.
 			 */
-			subpage = &folio->page;
 		} else if (PageHWPoison(subpage)) {
 			pteval = swp_entry_to_pte(make_hwpoison_entry(subpage));
 			if (folio_test_hugetlb(folio)) {

mm/sparse-vmemmap.c+8−0

@@ -78,6 +78,14 @@ static int __split_vmemmap_huge_pmd(pmd_t *pmd, unsigned long start) · 77 unmodified lines
78		78
79	spin_lock(&init_mm.page_table_lock);	79	spin_lock(&init_mm.page_table_lock);
80	if (likely(pmd_leaf(*pmd))) {	80	if (likely(pmd_leaf(*pmd))) {
		81	/*
		82	* Higher order allocations from buddy allocator must be able to
		83	* be treated as indepdenent small pages (as they can be freed
		84	* individually).
		85	*/
		86	if (!PageReserved(page))
		87	split_page(page, get_order(PMD_SIZE));
		88
81	/* Make pte visible before pmd. See comment in pmd_install(). */	89	/* Make pte visible before pmd. See comment in pmd_install(). */
82	smp_wmb();	90	smp_wmb();
83	pmd_populate_kernel(&init_mm, pmd, pgtable);	91	pmd_populate_kernel(&init_mm, pmd, pgtable);

mm/userfaultfd.c+4−1

 	struct page *page;
 	int ret;
-	ret = shmem_getpage(inode, pgoff, &page, SGP_READ);
+	ret = shmem_getpage(inode, pgoff, &page, SGP_NOALLOC);
+	/* Our caller expects us to return -EFAULT if we failed to find page. */
+	if (ret == -ENOENT)
+		ret = -EFAULT;
 	if (ret)
 		goto out;
 	if (!page) {

@@ -149,19 +149,19 @@ static inline void kmap_local_folio(struct folio folio, size_t offset); · 148 unmodified lines
149	* It is used in atomic context when code wants to access the contents of a	149	* It is used in atomic context when code wants to access the contents of a
150	* page that might be allocated from high memory (see __GFP_HIGHMEM), for	150	* page that might be allocated from high memory (see __GFP_HIGHMEM), for
151	* example a page in the pagecache. The API has two functions, and they	151	* example a page in the pagecache. The API has two functions, and they
152	* can be used in a manner similar to the following:	152	* can be used in a manner similar to the following::
153	*	153	*
154	* -- Find the page of interest. --	154	* // Find the page of interest.
155	* struct page *page = find_get_page(mapping, offset);	155	* struct page *page = find_get_page(mapping, offset);
156	*	156	*
157	* -- Gain access to the contents of that page. --	157	* // Gain access to the contents of that page.
158	* void *vaddr = kmap_atomic(page);	158	* void *vaddr = kmap_atomic(page);
159	*	159	*
160	* -- Do something to the contents of that page. --	160	* // Do something to the contents of that page.
161	* memset(vaddr, 0, PAGE_SIZE);	161	* memset(vaddr, 0, PAGE_SIZE);
162	*	162	*
163	* -- Unmap that page. --	163	* // Unmap that page.
164	* kunmap_atomic(vaddr);	164	* kunmap_atomic(vaddr);
165	*	165	*
166	* Note that the kunmap_atomic() call takes the result of the kmap_atomic()	166	* Note that the kunmap_atomic() call takes the result of the kmap_atomic()
167	* call, not the argument.	167	* call, not the argument.