mm-thp-fix-mm-thp-kill-__transhuge_page_enabled.patch removed from -mm tree
The quilt patch titled
Subject: mm/thp: fix "mm: thp: kill __transhuge_page_enabled()"
has been removed from the -mm tree. Its filename was
mm-thp-fix-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: "Zach O'Keefe" <[email protected]>
Subject: mm/thp: fix "mm: thp: kill __transhuge_page_enabled()"
Date: Mon, 25 Sep 2023 13:01:10 -0700
The 6.0 commits:
commit 9fec51689ff6 ("mm: thp: kill transparent_hugepage_active()") commit 7da4e2cb8b1f ("mm: thp: kill __transhuge_page_enabled()")
merged "can we have THPs in this VMA?" logic that was previously done separately by fault-path, khugepaged, and smaps "THPeligible" checks.
During the process, the semantics of the fault path check changed in two ways:
1) A VM_NO_KHUGEPAGED check was introduced (also added to smaps path).
2) We no longer checked if non-anonymous memory had a vm_ops->huge_fault handler that could satisfy the fault. Previously, this check had been done in create_huge_pud() and create_huge_pmd() routines, but after the changes, we never reach those routines.
During the review of the above commits, it was determined that in-tree users weren't affected by the change; most notably, since the only relevant user (in terms of THP) of VM_MIXEDMAP or ->huge_fault is DAX, which is explicitly approved early in approval logic. However, this was a bad assumption to make as it assumes the only reason to support ->huge_fault was for DAX (which is not true in general).
Remove the VM_NO_KHUGEPAGED check when not in collapse path and give any ->huge_fault handler a chance to handle the fault. Note that we don't validate the file mode or mapping alignment, which is consistent with the behavior before the aforementioned commits.
---
mm/huge_memory.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
mm/huge_memory.c renamed from mm/huge_memory.c~mm-thp-fix-mm-thp-kill-__transhuge_page_enabled +13 -7
@@ -100,11 +100,11 @@ bool hugepage_vma_check(struct vm_area_sreturn in_pf;/* -* Special VMA and hugetlb VMA. +* khugepaged special VMA and hugetlb VMA. * Must be checked after dax since some dax mappings may have * VM_MIXEDMAP set. */ -if (vm_flags &VM_NO_KHUGEPAGED ) +if (!in_pf && !smaps && (vm_flags &VM_NO_KHUGEPAGED ))return false;/*
@@ -132,12 +132,18 @@ bool hugepage_vma_check(struct vm_area_s !hugepage_flags_always())))return false; -/* Only regular file is valid */ -if (!in_pf &&file_thp_enabled (vma)) -return true; - -if (!vma_is_anonymous (vma)) +if (!vma_is_anonymous (vma)) { +/* +* Trust that ->huge_fault() handlers know what they are doing +* in fault path. +*/ +if (((in_pf || smaps)) && vma->vm_ops->huge_fault) +return true; +/* Only regular file is valid in collapse path */ +if (((!in_pf || smaps)) &&file_thp_enabled (vma)) +return true;return false; + }if (vma_is_temporary_stack (vma))return false;
_
Patches currently in -mm which might be from [email protected] are