Commit a15c90b6 authored by Sia Jee Heng's avatar Sia Jee Heng Committed by Palmer Dabbelt

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: 9e953cda ("riscv: Introduce huge page support for 32/64bit kernel")
Signed-off-by: default avatarSia Jee Heng <jeeheng.sia@starfivetech.com>
Reviewed-by: default avatarLey Foon Tan <leyfoon.tan@starfivetech.com>
Reviewed-by: default avatarMason Huo <mason.huo@starfivetech.com>
Reviewed-by: default avatarAndrew Jones <ajones@ventanamicro.com>
Reviewed-by: default avatarAlexandre Ghiti <alexghiti@rivosinc.com>
Link: https://lore.kernel.org/r/20230330064321.1008373-4-jeeheng.sia@starfivetech.comSigned-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent fcb89863
...@@ -217,18 +217,26 @@ bool kernel_page_present(struct page *page) ...@@ -217,18 +217,26 @@ bool kernel_page_present(struct page *page)
pgd = pgd_offset_k(addr); pgd = pgd_offset_k(addr);
if (!pgd_present(*pgd)) if (!pgd_present(*pgd))
return false; return false;
if (pgd_leaf(*pgd))
return true;
p4d = p4d_offset(pgd, addr); p4d = p4d_offset(pgd, addr);
if (!p4d_present(*p4d)) if (!p4d_present(*p4d))
return false; return false;
if (p4d_leaf(*p4d))
return true;
pud = pud_offset(p4d, addr); pud = pud_offset(p4d, addr);
if (!pud_present(*pud)) if (!pud_present(*pud))
return false; return false;
if (pud_leaf(*pud))
return true;
pmd = pmd_offset(pud, addr); pmd = pmd_offset(pud, addr);
if (!pmd_present(*pmd)) if (!pmd_present(*pmd))
return false; return false;
if (pmd_leaf(*pmd))
return true;
pte = pte_offset_kernel(pmd, addr); pte = pte_offset_kernel(pmd, addr);
return pte_present(*pte); return pte_present(*pte);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment