mm-mprotect-factor-out-check-whether-manual-pte-write-upgrades-are-required.patch removed from -mm tree
The quilt patch titled
Subject: mm/mprotect: factor out check whether manual PTE write upgrades are required
has been removed from the -mm tree. Its filename was
mm-mprotect-factor-out-check-whether-manual-pte-write-upgrades-are-required.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/mprotect: factor out check whether manual PTE write upgrades are required
Date: Tue, 8 Nov 2022 18:46:49 +0100
Let's factor the check out into vma_wants_manual_pte_write_upgrade(), to be reused in NUMA hinting fault context soon.
---
include/linux/mm.h | 16 ++++++++++++++-- mm/mprotect.c | 17 ++++------------- 2 files changed, 18 insertions(+), 15 deletions(-)
include/linux/mm.h renamed from include/linux/mm.h~mm-mprotect-factor-out-check-whether-manual-pte-write-upgrades-are-required +14 -2
@@ -2088,6 +2088,20 @@ extern unsigned long move_page_tables(st#define MM_CP_UFFD_WP_ALL (MM_CP_UFFD_WP | \ MM_CP_UFFD_WP_RESOLVE) +int vma_wants_writenotify (struct vm_area_struct *vma,pgprot_t vm_page_prot); +static inline bool vma_wants_manual_pte_write_upgrade (struct vm_area_struct *vma) +{ +/* +* We want to check manually if we can change individual PTEs writable +* if we can't do that automatically for all PTEs in a mapping. For +* private mappings, that's always the case when we have write +* permissions as we properly have to handle COW. +*/ +if (vma->vm_flags &VM_SHARED ) +return vma_wants_writenotify (vma, vma->vm_page_prot); +return !!(vma->vm_flags &VM_WRITE ); + +} extern unsigned long change_protection(struct mmu_gather *tlb, struct vm_area_struct *vma, unsigned long start, unsigned long end, pgprot_t newprot,
@@ -2227,8 +2241,6 @@ static inline int pte_devmap(pte_t pte) }#endif -int vma_wants_writenotify (struct vm_area_struct *vma,pgprot_t vm_page_prot); -extern pte_t *__get_locked_pte (struct mm_struct *mm,unsigned long addr,spinlock_t **ptl); static inline pte_t *get_locked_pte(struct mm_struct *mm, unsigned long addr,
mm/mprotect.c renamed from mm/mprotect.c~mm-mprotect-factor-out-check-whether-manual-pte-write-upgrades-are-required +4 -13
@@ -558,8 +558,8 @@ mprotect_fixup(struct mmu_gather *tlb, sstruct mm_struct *mm = vma->vm_mm;unsigned long oldflags = vma->vm_flags;long nrpages = (end - start) >>PAGE_SHIFT ; +unsigned int mm_cp_flags =0 ;unsigned long charged =0 ; -bool try_change_writable;pgoff_t pgoff;int error;
@@ -637,20 +637,11 @@ success:* held in write mode. */ vma->vm_flags = newflags; -/* -* We want to check manually if we can change individual PTEs writable -* if we can't do that automatically for all PTEs in a mapping. For -* private mappings, that's always the case when we have write -* permissions as we properly have to handle COW. -*/ -if (vma->vm_flags &VM_SHARED ) - try_change_writable =vma_wants_writenotify (vma, vma->vm_page_prot); -else - try_change_writable = !!(vma->vm_flags &VM_WRITE ); +if (vma_wants_manual_pte_write_upgrade (vma)) + mm_cp_flags |=MM_CP_TRY_CHANGE_WRITABLE ;vma_set_page_prot (vma); -change_protection (tlb, vma, start, end, vma->vm_page_prot, - try_change_writable ?MM_CP_TRY_CHANGE_WRITABLE :0 ); +change_protection (tlb, vma, start, end, vma->vm_page_prot, mm_cp_flags);/* * Private VM_LOCKED VMA becoming writable: trigger COW to avoid major
_
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