Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 28 Sep 2020 17:31:58 +0800
From:   fuyao <fuyao@allwinnertech.com>
To:     =?utf-8?B?5YiY6YK15Y2OQlRE?= <liush@allwinnertech.com>
Cc:     Christoph Hellwig <hch@infradead.org>,
        "paul.walmsley" <paul.walmsley@sifive.com>,
        palmer <palmer@dabbelt.com>, aou <aou@eecs.berkeley.edu>,
        akpm <akpm@linux-foundation.org>, peterx <peterx@redhat.com>,
        walken <walken@google.com>,
        "daniel.m.jordan" <daniel.m.jordan@oracle.com>,
        vbabka <vbabka@suse.cz>, rppt <rppt@kernel.org>,
        linux-riscv <linux-riscv@lists.infradead.org>,
        linux-kernel <linux-kernel@vger.kernel.org>
Subject: Re: =?utf-8?B?5Zue5aSN77yaW1BBVENI?= =?utf-8?Q?=5D?= riscv: fix
 pfn_to_virt err in do_page_fault().
Message-ID: <20200928093158.GC4756@g8Exdroid64>
Mail-Followup-To: =?utf-8?B?5YiY6YK15Y2OQlRE?= <liush@allwinnertech.com>,
        Christoph Hellwig <hch@infradead.org>,
        "paul.walmsley" <paul.walmsley@sifive.com>,
        palmer <palmer@dabbelt.com>, aou <aou@eecs.berkeley.edu>,
        akpm <akpm@linux-foundation.org>, peterx <peterx@redhat.com>,
        walken <walken@google.com>,
        "daniel.m.jordan" <daniel.m.jordan@oracle.com>,
        vbabka <vbabka@suse.cz>, rppt <rppt@kernel.org>,
        linux-riscv <linux-riscv@lists.infradead.org>,
        linux-kernel <linux-kernel@vger.kernel.org>
References: <1600327549-3995-1-git-send-email-liush@allwinnertech.com>
 <20200917152518.GA8930@infradead.org>
 <ca550ec0-73f2-485e-84fd-036eacd0bcd9.liush@allwinnertech.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <ca550ec0-73f2-485e-84fd-036eacd0bcd9.liush@allwinnertech.com>
User-Agent: Mutt/1.12.1 (2019-06-15)
Precedence: bulk

On Fri, Sep 18, 2020 at 03:43:39PM +0800, 刘邵华BTD wrote:
> Hi Christoph,
> > On Thu, Sep 17, 2020 at 03:25:49PM +0800, liush wrote:
> > > The argument to pfn_to_virt() should be pfn not the value of CSR_SATP.
> > > 
> > > Signed-off-by: liush <liush@allwinnertech.com>
> > > ---
> > >  arch/riscv/mm/fault.c | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/arch/riscv/mm/fault.c b/arch/riscv/mm/fault.c
> > > index 716d64e..9b4e088 100644
> > > --- a/arch/riscv/mm/fault.c
> > > +++ b/arch/riscv/mm/fault.c
> > > @@ -212,7 +212,7 @@ 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;
> > > +  pgd = (pgd_t *)pfn_to_virt(csr_read(CSR_SATP) & SATP_PPN) + index;
> 
> > This adds a crazy long line.  One nice way to clean this up would be to
> > add a local pfn variable, as it would also make the code more readable.
> 
> Thanks, i'll modify it in next revision

Tested-by: fuayo@allwinnertech.com

-- 
<http://www.allwinnertech.com> Allwinnertech Technology