From: fuyao <fuyao@allwinnertech.com>
To: liush <liush@allwinnertech.com>
Cc: paul.walmsley@sifive.com, palmer@dabbelt.com,
aou@eecs.berkeley.edu, penberg@kernel.org,
akpm@linux-foundation.org, peterx@redhat.com, vbabka@suse.cz,
walken@google.com, linux-riscv@lists.infradead.org,
linux-kernel@vger.kernel.org,
麦键樟 <maijianzhang@allwinnertech.com>,
黄臻炜 <huangzhenwei@allwinnertech.com>
Subject: Re: [PATCH v4] riscv: fix pfn_to_virt err in do_page_fault().
Date: Tue, 27 Oct 2020 10:59:52 +0800 [thread overview]
Message-ID: <20201027025952.GK9517@g8Exdroid64> (raw)
In-Reply-To: <1603716368-29896-1-git-send-email-liush@allwinnertech.com>
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!
WARNING: multiple messages have this Message-ID (diff)
From: fuyao <fuyao@allwinnertech.com>
To: liush <liush@allwinnertech.com>
Cc: aou@eecs.berkeley.edu, 麦键樟 <maijianzhang@allwinnertech.com>,
linux-kernel@vger.kernel.org, peterx@redhat.com,
penberg@kernel.org, 黄臻炜 <huangzhenwei@allwinnertech.com>,
palmer@dabbelt.com, paul.walmsley@sifive.com,
akpm@linux-foundation.org, walken@google.com,
linux-riscv@lists.infradead.org, vbabka@suse.cz
Subject: Re: [PATCH v4] riscv: fix pfn_to_virt err in do_page_fault().
Date: Tue, 27 Oct 2020 10:59:52 +0800 [thread overview]
Message-ID: <20201027025952.GK9517@g8Exdroid64> (raw)
In-Reply-To: <1603716368-29896-1-git-send-email-liush@allwinnertech.com>
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
next prev parent reply other threads:[~2020-10-27 2:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2020-10-27 2:59 ` fuyao
2020-10-28 2:31 ` fuyao
2020-10-28 8:01 ` fuyao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201027025952.GK9517@g8Exdroid64 \
--to=fuyao@allwinnertech.com \
--cc=akpm@linux-foundation.org \
--cc=aou@eecs.berkeley.edu \
--cc=huangzhenwei@allwinnertech.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=liush@allwinnertech.com \
--cc=maijianzhang@allwinnertech.com \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=penberg@kernel.org \
--cc=peterx@redhat.com \
--cc=vbabka@suse.cz \
--cc=walken@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.