mm-khugepaged-keep-mm-in-mm_slot-without-mmf_disable_thp-check.patch removed from -mm tree
The quilt patch titled
Subject: mm/khugepaged: keep mm in mm_slot without MMF_DISABLE_THP check
has been removed from the -mm tree. Its filename was
mm-khugepaged-keep-mm-in-mm_slot-without-mmf_disable_thp-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: Lance Yang <[email protected]>
Subject: mm/khugepaged: keep mm in mm_slot without MMF_DISABLE_THP check
Date: Tue, 27 Feb 2024 11:51:35 +0800
Previously, we removed the mm from mm_slot and dropped mm_count if the MMF_THP_DISABLE flag was set. However, we didn't re-add the mm back after clearing the MMF_THP_DISABLE flag. Additionally, We add a check for the MMF_THP_DISABLE flag in hugepage_vma_revalidate().
---
mm/khugepaged.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
mm/khugepaged.c renamed from mm/khugepaged.c~mm-khugepaged-keep-mm-in-mm_slot-without-mmf_disable_thp-check +3 -3
@@ -920,7 +920,7 @@ static int hugepage_vma_revalidate(struc {struct vm_area_struct *vma; -if (unlikely (hpage_collapse_test_exit (mm))) +if (unlikely (hpage_collapse_test_exit_or_disable (mm)))return SCAN_ANY_PROCESS ; *vmap = vma =find_vma (mm, address);
@@ -1428,7 +1428,7 @@ static void collect_mm_slot(struct khugelockdep_assert_held (&khugepaged_mm_lock); -if (hpage_collapse_test_exit_or_disable (mm)) { +if (hpage_collapse_test_exit (mm)) {/* free mm_slot */ hash_del (&slot->hash);list_del (&slot->mm_node);
@@ -2456,7 +2456,7 @@ breakouterloop_mmap_lock:* Release the current mm_slot if this mm is about to die, or * if we scanned all vmas of this mm. */ -if (hpage_collapse_test_exit_or_disable (mm) || !vma) { +if (hpage_collapse_test_exit (mm) || !vma) {/* * Make sure that if mm_users is reaching zero while * khugepaged runs here, khugepaged_exit will find
_
Patches currently in -mm which might be from [email protected] are