arch/riscv/mm/fault.c | 5 +++++ 1 file changed, 5 insertions(+)
Since RISC-V supports ioremap() with huge page (pud/pmd) mapping,
However, vmalloc_fault() assumes that the vmalloc range is limited
to pte mappings. To complete the vmalloc_fault() function by adding
huge page support.
Fixes: 310f541a027b ("riscv: Enable HAVE_ARCH_HUGE_VMAP for 64BIT")
Signed-off-by: Dylan Jhong <dylan@andestech.com>
Reviewed-by: Alexandre Ghiti <alexghiti@rivosinc.com>
---
Changes in v2:
- Fix format of commit message
---
arch/riscv/mm/fault.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/riscv/mm/fault.c b/arch/riscv/mm/fault.c
index eb0774d9c03b..4b9953b47d81 100644
--- a/arch/riscv/mm/fault.c
+++ b/arch/riscv/mm/fault.c
@@ -143,6 +143,8 @@ static inline void vmalloc_fault(struct pt_regs *regs, int code, unsigned long a
no_context(regs, addr);
return;
}
+ if (pud_leaf(*pud_k))
+ goto flush_tlb;
/*
* Since the vmalloc area is global, it is unnecessary
@@ -153,6 +155,8 @@ static inline void vmalloc_fault(struct pt_regs *regs, int code, unsigned long a
no_context(regs, addr);
return;
}
+ if (pmd_leaf(*pmd_k))
+ goto flush_tlb;
/*
* Make sure the actual PTE exists as well to
@@ -172,6 +176,7 @@ static inline void vmalloc_fault(struct pt_regs *regs, int code, unsigned long a
* ordering constraint, not a cache flush; it is
* necessary even after writing invalid entries.
*/
+flush_tlb:
local_flush_tlb_page(addr);
}
--
2.34.1
Hello: This patch was applied to riscv/linux.git (fixes) by Palmer Dabbelt <palmer@rivosinc.com>: On Fri, 10 Mar 2023 15:50:21 +0800 you wrote: > Since RISC-V supports ioremap() with huge page (pud/pmd) mapping, > However, vmalloc_fault() assumes that the vmalloc range is limited > to pte mappings. To complete the vmalloc_fault() function by adding > huge page support. > > Fixes: 310f541a027b ("riscv: Enable HAVE_ARCH_HUGE_VMAP for 64BIT") > Signed-off-by: Dylan Jhong <dylan@andestech.com> > Reviewed-by: Alexandre Ghiti <alexghiti@rivosinc.com> > > [...] Here is the summary with links: - [RESEND,v2] RISC-V: mm: Support huge page in vmalloc_fault() https://git.kernel.org/riscv/c/47dd902aaee9 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
On Fri, 10 Mar 2023 15:50:21 +0800, Dylan Jhong wrote: > Since RISC-V supports ioremap() with huge page (pud/pmd) mapping, > However, vmalloc_fault() assumes that the vmalloc range is limited > to pte mappings. To complete the vmalloc_fault() function by adding > huge page support. > > Applied, thanks! [1/1] RISC-V: mm: Support huge page in vmalloc_fault() https://git.kernel.org/palmer/c/47dd902aaee9 Best regards, -- Palmer Dabbelt <palmer@rivosinc.com>
© 2016 - 2025 Red Hat, Inc.