mm-collapse-state-what-a-collapse-may-do-in-the-policy.patch removed from -mm tree
The quilt patch titled
Subject: mm/collapse: state what a collapse may do in the policy
has been removed from the -mm tree. Its filename was
mm-collapse-state-what-a-collapse-may-do-in-the-policy.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: "Kiryl Shutsemau (Meta)" <[email protected]>
Subject: mm/collapse: state what a collapse may do in the policy
Date: Wed, 14 Oct 2026 18:11:38 +0100
Tests scattered through the collapse path decide what a collapse is allowed to do by asking whether khugepaged started it. Between them they settle:
- which VMAs are eligible, and how hard to try for a folio;
- how many empty, swapped-out or shared PTEs a window may contain, and whether a sub-PMD window is held to a stricter rule than a PMD;
- whether a range has to look used, and whether a MADV_FREE'd page is left alone;
- whether the PMD is mapped as part of the request, and whether dirty pages are worth writing back and retrying.
None of those is a fact about khugepaged. Each is something the caller decided before asking, and the collapse code should not have to look up who called to find out.
Add struct collapse_policy for the caller to fill: khugepaged from its own settings, MADV_COLLAPSE from the fact that a user asked explicitly. Every test becomes a read of a field, and cc->is_khugepaged goes, having no reader left.
The PTE limits come as two sets, one for a PMD-sized window and one for anything smaller, so that the helpers pick a set for the order and read it. khugepaged takes no swapped-out or shared PTE into a sub-PMD window, and empty PTEs only when the knob says all or nothing; the warning for a knob value in between moves to where khugepaged fills its policy. The fields only one side reads say which: anon_ or file_. David Hildenbrand asked for both.
khugepaged fills the policy once per scan pass, MADV_COLLAPSE once per call. That is the one change in behaviour. The max_ptes_* limits and the defrag setting behind the allocation mask are sampled once per pass rather than on every table. A table scanned early in a pass and one scanned late are then treated alike.
collapse_file() also drops a NULL check on the collapse_control. It has one call site, reached only from collapse_single_pmd(), which dereferences cc unconditionally, so the check was already dead.
---
mm/collapse.h | 41 ++++++++++++ mm/khugepaged.c | 147 ++++++++++++++++++++++++---------------------- 2 files changed, 118 insertions(+), 70 deletions(-)
mm/collapse.h renamed from mm/collapse.h~mm-collapse-state-what-a-collapse-may-do-in-the-policy +40 -1
@@ -45,8 +45,47 @@ enum scan_result { SCAN_PAGE_DIRTY_OR_WRITEBACK, }; +/* How many PTEs of a window may be missing, swapped out or shared */ +struct collapse_limits { +/* Counted over a PMD-sized window; HPAGE_PMD_NR means "no limit" */ +unsigned int max_ptes_none; +unsigned int max_ptes_swap; +unsigned int max_ptes_shared; +}; + +/* What a collapse is allowed to do, decided by the caller that asks for it */ +struct collapse_policy { +/* Limits for a PMD-sized window */ +struct collapse_limits pmd; + +/* +* Limits for a smaller window. Its max_ptes_none is either 0 or +* COLLAPSE_MAX_PTES_LIMIT, the latter meaning all but one PTE of the +* window whatever its order; any other value counts as 0. +*/ +struct collapse_limits sub_pmd; + +/* Leave clean lazyfree folios to reclaim rather than collapse them */ +bool anon_skip_lazyfree; + +/* Refuse an anonymous range with no sign of use */ +bool anon_require_referenced; + +/* Map the PMD over a file collapse instead of leaving it to a fault */ +bool file_install_pmd; + +/* Write dirty pages back and retry once instead of refusing them */ +bool file_writeback_dirty; + +/* How hard to try for a destination folio */ +gfp_t gfp; + +/* Which VMAs are eligible, as thp_vma_allowable_orders() spells it */ +enum tva_type tva_type; +}; +struct collapse_control { -bool is_khugepaged; +struct collapse_policy policy;/* Num pages scanned per node */ u32 node_load[MAX_NUMNODES ];
mm/khugepaged.c renamed from mm/khugepaged.c~mm-collapse-state-what-a-collapse-may-do-in-the-policy +78 -69
264 lines not on this page · raw message
_
Patches currently in -mm which might be from [email protected] are