mm-fork-accept-huge-pfnmap-entries.patch removed from -mm tree
The quilt patch titled
Subject: mm/fork: accept huge pfnmap entries
has been removed from the -mm tree. Its filename was
mm-fork-accept-huge-pfnmap-entries.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Peter Xu <[email protected]>
Subject: mm/fork: accept huge pfnmap entries
Date: Mon, 26 Aug 2024 16:43:41 -0400
Teach the fork code to properly copy pfnmaps for pmd/pud levels. Pud is much easier, the write bit needs to be persisted though for writable and shared pud mappings like PFNMAP ones, otherwise a follow up write in either parent or child process will trigger a write fault.
Do the same for pmd level.
---
mm/huge_memory.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-)
mm/huge_memory.c renamed from mm/huge_memory.c~mm-fork-accept-huge-pfnmap-entries +26 -3
@@ -1583,6 +1583,24 @@ int copy_huge_pmd(struct mm_struct *dst_pgtable_t pgtable =NULL ;int ret = -ENOMEM ; + pmd =pmdp_get_lockless (src_pmd); +if (unlikely (pmd_special (pmd))) { + dst_ptl =pmd_lock (dst_mm, dst_pmd); + src_ptl =pmd_lockptr (src_mm, src_pmd); +spin_lock_nested (src_ptl,SINGLE_DEPTH_NESTING ); +/* +* No need to recheck the pmd, it can't change with write +* mmap lock held here. +* +* Meanwhile, making sure it's not a CoW VMA with writable +* mapping, otherwise it means either the anon page wrongly +* applied special bit, or we made the PRIVATE mapping be +* able to wrongly write to the backend MMIO. +*/ +VM_WARN_ON_ONCE (is_cow_mapping (src_vma->vm_flags) &&pmd_write (pmd)); + goto set_pmd; + } +/* Skip if can be re-fill on fault */ if (!vma_is_anonymous (dst_vma))return 0 ;
@@ -1664,7 +1682,9 @@ out_zero_page:pmdp_set_wrprotect (src_mm, addr, src_pmd);if (!userfaultfd_wp (dst_vma)) pmd =pmd_clear_uffd_wp (pmd); - pmd =pmd_mkold (pmd_wrprotect (pmd)); + pmd =pmd_wrprotect (pmd); +set_pmd: + pmd =pmd_mkold (pmd);set_pmd_at (dst_mm, addr, dst_pmd, pmd); ret =0 ;
@@ -1710,8 +1730,11 @@ int copy_huge_pud(struct mm_struct *dst_* TODO: once we support anonymous pages, use * folio_try_dup_anon_rmap_*() and split if duplicating fails. */ -pudp_set_wrprotect (src_mm, addr, src_pud); - pud =pud_mkold (pud_wrprotect (pud)); +if (is_cow_mapping (vma->vm_flags) &&pud_write (pud)) { +pudp_set_wrprotect (src_mm, addr, src_pud); + pud =pud_wrprotect (pud); + } + pud =pud_mkold (pud);set_pud_at (dst_mm, addr, dst_pud, pud); ret =0 ;
_
Patches currently in -mm which might be from [email protected] are