Unverified Commit bcacf5f6 authored by Liu Shaohua's avatar Liu Shaohua Committed by Palmer Dabbelt
Browse files

riscv: fix pfn_to_virt err in do_page_fault(). 



The argument to pfn_to_virt() should be pfn not the value of CSR_SATP.

Reviewed-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
Reviewed-by: default avatarAnup Patel <anup@brainfault.org>
Signed-off-by: default avatarliush <liush@allwinnertech.com>
Reviewed-by: default avatarPekka Enberg <penberg@kernel.org>
Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
parent 79605f13

arch/riscv/mm/fault.c

+3 −1
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ static inline void vmalloc_fault(struct pt_regs *regs, int code, unsigned long a 
	pmd_t *pmd, *pmd_k;

	pte_t *pte_k;

	int index;

	unsigned long pfn;



	/* User mode accesses just cause a SIGSEGV */

	if (user_mode(regs))
@@ -100,7 +101,8 @@ static inline void vmalloc_fault(struct pt_regs *regs, int code, unsigned long a 
	 * of a task switch.

	 */

	index = pgd_index(addr);

	pgd = (pgd_t *)pfn_to_virt(csr_read(CSR_SATP)) + index;

	pfn = csr_read(CSR_SATP) & SATP_PPN;

	pgd = (pgd_t *)pfn_to_virt(pfn) + index;

	pgd_k = init_mm.pgd + index;



	if (!pgd_present(*pgd_k)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE