Skip to contentSkip to conversation

mm-khugepaged-check-thp-flag-in-hugepage_vma_check.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jul 18, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm: khugepaged: check THP flag in hugepage_vma_check()
has been removed from the -mm tree. Its filename was
mm-khugepaged-check-thp-flag-in-hugepage_vma_check.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: khugepaged: check THP flag in hugepage_vma_check()
Date: Thu, 16 Jun 2022 10:48:34 -0700

Patch series "Cleanup transhuge_xxx helpers", v5.

This series is the follow-up of the discussion about cleaning up transhuge_xxx helpers at
https://lore.kernel.org/linux-mm/[email protected]/.

THP has a bunch of helpers that do VMA sanity check for different paths, they do the similar checks for the most callsites and have a lot duplicate codes. And it is confusing what helpers should be used at what conditions.

This series reorganized and cleaned up the code so that we could consolidate all the checks into hugepage_vma_check().

The transhuge_vma_enabled(), transparent_hugepage_active() and __transparent_hugepage_enabled() are killed by this series.

This patch (of 7):

Currently the THP flag check in hugepage_vma_check() will fallthrough if the flag is NEVER and VM_HUGEPAGE is set. This is not a problem for now since all the callers have the flag checked before or can't be invoked if the flag is NEVER.

However, the following patch will call hugepage_vma_check() in more places, for example, page fault, so this flag must be checked in hugepge_vma_check().

---

 mm/khugepaged.c |    3 +++
 1 file changed, 3 insertions(+)
mm/khugepaged.c renamed from mm/khugepaged.c~mm-khugepaged-check-thp-flag-in-hugepage_vma_check +3 -0
@@ -451,6 +451,9 @@ bool hugepage_vma_check(struct vm_area_s
 	if (shmem_file(vma->vm_file))
 		return shmem_huge_enabled(vma);
 
+	if (!khugepaged_enabled())
+		return false;
+
 	/* THP settings require madvise. */
 	if (!(vm_flags & VM_HUGEPAGE) && !khugepaged_always())
 		return false;

_

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