From: "Mike Rapoport (Microsoft)" <rppt@kernel.org>
To: Albert Ou <aou@eecs.berkeley.edu>,
Palmer Dabbelt <palmer@dabbelt.com>,
Paul Walmsley <pjw@kernel.org>
Cc: Alexandre Ghiti <alex@ghiti.fr>,
Jisheng Zhang <jszhang@kernel.org>,
Mike Rapoport <rppt@kernel.org>,
linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org
Subject: [PATCH v2 2/2] riscv: mm: check the valid bit in kernel_page_present()
Date: Tue, 17 Nov 2026 16:00:21 +0200 [thread overview]
Message-ID: <20261117-fixes-riscv-v2-2-5edc9bdc54fd@kernel.org> (raw)
In-Reply-To: <20261117-fixes-riscv-v2-0-5edc9bdc54fd@kernel.org>
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@kernel.org>
---
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
WARNING: multiple messages have this Message-ID (diff)
From: "Mike Rapoport (Microsoft)" <rppt@kernel.org>
To: Albert Ou <aou@eecs.berkeley.edu>,
Palmer Dabbelt <palmer@dabbelt.com>,
Paul Walmsley <pjw@kernel.org>
Cc: Alexandre Ghiti <alex@ghiti.fr>,
Jisheng Zhang <jszhang@kernel.org>,
Mike Rapoport <rppt@kernel.org>,
linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org
Subject: [PATCH v2 2/2] riscv: mm: check the valid bit in kernel_page_present()
Date: Tue, 17 Nov 2026 16:00:21 +0200 [thread overview]
Message-ID: <20261117-fixes-riscv-v2-2-5edc9bdc54fd@kernel.org> (raw)
In-Reply-To: <20261117-fixes-riscv-v2-0-5edc9bdc54fd@kernel.org>
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@kernel.org>
---
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
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2026-11-17 14:00 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-17 14:00 [PATCH v2 0/2] riscv: mm: fix set_memory_x() and kernel_page_present() Mike Rapoport (Microsoft)
2026-11-17 14:00 ` Mike Rapoport (Microsoft)
2026-11-17 14:00 ` [PATCH v2 1/2] riscv: mm: do not make the linear map alias executable in set_memory_*() Mike Rapoport (Microsoft)
2026-11-17 14:00 ` Mike Rapoport (Microsoft)
2026-11-17 14:00 ` Mike Rapoport (Microsoft) [this message]
2026-11-17 14:00 ` [PATCH v2 2/2] riscv: mm: check the valid bit in kernel_page_present() Mike Rapoport (Microsoft)
2026-11-17 14:00 ` [PATCH v2 0/2] riscv: mm: fix set_memory_x() and kernel_page_present() Jisheng Zhang
2026-11-17 14:00 ` Jisheng Zhang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261117-fixes-riscv-v2-2-5edc9bdc54fd@kernel.org \
--to=rppt@kernel.org \
--cc=alex@ghiti.fr \
--cc=aou@eecs.berkeley.edu \
--cc=jszhang@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@dabbelt.com \
--cc=pjw@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.