PAGEMAP_SCAN with PM_SCAN_WP_MATCHING write-protects pages in a VMA registered for async uffd-wp, and sets the uffd bit on non-present entries as they are. An entry with the uffd bit set must not be writable, so that the page is write-protected once it is mapped again. change_protection() therefore downgrades writable migration and device-private entries to readable ones first, but PAGEMAP_SCAN does not. For a writable migration entry at the PTE level, remove_migration_pte() restores a writable PTE without the uffd bit. So if a page is under migration while PAGEMAP_SCAN write-protects it, the write protection is lost. A user tracking writes with async uffd-wp sees the page reported as written on the next scan although nothing wrote to it. With CONFIG_PAGE_TABLE_CHECK, setting the uffd bit on a writable non-present PTE or PMD also triggers a warning. To fix it, downgrade writable migration and device-private entries before setting the uffd bit, as change_protection() does, at the PTE, PMD, and hugetlb levels. Fixes: 52526ca7fdb9 ("fs/proc/task_mmu: implement IOCTL to get and optionally clear info about PTEs") Signed-off-by: Tal Zussman --- fs/proc/task_mmu.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 22361607020d..53780a454432 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -2395,6 +2395,38 @@ static unsigned long pagemap_page_category(struct pagemap_scan_private *p, return categories; } +/* Downgrade a writable migration or device-private entry to a readable one. */ +static softleaf_t make_readable_softleaf(softleaf_t entry) +{ + if (softleaf_is_device_private_write(entry)) + return make_readable_device_private_entry(swp_offset(entry)); + if (!softleaf_is_migration_write(entry)) + return entry; + if (folio_test_anon(softleaf_to_folio(entry))) + return make_readable_exclusive_migration_entry(swp_offset(entry)); + return make_readable_migration_entry(swp_offset(entry)); +} + +/* + * An armed entry must not come back writable, so downgrade a writable + * migration or device-private entry before giving it the bit, as + * change_softleaf_pte() does. + */ +static pte_t set_uffd_wp_swp_pte(pte_t pte) +{ + softleaf_t entry = softleaf_from_pte(pte); + pte_t newpte; + + if (!softleaf_is_migration_write(entry) && + !softleaf_is_device_private_write(entry)) + return pte_swp_mkuffd(pte); + + newpte = softleaf_to_pte(make_readable_softleaf(entry)); + if (pte_swp_soft_dirty(pte)) + newpte = pte_swp_mksoft_dirty(newpte); + return pte_swp_mkuffd(newpte); +} + static void make_uffd_wp_pte(struct vm_area_struct *vma, unsigned long addr, pte_t *pte, pte_t ptent) { @@ -2408,7 +2440,7 @@ static void make_uffd_wp_pte(struct vm_area_struct *vma, set_pte_at(vma->vm_mm, addr, pte, make_pte_marker(PTE_MARKER_UFFD_WP)); } else { - ptent = pte_swp_mkuffd(ptent); + ptent = set_uffd_wp_swp_pte(ptent); set_pte_at(vma->vm_mm, addr, pte, ptent); } } @@ -2467,6 +2499,22 @@ static unsigned long pagemap_thp_category(struct pagemap_scan_private *p, return categories; } +/* Same as set_uffd_wp_swp_pte(), for a non-present PMD. */ +static pmd_t set_uffd_wp_swp_pmd(pmd_t pmd) +{ + softleaf_t entry = softleaf_from_pmd(pmd); + pmd_t newpmd; + + if (!softleaf_is_migration_write(entry) && + !softleaf_is_device_private_write(entry)) + return pmd_swp_mkuffd(pmd); + + newpmd = softleaf_to_pmd(make_readable_softleaf(entry)); + if (pmd_swp_soft_dirty(pmd)) + newpmd = pmd_swp_mksoft_dirty(newpmd); + return pmd_swp_mkuffd(newpmd); +} + static void make_uffd_wp_pmd(struct vm_area_struct *vma, unsigned long addr, pmd_t *pmdp) { @@ -2477,7 +2525,7 @@ static void make_uffd_wp_pmd(struct vm_area_struct *vma, pmd = pmd_mkuffd(old); set_pmd_at(vma->vm_mm, addr, pmdp, pmd); } else if (pmd_is_migration_entry(pmd)) { - pmd = pmd_swp_mkuffd(pmd); + pmd = set_uffd_wp_swp_pmd(pmd); set_pmd_at(vma->vm_mm, addr, pmdp, pmd); } } @@ -2547,7 +2595,7 @@ static void make_uffd_wp_huge_pte(struct vm_area_struct *vma, if (softleaf_is_migration(entry)) { set_huge_pte_at(vma->vm_mm, addr, ptep, - pte_swp_mkuffd(ptent), psize); + set_uffd_wp_swp_pte(ptent), psize); } else { pte_t old_pte, new_pte; -- 2.39.5