FAILED: patch "[PATCH] fs/proc/task_mmu: fix PAGEMAP_SCAN written state for PMD" failed to apply to 6.6-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 40de8160ca7f67d14619ee0351ce5d68fc4a237a
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026080513-ambitious-sage-b240@gregkh' --subject-prefix 'PATCH 6.6.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 40de8160ca7f67d14619ee0351ce5d68fc4a237a Mon Sep 17 00:00:00 2001
From: "Kiryl Shutsemau (Meta)" <[email protected]>
Date: Wed, 15 Jul 2026 15:42:33 +0100
Subject: [PATCH] fs/proc/task_mmu: fix PAGEMAP_SCAN written state for PMD
holes
PAGEMAP_SCAN reports an unpopulated PTE in a uffd-wp VMA as written, but a range with no page table at all -- a PMD hole -- is skipped:pagemap_scan_pte_hole() tests p->cur_vma_category, which never carries PAGE_IS_WRITTEN, so the hole is neither reported nor (under PM_SCAN_WP_MATCHING) armed.
In a uffd-wp VMA, WP_UNPOPULATED installs uffd-wp markers when protecting a range, allocating page tables as needed, so an unpopulated slot is treated as written -- see the pte_none() handling in pagemap_page_category(). A missing marker therefore means the range was zapped, e.g. via MADV_DONTNEED. This applies to anon and shmem VMAs.
An anonymous THP is write-protected in place as a huge PMD, so a full-PMD MADV_DONTNEED clears it to pmd_none -- a hole with no page table -- and pagemap_scan_pte_hole() misses it. For a MAP_PRIVATE|MAP_ANON mapping MADV_DONTNEED has fill-with-zeros semantics, so a write-tracking checkpoint/migration tool (e.g. CRIU) treats the range as unchanged and keeps its previous contents; after restore or live migration the process reads stale data instead of zeroes -- data corruption.
Report a hole in a non-hugetlb uffd-wp VMA as written, matching the pte_none handling in pagemap_page_category(); the existing PM_SCAN_WP_MATCHING path then arms it via uffd_wp_range().
hugetlb is excluded: pagemap_hugetlb_category() reports an empty hugetlb entry (huge_pte_none) as not-written, unlike pagemap_page_category(), which reports pte_none as written. pagemap_scan_pte_hole() fires for a hugetlb slot only when it has no page table; keeping that not-written matches how an allocated-but-empty hugetlb entry reads, so the hole and the empty-entry cases agree within the VMA.
fs/proc/task_mmu.c +18 -2
@@ -3049,12 +3049,28 @@ static int pagemap_scan_pte_hole(unsigned long addr, unsigned long end, {struct pagemap_scan_private *p = walk->private;struct vm_area_struct *vma = walk->vma; +unsigned long categories;int ret, err; -if (!vma || !pagemap_scan_is_interesting_page (p->cur_vma_category, p)) +if (!vma)return 0 ; - ret =pagemap_scan_output (p->cur_vma_category, p, addr, &end); +/* +* In a uffd-wp VMA an unpopulated range is treated as written: +* uffd-wp registration populates page tables and installs markers +* with WP_UNPOPULATED, so a missing marker means the range was +* zapped. See the pte_none() handling in pagemap_page_category(). +* +* hugetlb differs, see pagemap_hugetlb_category(). +*/ + categories = p->cur_vma_category; +if (userfaultfd_wp (vma) && !is_vm_hugetlb_page (vma)) + categories |=PAGE_IS_WRITTEN ; + +if (!pagemap_scan_is_interesting_page (categories, p)) +return 0 ; + + ret =pagemap_scan_output (categories, p, addr, &end);if (addr == end)return ret;
Quoted 2 lines · On Wed, Aug 05, 2026 at 11:33:14AM +0200, [email protected] wrote:
The patch below does not apply to the 6.6-stable tree.
Not applicable to 6.6.y.
40de8160ca7f fixes pagemap_scan_pte_hole(), part of the PAGEMAP_SCAN ioctl (commit 52526ca7fdb9), which was added in 6.7. 6.6.y has no PAGEMAP_SCAN code, so there is nothing to fix there. Please drop it from the 6.6.y queue.
(The Fixes: tag points at the WP_UNPOPULATED commit, which is in 6.6, but the code it touches only exists from 6.7 onwards.)
Signature · 1 line
Kiryl Shutsemau / Kirill A. Shutemov