mm-khugepaged-retry-with-sync-writeback-for-madv_collapse.patch removed from -mm tree
The quilt patch titled
Subject: mm/khugepaged: retry with sync writeback for MADV_COLLAPSE
has been removed from the -mm tree. Its filename was
mm-khugepaged-retry-with-sync-writeback-for-madv_collapse.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: retry with sync writeback for MADV_COLLAPSE
Date: Sun, 18 Jan 2026 19:09:43 +0000
When MADV_COLLAPSE is called on file-backed mappings (e.g., executable text sections), the pages may still be dirty from recent writes. collapse_file() will trigger async writeback and fail with SCAN_PAGE_DIRTY_OR_WRITEBACK (-EAGAIN).
MADV_COLLAPSE is a synchronous operation where userspace expects immediate results. If the collapse fails due to dirty pages, perform synchronous writeback on the specific range and retry once.
This avoids spurious failures for freshly written executables while avoiding unnecessary synchronous I/O for mappings that are already clean.
---
mm/khugepaged.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
mm/khugepaged.c renamed from mm/khugepaged.c~mm-khugepaged-retry-with-sync-writeback-for-madv_collapse +15 -0
@@ -22,6 +22,7 @@#include <linux/dax.h> #include <linux/ksm.h> #include <linux/pgalloc.h> +#include <linux/backing-dev.h> #include <asm/tlb.h> #include "internal.h"
@@ -2788,7 +2789,9 @@ int madvise_collapse(struct vm_area_strufor (addr = hstart; addr < hend; addr +=HPAGE_PMD_SIZE ) {int result =SCAN_FAIL ; +bool triggered_wb = false; +retry:if (!mmap_locked) {cond_resched ();mmap_read_lock (mm);
@@ -2809,8 +2812,20 @@ int madvise_collapse(struct vm_area_strummap_read_unlock (mm); mmap_locked = false; + *lock_dropped = true; result =hpage_collapse_scan_file (mm, addr, file, pgoff, cc); + +if (result ==SCAN_PAGE_DIRTY_OR_WRITEBACK && !triggered_wb && +mapping_can_writeback (file->f_mapping)) { +loff_t lstart = (loff_t )pgoff <<PAGE_SHIFT ; +loff_t lend = lstart +HPAGE_PMD_SIZE -1 ; + +filemap_write_and_wait_range (file->f_mapping, lstart, lend); + triggered_wb = true; +fput (file); + goto retry; + }fput (file); }else { result = hpage_collapse_scan_pmd(mm, vma, addr,
_
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