RISC-V: mm: Enable huge page support to kernel_page_present() function

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: 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>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
Reviewed-by: Alexandre Ghiti <alexghiti@rivosinc.com>

diff --git a/arch/riscv/mm/pageattr.c b/arch/riscv/mm/pageattr.c
index 86c5661..ea3d61d 100644 (file)
--- 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);