From: Sia Jee Heng <jeeheng.sia@starfivetech.com>
To: <paul.walmsley@sifive.com>, <palmer@dabbelt.com>,
<aou@eecs.berkeley.edu>
Cc: <linux-riscv@lists.infradead.org>, <linux-kernel@vger.kernel.org>,
<jeeheng.sia@starfivetech.com>, <leyfoon.tan@starfivetech.com>,
<mason.huo@starfivetech.com>
Subject: [PATCH v4 3/4] RISC-V: mm: Enable huge page support to kernel_page_present() function
Date: Tue, 21 Feb 2023 10:35:22 +0800 [thread overview]
Message-ID: <20230221023523.1498500-4-jeeheng.sia@starfivetech.com> (raw)
In-Reply-To: <20230221023523.1498500-1-jeeheng.sia@starfivetech.com>
Currently kernel_page_present() function doesn't support huge page
detection causes the function to mistakenly return false to the
hibernation core.
Add huge page detection to the function to solve the problem.
Fixes tag: commit 9e953cda5cdf ("riscv:
Introduce huge page support for 32/64bit kernel")
Signed-off-by: Sia Jee Heng <jeeheng.sia@starfivetech.com>
Reviewed-by: Ley Foon Tan <leyfoon.tan@starfivetech.com>
Reviewed-by: Mason Huo <mason.huo@starfivetech.com>
---
arch/riscv/mm/pageattr.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/riscv/mm/pageattr.c b/arch/riscv/mm/pageattr.c
index 86c56616e5de..ea3d61de065b 100644
--- a/arch/riscv/mm/pageattr.c
+++ b/arch/riscv/mm/pageattr.c
@@ -217,18 +217,26 @@ bool kernel_page_present(struct page *page)
pgd = pgd_offset_k(addr);
if (!pgd_present(*pgd))
return false;
+ if (pgd_leaf(*pgd))
+ return true;
p4d = p4d_offset(pgd, addr);
if (!p4d_present(*p4d))
return false;
+ if (p4d_leaf(*p4d))
+ return true;
pud = pud_offset(p4d, addr);
if (!pud_present(*pud))
return false;
+ if (pud_leaf(*pud))
+ return true;
pmd = pmd_offset(pud, addr);
if (!pmd_present(*pmd))
return false;
+ if (pmd_leaf(*pmd))
+ return true;
pte = pte_offset_kernel(pmd, addr);
return pte_present(*pte);
--
2.34.1
next prev parent reply other threads:[~2023-02-21 2:36 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-21 2:35 [PATCH v4 0/4] RISC-V Hibernation Support Sia Jee Heng
2023-02-21 2:35 ` [PATCH v4 1/4] RISC-V: Change suspend_save_csrs and suspend_restore_csrs to public function Sia Jee Heng
2023-02-23 6:39 ` Andrew Jones
2023-02-24 1:33 ` JeeHeng Sia
2023-02-21 2:35 ` [PATCH v4 2/4] RISC-V: Factor out common code of __cpu_resume_enter() Sia Jee Heng
2023-02-23 6:51 ` Andrew Jones
2023-02-24 1:33 ` JeeHeng Sia
2023-02-24 10:19 ` Alexandre Ghiti
2023-02-27 2:21 ` JeeHeng Sia
2023-02-21 2:35 ` Sia Jee Heng [this message]
2023-02-23 6:57 ` [PATCH v4 3/4] RISC-V: mm: Enable huge page support to kernel_page_present() function Andrew Jones
2023-02-24 1:33 ` JeeHeng Sia
2023-02-24 10:21 ` Alexandre Ghiti
2023-02-21 2:35 ` [PATCH v4 4/4] RISC-V: Add arch functions to support hibernation/suspend-to-disk Sia Jee Heng
2023-02-23 18:07 ` Andrew Jones
2023-02-24 2:05 ` JeeHeng Sia
2023-02-24 9:00 ` Andrew Jones
2023-02-24 9:33 ` JeeHeng Sia
2023-02-24 9:55 ` Andrew Jones
2023-02-24 10:30 ` JeeHeng Sia
2023-02-24 12:07 ` Andrew Jones
2023-02-27 2:14 ` JeeHeng Sia
2023-02-27 7:59 ` Andrew Jones
2023-02-27 10:52 ` JeeHeng Sia
2023-02-27 11:44 ` Andrew Jones
2023-02-28 1:32 ` JeeHeng Sia
2023-02-28 5:04 ` Andrew Jones
2023-02-28 5:33 ` JeeHeng Sia
2023-02-28 7:18 ` Andrew Jones
2023-02-28 7:29 ` JeeHeng Sia
2023-02-28 7:37 ` Andrew Jones
2023-03-03 1:53 ` JeeHeng Sia
2023-03-03 8:09 ` Andrew Jones
2023-02-28 6:33 ` JeeHeng Sia
2023-02-28 7:29 ` Andrew Jones
2023-02-28 7:34 ` JeeHeng Sia
2023-02-24 2:12 ` JeeHeng Sia
2023-02-24 12:29 ` Alexandre Ghiti
2023-02-27 3:11 ` JeeHeng Sia
2023-02-27 20:31 ` Alexandre Ghiti
2023-02-28 1:20 ` JeeHeng Sia
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=20230221023523.1498500-4-jeeheng.sia@starfivetech.com \
--to=jeeheng.sia@starfivetech.com \
--cc=aou@eecs.berkeley.edu \
--cc=leyfoon.tan@starfivetech.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=mason.huo@starfivetech.com \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®