* [PATCH v4] riscv: fix pfn_to_virt err in do_page_fault().
@ 2020-10-26 12:46 ` liush
0 siblings, 0 replies; 6+ messages in thread
From: liush @ 2020-10-26 12:46 UTC (permalink / raw)
To: paul.walmsley, palmer, aou, penberg, akpm, peterx, vbabka, walken
Cc: linux-riscv, linux-kernel, Shaohua Liu
From: Shaohua Liu <liush@allwinnertech.com>
The argument to pfn_to_virt() should be pfn not the value of CSR_SATP.
Reviewed-by: Palmer Dabbelt <palmerdabbelt@google.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Signed-off-by: liush <liush@allwinnertech.com>
---
arch/riscv/mm/fault.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/riscv/mm/fault.c b/arch/riscv/mm/fault.c
index 1359e21..3c8b9e4 100644
--- a/arch/riscv/mm/fault.c
+++ b/arch/riscv/mm/fault.c
@@ -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)) {
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v4] riscv: fix pfn_to_virt err in do_page_fault().
@ 2020-10-26 12:46 ` liush
0 siblings, 0 replies; 6+ messages in thread
From: liush @ 2020-10-26 12:46 UTC (permalink / raw)
To: paul.walmsley, palmer, aou, penberg, akpm, peterx, vbabka, walken
Cc: Shaohua Liu, linux-riscv, linux-kernel
From: Shaohua Liu <liush@allwinnertech.com>
The argument to pfn_to_virt() should be pfn not the value of CSR_SATP.
Reviewed-by: Palmer Dabbelt <palmerdabbelt@google.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Signed-off-by: liush <liush@allwinnertech.com>
---
arch/riscv/mm/fault.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/riscv/mm/fault.c b/arch/riscv/mm/fault.c
index 1359e21..3c8b9e4 100644
--- a/arch/riscv/mm/fault.c
+++ b/arch/riscv/mm/fault.c
@@ -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)) {
--
2.7.4
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v4] riscv: fix pfn_to_virt err in do_page_fault().
2020-10-26 12:46 ` liush
@ 2020-10-27 2:59 ` fuyao
-1 siblings, 0 replies; 6+ messages in thread
From: fuyao @ 2020-10-27 2:59 UTC (permalink / raw)
To: liush
Cc: paul.walmsley, palmer, aou, penberg, akpm, peterx, vbabka,
walken, linux-riscv, linux-kernel, 麦键樟,
黄臻炜
have you seen the main line?
it already corrected.
On Mon, Oct 26, 2020 at 08:46:08PM +0800, liush wrote:
> From: Shaohua Liu <liush@allwinnertech.com>
>
> The argument to pfn_to_virt() should be pfn not the value of CSR_SATP.
>
> Reviewed-by: Palmer Dabbelt <palmerdabbelt@google.com>
> Reviewed-by: Anup Patel <anup@brainfault.org>
> Signed-off-by: liush <liush@allwinnertech.com>
> ---
> arch/riscv/mm/fault.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/riscv/mm/fault.c b/arch/riscv/mm/fault.c
> index 1359e21..3c8b9e4 100644
> --- a/arch/riscv/mm/fault.c
> +++ b/arch/riscv/mm/fault.c
> @@ -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)) {
> --
> 2.7.4
--
Nimflorie frostades seda!
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v4] riscv: fix pfn_to_virt err in do_page_fault().
@ 2020-10-27 2:59 ` fuyao
0 siblings, 0 replies; 6+ messages in thread
From: fuyao @ 2020-10-27 2:59 UTC (permalink / raw)
To: liush
Cc: aou, 麦键樟,
linux-kernel, peterx, penberg, 黄臻炜,
palmer, paul.walmsley, akpm, walken, linux-riscv, vbabka
have you seen the main line?
it already corrected.
On Mon, Oct 26, 2020 at 08:46:08PM +0800, liush wrote:
> From: Shaohua Liu <liush@allwinnertech.com>
>
> The argument to pfn_to_virt() should be pfn not the value of CSR_SATP.
>
> Reviewed-by: Palmer Dabbelt <palmerdabbelt@google.com>
> Reviewed-by: Anup Patel <anup@brainfault.org>
> Signed-off-by: liush <liush@allwinnertech.com>
> ---
> arch/riscv/mm/fault.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/riscv/mm/fault.c b/arch/riscv/mm/fault.c
> index 1359e21..3c8b9e4 100644
> --- a/arch/riscv/mm/fault.c
> +++ b/arch/riscv/mm/fault.c
> @@ -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)) {
> --
> 2.7.4
--
Nimflorie frostades seda!
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v4] riscv: fix pfn_to_virt err in do_page_fault().
2020-10-27 2:59 ` fuyao
(?)
@ 2020-10-28 2:31 ` fuyao
2020-10-28 8:01 ` fuyao
-1 siblings, 1 reply; 6+ messages in thread
From: fuyao @ 2020-10-28 2:31 UTC (permalink / raw)
To: liush, paul.walmsley, palmer, aou, penberg, akpm, peterx, vbabka,
walken, linux-riscv, linux-kernel
Shaohua:
sorry, i read it wrong. this patch is right.
On Tue, Oct 27, 2020 at 10:59:52AM +0800, fuyao wrote:
> have you seen the main line?
>
> it already corrected.
>
> On Mon, Oct 26, 2020 at 08:46:08PM +0800, liush wrote:
> > From: Shaohua Liu <liush@allwinnertech.com>
> >
> > The argument to pfn_to_virt() should be pfn not the value of CSR_SATP.
> >
> > Reviewed-by: Palmer Dabbelt <palmerdabbelt@google.com>
> > Reviewed-by: Anup Patel <anup@brainfault.org>
> > Signed-off-by: liush <liush@allwinnertech.com>
> > ---
> > arch/riscv/mm/fault.c | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/arch/riscv/mm/fault.c b/arch/riscv/mm/fault.c
> > index 1359e21..3c8b9e4 100644
> > --- a/arch/riscv/mm/fault.c
> > +++ b/arch/riscv/mm/fault.c
> > @@ -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)) {
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v4] riscv: fix pfn_to_virt err in do_page_fault().
2020-10-28 2:31 ` fuyao
@ 2020-10-28 8:01 ` fuyao
0 siblings, 0 replies; 6+ messages in thread
From: fuyao @ 2020-10-28 8:01 UTC (permalink / raw)
To: liush, paul.walmsley, palmer, aou, penberg, akpm, peterx, vbabka,
walken, linux-riscv, linux-kernel
Shaohua:
sorry, i read it wrong. this patch is right.
On Tue, Oct 27, 2020 at 10:59:52AM +0800, fuyao wrote:
> have you seen the main line?
>
> it already corrected.
>
> On Mon, Oct 26, 2020 at 08:46:08PM +0800, liush wrote:
> > From: Shaohua Liu <liush@allwinnertech.com>
> >
> > The argument to pfn_to_virt() should be pfn not the value of CSR_SATP.
> >
> > Reviewed-by: Palmer Dabbelt <palmerdabbelt@google.com>
> > Reviewed-by: Anup Patel <anup@brainfault.org>
> > Signed-off-by: liush <liush@allwinnertech.com>
> > ---
> > arch/riscv/mm/fault.c | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/arch/riscv/mm/fault.c b/arch/riscv/mm/fault.c
> > index 1359e21..3c8b9e4 100644
> > --- a/arch/riscv/mm/fault.c
> > +++ b/arch/riscv/mm/fault.c
> > @@ -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)) {
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-10-28 8:01 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-26 12:46 [PATCH v4] riscv: fix pfn_to_virt err in do_page_fault() liush
2020-10-26 12:46 ` liush
2020-10-27 2:59 ` fuyao
2020-10-27 2:59 ` fuyao
2020-10-28 2:31 ` fuyao
2020-10-28 8:01 ` fuyao
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.