On Wed, Feb 25, 2026 at 08:25:42PM -0700, Nico Pache wrote:
> Add collapse_allowable_orders() to generalize THP order eligibility. The
> function determines which THP orders are permitted based on collapse
> context (khugepaged vs madv_collapse).
>
> This consolidates collapse configuration logic and provides a clean
> interface for future mTHP collapse support where the orders may be
> different.
>
> Reviewed-by: Baolin Wang <[email protected]>
> Signed-off-by: Nico Pache <[email protected]>
> ---
> mm/khugepaged.c | 16 +++++++++++++---
> 1 file changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/mm/khugepaged.c b/mm/khugepaged.c
> index 2e66d660ee8e..2fdfb6d42cf9 100644
> --- a/mm/khugepaged.c
> +++ b/mm/khugepaged.c
> @@ -486,12 +486,22 @@ static unsigned int collapse_max_ptes_none(unsigned int
> order)
> return -EINVAL;
> }
>
> +/* Check what orders are allowed based on the vma and collapse type */
> +static unsigned long collapse_allowable_orders(struct vm_area_struct *vma,
> + vm_flags_t vm_flags, bool is_khugepaged)
You're always passing vma->vm_flags, maybe just pass vma and you can grab
vma->vm_flags?
Really it would be better for it to be &vma->flags, but probably best to wait
for me to do a follow up VMA flags series for that.
> +{
> + enum tva_type tva_flags = is_khugepaged ? TVA_KHUGEPAGED :
> TVA_FORCED_COLLAPSE;
> + unsigned long orders = BIT(HPAGE_PMD_ORDER);
Const?
Also not sure if we decided BIT() was right here or not :P For me fine though.
> +
> + return thp_vma_allowable_orders(vma, vm_flags, tva_flags, orders);
> +}
> +
> 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_allowable_orders(vma, vm_flags,
> /*is_khugepaged=*/true))
I agree with David, let's pass through the enum value please :)
> __khugepaged_enter(vma->vm_mm);
> }
> }
> @@ -2637,7 +2647,7 @@ static unsigned int collapse_scan_mm_slot(unsigned int
> pages, enum scan_result *
> progress++;
> break;
> }
> - if (!thp_vma_allowable_order(vma, vma->vm_flags,
> TVA_KHUGEPAGED, PMD_ORDER)) {
> + if (!collapse_allowable_orders(vma, vma->vm_flags,
> /*is_khugepaged=*/true)) {
> progress++;
> continue;
> }
> @@ -2949,7 +2959,7 @@ int madvise_collapse(struct vm_area_struct *vma,
> unsigned long start,
> BUG_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_allowable_orders(vma, vma->vm_flags,
> /*is_khugepaged=*/false))
> return -EINVAL;
>
> cc = kmalloc_obj(*cc);
> --
> 2.53.0
>
Cheers, Lorenzo
