mm-khugepaged-introduce-collapse_possible_orders-helper-functions.patch removed from -mm tree
The quilt patch titled
Subject: mm/khugepaged: introduce collapse_possible_orders helper functions
has been removed from the -mm tree. Its filename was
mm-khugepaged-introduce-collapse_possible_orders-helper-functions.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: Nico Pache <[email protected]>
Subject: mm/khugepaged: introduce collapse_possible_orders helper functions
Date: Fri, 5 Jun 2026 10:14:17 -0600
Add collapse_possible_orders() to generalize THP order eligibility. The function determines which THP orders are permitted based on collapse context (khugepaged vs madv_collapse). We also add collapse_possible() as a thin wrapper around collapse_possible_orders() that returns a bool rather than the whole bitmap.
This consolidates collapse configuration logic and provides a clean interface for future mTHP collapse support where the orders may be different.
---
mm/khugepaged.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)
mm/khugepaged.c renamed from mm/khugepaged.c~mm-khugepaged-introduce-collapse_possible_orders-helper-functions +21 -3
@@ -554,12 +554,30 @@ void __khugepaged_enter(struct mm_structwake_up_interruptible (&khugepaged_wait); } +/* +* Check what orders are possible based on the vma and collapse type. +* This is used to determine if mTHP collapse is a viable option. +*/ +static unsigned long collapse_possible_orders (struct vm_area_struct *vma, +vm_flags_t vm_flags,enum tva_type tva_flags) +{ +const unsigned long orders =BIT (HPAGE_PMD_ORDER ); + +return thp_vma_allowable_orders (vma, vm_flags, tva_flags, orders); +} + +static bool collapse_possible (struct vm_area_struct *vma, +vm_flags_t vm_flags,enum tva_type tva_flags) +{ +return collapse_possible_orders (vma, vm_flags, tva_flags); +} +void khugepaged_enter_vma (struct vm_area_struct *vma,vm_flags_t vm_flags) {if (!mm_flags_test (MMF_VM_HUGEPAGE , vma->vm_mm) &&hugepage_pmd_enabled ()) { -if (thp_vma_allowable_order (vma, vm_flags,TVA_KHUGEPAGED ,PMD_ORDER )) +if (collapse_possible (vma, vm_flags,TVA_KHUGEPAGED ))__khugepaged_enter (vma->vm_mm); } }
@@ -2705,7 +2723,7 @@ static void collapse_scan_mm_slot(unsign cc->progress++;break ; } -if (!thp_vma_allowable_order (vma, vma->vm_flags,TVA_KHUGEPAGED ,PMD_ORDER )) { +if (!collapse_possible (vma, vma->vm_flags,TVA_KHUGEPAGED )) { cc->progress++;continue ; }
@@ -3015,7 +3033,7 @@ int madvise_collapse(struct vm_area_struBUG_ON (vma->vm_start > start);BUG_ON (vma->vm_end < end); -if (!thp_vma_allowable_order (vma, vma->vm_flags,TVA_FORCED_COLLAPSE ,PMD_ORDER )) +if (!collapse_possible (vma, vma->vm_flags,TVA_FORCED_COLLAPSE ))return -EINVAL ; cc =kmalloc_obj (*cc);
_
Patches currently in -mm which might be from [email protected] are