mm-thp-consolidate-vma-size-check-to-transhuge_vma_suitable.patch removed from -mm tree
The quilt patch titled
Subject: mm: thp: consolidate vma size check to transhuge_vma_suitable
has been removed from the -mm tree. Its filename was
mm-thp-consolidate-vma-size-check-to-transhuge_vma_suitable.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: Yang Shi <[email protected]>
Subject: mm: thp: consolidate vma size check to transhuge_vma_suitable
Date: Thu, 16 Jun 2022 10:48:35 -0700
There are couple of places that check whether the vma size is ok for THP or whether address fits, they are open coded and duplicate, use transhuge_vma_suitable() to do the job by passing in (vma->end - HPAGE_PMD_SIZE).
Move vma size check into hugepage_vma_check(). This will make khugepaged_enter() is as same as khugepaged_enter_vma(). There is just one caller for khugepaged_enter(), replace it to khugepaged_enter_vma() and remove khugepaged_enter().
---
include/linux/huge_mm.h | 11 +++++++++++ include/linux/khugepaged.h | 14 -------------- mm/huge_memory.c | 2 +- mm/khugepaged.c | 19 ++++++------------- 4 files changed, 18 insertions(+), 28 deletions(-)
include/linux/huge_mm.h renamed from include/linux/huge_mm.h~mm-thp-consolidate-vma-size-check-to-transhuge_vma_suitable +11 -0
@@ -116,6 +116,17 @@ extern struct kobj_attribute shmem_enablextern unsigned long transparent_hugepage_flags; +/* +* Do the below checks: +* - For file vma, check if the linear page offset of vma is +* HPAGE_PMD_NR aligned within the file. The hugepage is +* guaranteed to be hugepage-aligned within the file, but we must +* check that the PMD-aligned addresses in the VMA map to +* PMD-aligned offsets within the file, else the hugepage will +* not be PMD-mappable. +* - For all vmas, check if the haddr is in an aligned HPAGE_PMD_SIZE +* area. +*/ static inline bool transhuge_vma_suitable (struct vm_area_struct *vma,unsigned long addr) {
include/linux/khugepaged.h renamed from include/linux/khugepaged.h~mm-thp-consolidate-vma-size-check-to-transhuge_vma_suitable +0 -14
@@ -51,16 +51,6 @@ static inline void khugepaged_exit(strucif (test_bit (MMF_VM_HUGEPAGE , &mm->flags)) __khugepaged_exit(mm); } - -static inline void khugepaged_enter (struct vm_area_struct *vma, -unsigned long vm_flags) -{ -if (!test_bit (MMF_VM_HUGEPAGE , &vma->vm_mm->flags) && -khugepaged_enabled ()) { -if (hugepage_vma_check (vma, vm_flags)) -__khugepaged_enter (vma->vm_mm); - } -}#else /* CONFIG_TRANSPARENT_HUGEPAGE */ static inline void khugepaged_fork (struct mm_struct *mm,struct mm_struct *oldmm) {
@@ -68,10 +58,6 @@ static inline void khugepaged_fork(strucstatic inline void khugepaged_exit (struct mm_struct *mm) { } -static inline void khugepaged_enter (struct vm_area_struct *vma, -unsigned long vm_flags) -{ -}static inline void khugepaged_enter_vma (struct vm_area_struct *vma,unsigned long vm_flags) {
mm/huge_memory.c renamed from mm/huge_memory.c~mm-thp-consolidate-vma-size-check-to-transhuge_vma_suitable +1 -1
@@ -726,7 +726,7 @@ vm_fault_t do_huge_pmd_anonymous_page(streturn VM_FAULT_FALLBACK ;if (unlikely (anon_vma_prepare (vma)))return VM_FAULT_OOM ; -khugepaged_enter (vma, vma->vm_flags); +khugepaged_enter_vma (vma, vma->vm_flags); if (!(vmf->flags & FAULT_FLAG_WRITE) && !mm_forbids_zeropage(vma->vm_mm) &&
mm/khugepaged.c renamed from mm/khugepaged.c~mm-thp-consolidate-vma-size-check-to-transhuge_vma_suitable +6 -13
@@ -443,8 +443,8 @@ bool hugepage_vma_check(struct vm_area_sif (vma_is_dax (vma))return false; -if (vma->vm_file && !IS_ALIGNED ((vma->vm_start >>PAGE_SHIFT ) - - vma->vm_pgoff,HPAGE_PMD_NR )) +/* Check alignment for file vma and size for both file and anon vma */ +if (!transhuge_vma_suitable (vma, (vma->vm_end -HPAGE_PMD_SIZE )))return false;/* Enabled via shmem mount options or sysfs settings. */
@@ -505,9 +505,7 @@ void khugepaged_enter_vma(struct vm_area unsigned long vm_flags) {if (!test_bit (MMF_VM_HUGEPAGE , &vma->vm_mm->flags) && -khugepaged_enabled () && - (((vma->vm_start + ~HPAGE_PMD_MASK ) &HPAGE_PMD_MASK ) < - (vma->vm_end &HPAGE_PMD_MASK ))) { +khugepaged_enabled ()) {if (hugepage_vma_check (vma, vm_flags))__khugepaged_enter (vma->vm_mm); }
@@ -948,7 +946,6 @@ static int hugepage_vma_revalidate(struc struct vm_area_struct **vmap) {struct vm_area_struct *vma; -unsigned long hstart, hend;if (unlikely (khugepaged_test_exit (mm)))return SCAN_ANY_PROCESS ;
@@ -957,9 +954,7 @@ static int hugepage_vma_revalidate(strucif (!vma)return SCAN_VMA_NULL ; - hstart = (vma->vm_start + ~HPAGE_PMD_MASK ) &HPAGE_PMD_MASK ; - hend = vma->vm_end &HPAGE_PMD_MASK ; -if (address < hstart || address +HPAGE_PMD_SIZE > hend) +if (!transhuge_vma_suitable (vma, address))return SCAN_ADDRESS_RANGE ;if (!hugepage_vma_check (vma, vma->vm_flags))return SCAN_VMA_CHECK ;
@@ -2135,10 +2130,8 @@ skip: progress++;continue ; } - hstart = (vma->vm_start + ~HPAGE_PMD_MASK ) &HPAGE_PMD_MASK ; - hend = vma->vm_end &HPAGE_PMD_MASK ; -if (hstart >= hend) - goto skip; + hstart =round_up (vma->vm_start,HPAGE_PMD_SIZE ); + hend =round_down (vma->vm_end,HPAGE_PMD_SIZE );if (khugepaged_scan.address > hend) goto skip;if (khugepaged_scan.address < hstart)
_
Patches currently in -mm which might be from [email protected] are
mm-khugepaged-dont-carry-huge-page-to-the-next-loop-for-config_numa.patch