[PATCH v2 2/2] riscv: mm: check the valid bit in kernel_page_present()
From: Mike Rapoport (Microsoft)
Date: Tue Nov 17 2026 - 09:00:44 EST
set_direct_map_invalid_noflush() clears _PAGE_PRESENT, but the kernel
mappings keep _PAGE_PROT_NONE set: it used to be _PAGE_READ and now it is
the same bit as _PAGE_GLOBAL. pte_present() and pmd_present() still
return true for the invalidated entry. kernel_page_present() then reports
that an unmapped page is mapped, and hibernation copies it without
remapping it first.
Test _PAGE_PRESENT directly for PMD and PTE leaves.
Fixes: 32a0de886eb3 ("arch, mm: make kernel_page_present() always available")
Signed-off-by: Mike Rapoport (Microsoft) <rppt@xxxxxxxxxx>
---
arch/riscv/mm/pageattr.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/arch/riscv/mm/pageattr.c b/arch/riscv/mm/pageattr.c
index b13811375535..5a1a3b4473c9 100644
--- a/arch/riscv/mm/pageattr.c
+++ b/arch/riscv/mm/pageattr.c
@@ -428,7 +428,7 @@ bool kernel_page_present(struct page *page)
pgd_t *pgd;
pud_t *pud;
p4d_t *p4d;
- pmd_t *pmd;
+ pmd_t *pmd, pmdval;
pte_t *pte;
pgd = pgd_offset_k(addr);
@@ -450,11 +450,13 @@ bool kernel_page_present(struct page *page)
return true;
pmd = pmd_offset(pud, addr);
- if (!pmd_present(pmdp_get(pmd)))
+ pmdval = pmdp_get(pmd);
+ if (!pmd_present(pmdval))
return false;
- if (pmd_leaf(pmdp_get(pmd)))
- return true;
+ if (pmd_leaf(pmdval))
+ return pmd_val(pmdval) & _PAGE_PRESENT;
+ /* pte_present() is true for PAGE_KERNEL with _PAGE_PRESENT cleared */
pte = pte_offset_kernel(pmd, addr);
- return pte_present(ptep_get(pte));
+ return pte_val(ptep_get(pte)) & _PAGE_PRESENT;
}
--
2.53.0