Skip to contentSkip to conversation

mm-collapse-add-collapseh-for-the-collapse-interface.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Oct 24

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/collapse: add collapse.h for the collapse interface
has been removed from the -mm tree. Its filename was
mm-collapse-add-collapseh-for-the-collapse-interface.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: add collapse.h for the collapse interface
Date: Wed, 14 Oct 2026 18:11:37 +0100

khugepaged.c holds both the users of collapse and the machinery that performs it. The daemon's scan loop, the sysfs tunables, MADV_COLLAPSE's entry point and the collapse itself all sit in one file and reach into each other freely. Nothing marks where a user ends and the engine begins.

Start drawing that line.

Add mm/collapse.h for what the two sides have to agree on:

- enum scan_result - what the engine hands back;
- struct collapse_control - the state a request carries.

And two constants move with them:

- KHUGEPAGED_MAX_PTES_LIMIT -> COLLAPSE_MAX_PTES_LIMIT;
- KHUGEPAGED_MIN_MTHP_ORDER -> COLLAPSE_MIN_MTHP_ORDER.

Neither is a fact about the daemon, so both lose the KHUGEPAGED_ prefix.

No functional change.

---

 MAINTAINERS     |    1 
 mm/collapse.h   |   64 +++++++++++++++++++++++++++++++++++++
 mm/khugepaged.c |   79 +++++++---------------------------------------
 3 files changed, 78 insertions(+), 66 deletions(-)
MAINTAINERS renamed from MAINTAINERS~mm-collapse-add-collapseh-for-the-collapse-interface +1 -0
@@ -17452,6 +17452,7 @@ F:	Documentation/admin-guide/mm/transhug
 F:	include/linux/huge_mm.h
 F:	include/linux/khugepaged.h
 F:	include/trace/events/huge_memory.h
+F:	mm/collapse.h
 F:	mm/huge_memory.c
 F:	mm/khugepaged.c
 F:	mm/mm_slot.h
mm/collapse.h new file +64 -0

64 lines not on this page · raw message

mm/khugepaged.c renamed from mm/khugepaged.c~mm-collapse-add-collapseh-for-the-collapse-interface +13 -66

150 lines not on this page · raw message

_

Patches currently in -mm which might be from [email protected] are