mm-thp-kill-__transhuge_page_enabled.patch removed from -mm tree
The quilt patch titled
Subject: mm: thp: kill __transhuge_page_enabled()
has been removed from the -mm tree. Its filename was
mm-thp-kill-__transhuge_page_enabled.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: kill __transhuge_page_enabled()
Date: Thu, 16 Jun 2022 10:48:38 -0700
The page fault path checks THP eligibility with __transhuge_page_enabled() which does the similar thing as hugepage_vma_check(), so use hugepage_vma_check() instead.
However page fault allows DAX and !anon_vma cases, so added a new flag, in_pf, to hugepage_vma_check() to make page fault work correctly.
The in_pf flag is also used to skip shmem and file THP for page fault since shmem handles THP in its own shmem_fault() and file THP allocation on fault is not supported yet.
Also remove hugepage_vma_enabled() since hugepage_vma_check() is the only caller now, it is not necessary to have a helper function.
---
fs/proc/task_mmu.c | 2 - include/linux/huge_mm.h | 57 +------------------------------------- mm/huge_memory.c | 51 ++++++++++++++++++++++++++-------- mm/khugepaged.c | 8 ++--- mm/memory.c | 7 +++- 5 files changed, 52 insertions(+), 73 deletions(-)
fs/proc/task_mmu.c renamed from fs/proc/task_mmu.c~mm-thp-kill-__transhuge_page_enabled +1 -1
@@ -863,7 +863,7 @@ static int show_smap(struct seq_file *m,__show_smap (m, &mss, false);seq_printf (m,"THPeligible: %d\n" , -hugepage_vma_check (vma, vma->vm_flags, true)); +hugepage_vma_check (vma, vma->vm_flags, true, false));if (arch_pkeys_enabled ())seq_printf (m,"ProtectionKey: %8u\n" ,vma_pkey (vma));
include/linux/huge_mm.h renamed from include/linux/huge_mm.h~mm-thp-kill-__transhuge_page_enabled +2 -55
83 lines not on this page · raw message
mm/huge_memory.c renamed from mm/huge_memory.c~mm-thp-kill-__transhuge_page_enabled +40 -11
83 lines not on this page · raw message
mm/khugepaged.c renamed from mm/khugepaged.c~mm-thp-kill-__transhuge_page_enabled +4 -4
@@ -466,7 +466,7 @@ void khugepaged_enter_vma(struct vm_area {if (!test_bit (MMF_VM_HUGEPAGE , &vma->vm_mm->flags) &&khugepaged_enabled ()) { -if (hugepage_vma_check (vma, vm_flags, false)) +if (hugepage_vma_check (vma, vm_flags, false, false))__khugepaged_enter (vma->vm_mm); } }
@@ -916,7 +916,7 @@ static int hugepage_vma_revalidate(strucif (!transhuge_vma_suitable (vma, address))return SCAN_ADDRESS_RANGE ; -if (!hugepage_vma_check (vma, vma->vm_flags, false)) +if (!hugepage_vma_check (vma, vma->vm_flags, false, false))return SCAN_VMA_CHECK ;/* * Anon VMA expected, the address may be unmapped then
@@ -1401,7 +1401,7 @@ void collapse_pte_mapped_thp(struct mm_s* the valid THP. Add extra VM_HUGEPAGE so hugepage_vma_check() * will not fail the vma for missing VM_HUGEPAGE */ -if (!hugepage_vma_check (vma, vma->vm_flags |VM_HUGEPAGE , false)) +if (!hugepage_vma_check (vma, vma->vm_flags |VM_HUGEPAGE , false, false))return ;/* Keep pmd pgtable for uffd-wp; see comment in retract_page_tables() */
@@ -2091,7 +2091,7 @@ static unsigned int khugepaged_scan_mm_s progress++;break ; } -if (!hugepage_vma_check (vma, vma->vm_flags, false)) { +if (!hugepage_vma_check (vma, vma->vm_flags, false, false)) { skip: progress++;continue ;
mm/memory.c renamed from mm/memory.c~mm-thp-kill-__transhuge_page_enabled +5 -2
@@ -4970,6 +4970,7 @@ static vm_fault_t __handle_mm_fault(stru .gfp_mask = __get_fault_gfp_mask(vma), };struct mm_struct *mm = vma->vm_mm; +unsigned long vm_flags = vma->vm_flags;pgd_t *pgd;p4d_t *p4d;vm_fault_t ret;
@@ -4983,7 +4984,8 @@ static vm_fault_t __handle_mm_fault(struif (!vmf.pud)return VM_FAULT_OOM ; retry_pud: -if (pud_none (*vmf.pud) &&__transparent_hugepage_enabled (vma)) { +if (pud_none (*vmf.pud) && +hugepage_vma_check (vma, vm_flags, false, true)) { ret =create_huge_pud (&vmf);if (!(ret &VM_FAULT_FALLBACK ))return ret;
@@ -5016,7 +5018,8 @@ retry_pud:if (pud_trans_unstable (vmf.pud)) goto retry_pud; -if (pmd_none (*vmf.pmd) &&__transparent_hugepage_enabled (vma)) { +if (pmd_none (*vmf.pmd) && +hugepage_vma_check (vma, vm_flags, false, true)) { ret =create_huge_pmd (&vmf);if (!(ret &VM_FAULT_FALLBACK ))return ret;
_
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