Skip to contentSkip to conversation

riscv: fix pfn_to_virt err in do_page_fault().

PATCH Superseded liush 3 participants 3 messages Oct 26, 2020 – Nov 6, 2020 RISC-V

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

liush

author
#0 lore raw

PATCH v3 1/1 riscv: fix pfn_to_virt err in do_page_fault().

From: Liu Shaohua <[email protected]>

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 1359e21..3c8b9e4 100644
@@ -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)) {
Signature · 1 line
2.7.4
Reviewed-by on v3 1/1
#1 lore raw
Quoted 7 lines · liush

From: Liu Shaohua <[email protected]>

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

Quoted 29 lines
---
 arch/riscv/mm/fault.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/riscv/mm/fault.c +3 -1
index 1359e21..3c8b9e4 100644
@@ -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)) {
Signature · 1 line
2.7.4

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv

maintainer
#2 lore raw
In reply to liush
Quoted 24 lines · On Mon, 26 Oct 2020 05:26:54 PDT (-0700), [email protected] wrote:

From: Liu Shaohua <[email protected]>

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 +1 -0
index 1359e21..3c8b9e4 100644
@@ -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))

arch/riscv/mm/fault.c static inline void vmalloc_fault(struct pt_regs *regs, int code, unsigned long a · line 108

Quoted 9 lines
arch/riscv/mm/fault.c +2 -1
@@ -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)) {

This is on fixes, thanks!