mm-add-early-fault_flag_unshare-consistency-checks.patch removed from -mm tree
The quilt patch titled
Subject: mm: add early FAULT_FLAG_UNSHARE consistency checks
has been removed from the -mm tree. Its filename was
mm-add-early-fault_flag_unshare-consistency-checks.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: David Hildenbrand <[email protected]>
Subject: mm: add early FAULT_FLAG_UNSHARE consistency checks
Date: Wed, 16 Nov 2022 11:26:43 +0100
For now, FAULT_FLAG_UNSHARE only applies to anonymous pages, which implies a COW mapping. Let's hide FAULT_FLAG_UNSHARE early if we're not dealing with a COW mapping, such that we treat it like a read fault as documented and don't have to worry about the flag throughout all fault handlers.
While at it, centralize the check for mutual exclusion of FAULT_FLAG_UNSHARE and FAULT_FLAG_WRITE and just drop the check that either flag is set in the WP handler.
---
mm/huge_memory.c | 3 --- mm/hugetlb.c | 5 ----- mm/memory.c | 23 ++++++++++++++++++++--- 3 files changed, 20 insertions(+), 11 deletions(-)
mm/huge_memory.c renamed from mm/huge_memory.c~mm-add-early-fault_flag_unshare-consistency-checks +0 -3
@@ -1313,9 +1313,6 @@ vm_fault_t do_huge_pmd_wp_page(struct vm vmf->ptl =pmd_lockptr (vma->vm_mm, vmf->pmd);VM_BUG_ON_VMA (!vma->anon_vma, vma); -VM_BUG_ON (unshare && (vmf->flags &FAULT_FLAG_WRITE )); -VM_BUG_ON (!unshare && !(vmf->flags &FAULT_FLAG_WRITE )); -if (is_huge_zero_pmd (orig_pmd)) goto fallback;
mm/hugetlb.c renamed from mm/hugetlb.c~mm-add-early-fault_flag_unshare-consistency-checks +0 -5
@@ -5316,9 +5316,6 @@ static vm_fault_t hugetlb_wp(struct mm_sunsigned long haddr = address &huge_page_mask (h);struct mmu_notifier_range range; -VM_BUG_ON (unshare && (flags &FOLL_WRITE )); -VM_BUG_ON (!unshare && !(flags &FOLL_WRITE )); -/* * hugetlb does not support FOLL_FORCE-style write faults that keep the * PTE mapped R/O such as maybe_mkwrite() would do.
@@ -5328,8 +5325,6 @@ static vm_fault_t hugetlb_wp(struct mm_s/* Let's take out MAP_SHARED mappings first. */ if (vma->vm_flags &VM_MAYSHARE ) { -if (unlikely (unshare)) -return 0 ;set_huge_ptep_writable (vma, haddr, ptep);return 0 ; }
mm/memory.c renamed from mm/memory.c~mm-add-early-fault_flag_unshare-consistency-checks +20 -3
@@ -3343,9 +3343,6 @@ static vm_fault_t do_wp_page(struct vm_fstruct vm_area_struct *vma = vmf->vma;struct folio *folio; -VM_BUG_ON (unshare && (vmf->flags &FAULT_FLAG_WRITE )); -VM_BUG_ON (!unshare && !(vmf->flags &FAULT_FLAG_WRITE )); -if (likely (!unshare)) {if (userfaultfd_pte_wp (vma, *vmf->pte)) {pte_unmap_unlock (vmf->pte, vmf->ptl);
@@ -5161,6 +5158,22 @@ static void lru_gen_exit_fault(void) }#endif /* CONFIG_LRU_GEN */ +static vm_fault_t sanitize_fault_flags (struct vm_area_struct *vma, +unsigned int *flags) +{ +if (unlikely (*flags &FAULT_FLAG_UNSHARE )) { +if (WARN_ON_ONCE (*flags &FAULT_FLAG_WRITE )) +return VM_FAULT_SIGSEGV ; +/* +* FAULT_FLAG_UNSHARE only applies to COW mappings. Let's +* just treat it like an ordinary read-fault otherwise. +*/ +if (!is_cow_mapping (vma->vm_flags)) + *flags &= ~FAULT_FLAG_UNSHARE ; + } +return 0 ; +} +/* * By the time we get here, we already hold the mm semaphore *
@@ -5177,6 +5190,10 @@ vm_fault_t handle_mm_fault(struct vm_arecount_vm_event (PGFAULT );count_memcg_event_mm (vma->vm_mm,PGFAULT ); + ret =sanitize_fault_flags (vma, &flags); +if (ret) +return ret; +if (!arch_vma_access_permitted (vma, flags &FAULT_FLAG_WRITE , flags &FAULT_FLAG_INSTRUCTION , flags &FAULT_FLAG_REMOTE ))
_
Patches currently in -mm which might be from [email protected] are
selftests-vm-add-ksm-unmerge-tests.patch mm-pagewalk-dont-trigger-test_walk-in-walk_page_vma.patch selftests-vm-add-test-to-measure-madv_unmergeable-performance.patch mm-ksm-simplify-break_ksm-to-not-rely-on-vm_fault_write.patch mm-remove-vm_fault_write.patch mm-ksm-fix-ksm-cow-breaking-with-userfaultfd-wp-via-fault_flag_unshare.patch mm-pagewalk-add-walk_page_range_vma.patch mm-ksm-convert-break_ksm-to-use-walk_page_range_vma.patch mm-gup-remove-foll_migration.patch