mm-khugepaged-map-dirty-writeback-pages-failures-to-eagain.patch removed from -mm tree
The quilt patch titled
Subject: mm/khugepaged: map dirty/writeback pages failures to EAGAIN
has been removed from the -mm tree. Its filename was
mm-khugepaged-map-dirty-writeback-pages-failures-to-eagain.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: Shivank Garg <[email protected]>
Subject: mm/khugepaged: map dirty/writeback pages failures to EAGAIN
Date: Sun, 18 Jan 2026 19:09:40 +0000
Patch series "mm/khugepaged: fix dirty page handling for MADV_COLLAPSE", v5.
MADV_COLLAPSE on file-backed mappings fails with -EINVAL when TEXT pages are dirty. This affects scenarios like package/container updates or executing binaries immediately after writing them, etc.
The issue is that collapse_file() triggers async writeback and returns SCAN_FAIL (maps to -EINVAL), expecting khugepaged to revisit later. But MADV_COLLAPSE is synchronous and userspace expects immediate success or a clear retry signal.
Reproduction:
- Compile or copy 2MB-aligned executable to XFS/ext4 FS
- Call MADV_COLLAPSE on .text section
- First call fails with -EINVAL (text pages dirty from copy)
- Second call succeeds (async writeback completed)
Issue Report:
https://lore.kernel.org/all/[email protected]
This patch (of 2):
When collapse_file encounters dirty or writeback pages in file-backed mappings, it currently returns SCAN_FAIL which maps to -EINVAL. This is misleading as EINVAL suggests invalid arguments, whereas dirty/writeback pages represent transient conditions that may resolve on retry.
Introduce SCAN_PAGE_DIRTY_OR_WRITEBACK to cover both dirty and writeback states, mapping it to -EAGAIN. For MADV_COLLAPSE, this provides userspace with a clear signal that retry may succeed after writeback completes. For khugepaged, this is harmless as it will naturally revisit the range during periodic scans after async writeback completes.
---
include/trace/events/huge_memory.h | 3 ++- mm/khugepaged.c | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-)
include/trace/events/huge_memory.h renamed from include/trace/events/huge_memory.h~mm-khugepaged-map-dirty-writeback-pages-failures-to-eagain +2 -1
@@ -37,7 +37,8 @@ EM( SCAN_PAGE_HAS_PRIVATE, "page_has_private") \ EM( SCAN_STORE_FAILED, "store_failed") \ EM( SCAN_COPY_MC, "copy_poisoned_page") \ - EMe(SCAN_PAGE_FILLED, "page_filled") + EM( SCAN_PAGE_FILLED, "page_filled") \ + EMe(SCAN_PAGE_DIRTY_OR_WRITEBACK, "page_dirty_or_writeback")#undef EM#undef EMe
mm/khugepaged.c renamed from mm/khugepaged.c~mm-khugepaged-map-dirty-writeback-pages-failures-to-eagain +5 -3
@@ -58,6 +58,7 @@ enum scan_result {SCAN_STORE_FAILED ,SCAN_COPY_MC ,SCAN_PAGE_FILLED , + SCAN_PAGE_DIRTY_OR_WRITEBACK, };#define CREATE_TRACE_POINTS
@@ -1967,11 +1968,11 @@ static int collapse_file(struct mm_struc*/ xas_unlock_irq (&xas);filemap_flush (mapping); - result =SCAN_FAIL ; + result =SCAN_PAGE_DIRTY_OR_WRITEBACK ; goto xa_unlocked; }else if (folio_test_writeback (folio)) {xas_unlock_irq (&xas); - result =SCAN_FAIL ; + result =SCAN_PAGE_DIRTY_OR_WRITEBACK ; goto xa_unlocked; }else if (folio_trylock (folio)) {folio_get (folio);
@@ -2018,7 +2019,7 @@ static int collapse_file(struct mm_struc* folio is dirty because it hasn't been flushed * since first write. */ - result =SCAN_FAIL ; + result =SCAN_PAGE_DIRTY_OR_WRITEBACK ; goto out_unlock; }
@@ -2747,6 +2748,7 @@ static int madvise_collapse_errno(enum scase SCAN_PAGE_LRU :case SCAN_DEL_PAGE_LRU :case SCAN_PAGE_FILLED : +case SCAN_PAGE_DIRTY_OR_WRITEBACK :return -EAGAIN ;/* * Other: Trying again likely not to succeed / error intrinsic to
_
Patches currently in -mm which might be from [email protected] are
mm-khugepaged-remove-unnecessary-goto-skip-label.patch mm-khugepaged-change-collapse_pte_mapped_thp-to-return-void.patch mm-khugepaged-use-enum-scan_result-for-result-variables-and-return-types.patch mm-khugepaged-make-khugepaged_collapse_control-static.patch