Skip to contentSkip to conversation

riscv: fix pfn_to_virt err in do_page_fault().

PATCH Superseded liush 2 participants 2 messages Sep 18, 2020 – Sep 27, 2020 RISC-V

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

liush

author
#0 lore raw

PATCH v2 1/1 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.

---
 arch/riscv/mm/fault.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/riscv/mm/fault.c +3 -1
index 716d64e..3e560ec13 100644
@@ -198,6 +198,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs)
 		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))
@@ -212,7 +213,8 @@ asmlinkage void do_page_fault(struct pt_regs *regs)
 		 * 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))
Signature · 1 line
2.7.4
maintainer Reviewed-by on v2 1/1
#1 lore raw
Quoted 1 line · On Fri, 18 Sep 2020 01:55:58 PDT (-0700), [email protected] wrote:

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

Quoted 1 line

IIUC you're supposed to use an actual name.

Quoted 26 lines
---
 arch/riscv/mm/fault.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/riscv/mm/fault.c +3 -1
index 716d64e..3e560ec13 100644
@@ -198,6 +198,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs)
 		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))
@@ -212,7 +213,8 @@ asmlinkage void do_page_fault(struct pt_regs *regs)
 		 * 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))