mm-huge_memory-try-avoiding-write-faults-when-changing-pmd-protection.patch removed from -mm tree
The quilt patch titled
Subject: mm/huge_memory: try avoiding write faults when changing PMD protection
has been removed from the -mm tree. Its filename was
mm-huge_memory-try-avoiding-write-faults-when-changing-pmd-protection.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/huge_memory: try avoiding write faults when changing PMD protection
Date: Tue, 8 Nov 2022 18:46:48 +0100
Let's replicate what we have for PTEs in can_change_pte_writable() also for PMDs.
While this might look like a pure performance improvement, we'll us this to get rid of savedwrite handling in do_huge_pmd_numa_page() next. Place do_huge_pmd_numa_page() strategically good for that purpose.
Note that MM_CP_TRY_CHANGE_WRITABLE is currently only set when we come via mprotect_fixup().
---
mm/huge_memory.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-)
mm/huge_memory.c renamed from mm/huge_memory.c~mm-huge_memory-try-avoiding-write-faults-when-changing-pmd-protection +36 -2
@@ -1390,6 +1390,36 @@ fallback:return VM_FAULT_FALLBACK ; } +static inline bool can_change_pmd_writable (struct vm_area_struct *vma, +unsigned long addr,pmd_t pmd) +{ +struct page *page; + +if (WARN_ON_ONCE (!(vma->vm_flags &VM_WRITE ))) +return false; + +/* Don't touch entries that are not even readable (NUMA hinting). */ +if (pmd_protnone (pmd)) +return false; + +/* Do we need write faults for softdirty tracking? */ +if (vma_soft_dirty_enabled (vma) && !pmd_soft_dirty (pmd)) +return false; + +/* Do we need write faults for uffd-wp tracking? */ +if (userfaultfd_huge_pmd_wp (vma, pmd)) +return false; + +if (!(vma->vm_flags &VM_SHARED )) { +/* See can_change_pte_writable(). */ + page =vm_normal_page_pmd (vma, addr, pmd); +return page &&PageAnon (page) &&PageAnonExclusive (page); + } + +/* See can_change_pte_writable(). */ +return pmd_dirty (pmd); +} +/* FOLL_FORCE can write to even unwritable PMDs in COW mappings. */ static inline bool can_follow_write_pmd(pmd_t pmd, struct page *page, struct vm_area_struct *vma,
@@ -1893,13 +1923,17 @@ int change_huge_pmd(struct mmu_gather *t*/ entry =pmd_clear_uffd_wp (entry); } + +/* See change_pte_range(). */ +if ((cp_flags &MM_CP_TRY_CHANGE_WRITABLE ) && !pmd_write (entry) && +can_change_pmd_writable (vma, addr, entry)) + entry =pmd_mkwrite (entry); + ret =HPAGE_PMD_NR ;set_pmd_at (mm, addr, pmd, entry);if (huge_pmd_needs_flush (oldpmd, entry))tlb_flush_pmd_range (tlb, addr,HPAGE_PMD_SIZE ); - -BUG_ON (vma_is_anonymous (vma) && !preserve_write &&pmd_write (entry)); unlock:spin_unlock (ptl);return ret;
_
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