From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E021C4363A for ; Tue, 27 Oct 2020 02:59:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5CAC72151B for ; Tue, 27 Oct 2020 02:59:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2410123AbgJ0C75 (ORCPT ); Mon, 26 Oct 2020 22:59:57 -0400 Received: from smtp2207-205.mail.aliyun.com ([121.197.207.205]:42236 "EHLO smtp2207-205.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729206AbgJ0C75 (ORCPT ); Mon, 26 Oct 2020 22:59:57 -0400 X-Alimail-AntiSpam: AC=CONTINUE;BC=0.06900273|-1;CH=green;DM=|CONTINUE|false|;DS=CONTINUE|ham_system_inform|0.0230261-0.00797704-0.968997;FP=0|0|0|0|0|-1|-1|-1;HT=ay29a033018047188;MF=fuyao@allwinnertech.com;NM=1;PH=DS;RN=13;RT=13;SR=0;TI=SMTPD_---.Iotm-GP_1603767592; Received: from localhost(mailfrom:fuyao@allwinnertech.com fp:SMTPD_---.Iotm-GP_1603767592) by smtp.aliyun-inc.com(10.147.44.129); Tue, 27 Oct 2020 10:59:52 +0800 Date: Tue, 27 Oct 2020 10:59:52 +0800 From: fuyao To: liush 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, =?utf-8?B?6bqm6ZSu5qif?= , =?utf-8?B?6buE6Ie754Kc?= Subject: Re: [PATCH v4] riscv: fix pfn_to_virt err in do_page_fault(). Message-ID: <20201027025952.GK9517@g8Exdroid64> Mail-Followup-To: liush , 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, =?utf-8?B?6bqm6ZSu5qif?= , =?utf-8?B?6buE6Ie754Kc?= References: <1603716368-29896-1-git-send-email-liush@allwinnertech.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1603716368-29896-1-git-send-email-liush@allwinnertech.com> User-Agent: Mutt/1.12.1 (2019-06-15) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org have you seen the main line? it already corrected. On Mon, Oct 26, 2020 at 08:46:08PM +0800, liush wrote: > From: Shaohua Liu > > The argument to pfn_to_virt() should be pfn not the value of CSR_SATP. > > Reviewed-by: Palmer Dabbelt > Reviewed-by: Anup Patel > Signed-off-by: liush > --- > 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! From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CCC36C4363A for ; Tue, 27 Oct 2020 03:00:17 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 49586206C1 for ; Tue, 27 Oct 2020 03:00:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="V38IDfpe" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 49586206C1 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=allwinnertech.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=7PrbKobjTuBNExPtDKzggWMSQiMf7OZX6BRQaA+9xBI=; b=V38IDfpep8eDtHrvfNelpaJ/4 1xpn1hF4fEm274MdH4ClImjZdjPJEE2TWJieDJ4nHssVqb39q0V0utcbSUvmcgTje+7KWS0i408Tz BCZXhp4TCboeIxGBdpjF4nxw7ahLW4VMXiaOx+MLCvZfzQxF9e/cPvnBhdL3xWH0YmpYvCdgVAwfy Lg0gwjqx4NRbXlBBDXuci9mdkXMlT59rCQjmIFdEQFGDSF3eETbAcoDWbkePHoRd5oGDzT3ZRvMdy 87wbPGfMs9bUr2UF5ZT7NqlYxQP83MFHCiZKWvwxWbhleF2OcJo79+6KL/+21sjVJlz8EtDUNyv2p EuHap4IYQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kXFDQ-0006yW-Ls; Tue, 27 Oct 2020 03:00:04 +0000 Received: from smtp2207-205.mail.aliyun.com ([121.197.207.205]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kXFDO-0006xC-Ff for linux-riscv@lists.infradead.org; Tue, 27 Oct 2020 03:00:04 +0000 X-Alimail-AntiSpam: AC=CONTINUE; BC=0.06900273|-1; CH=green; DM=|CONTINUE|false|; DS=CONTINUE|ham_system_inform|0.0230261-0.00797704-0.968997; FP=0|0|0|0|0|-1|-1|-1; HT=ay29a033018047188; MF=fuyao@allwinnertech.com; NM=1; PH=DS; RN=13; RT=13; SR=0; TI=SMTPD_---.Iotm-GP_1603767592; Received: from localhost(mailfrom:fuyao@allwinnertech.com fp:SMTPD_---.Iotm-GP_1603767592) by smtp.aliyun-inc.com(10.147.44.129); Tue, 27 Oct 2020 10:59:52 +0800 Date: Tue, 27 Oct 2020 10:59:52 +0800 From: fuyao To: liush Subject: Re: [PATCH v4] riscv: fix pfn_to_virt err in do_page_fault(). Message-ID: <20201027025952.GK9517@g8Exdroid64> Mail-Followup-To: liush , 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, =?utf-8?B?6bqm6ZSu5qif?= , =?utf-8?B?6buE6Ie754Kc?= References: <1603716368-29896-1-git-send-email-liush@allwinnertech.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1603716368-29896-1-git-send-email-liush@allwinnertech.com> User-Agent: Mutt/1.12.1 (2019-06-15) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201026_230002_821725_3A02A553 X-CRM114-Status: GOOD ( 16.48 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: aou@eecs.berkeley.edu, =?utf-8?B?6bqm6ZSu5qif?= , linux-kernel@vger.kernel.org, peterx@redhat.com, penberg@kernel.org, =?utf-8?B?6buE6Ie754Kc?= , palmer@dabbelt.com, paul.walmsley@sifive.com, akpm@linux-foundation.org, walken@google.com, linux-riscv@lists.infradead.org, vbabka@suse.cz Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org have you seen the main line? it already corrected. On Mon, Oct 26, 2020 at 08:46:08PM +0800, liush wrote: > From: Shaohua Liu > > The argument to pfn_to_virt() should be pfn not the value of CSR_SATP. > > Reviewed-by: Palmer Dabbelt > Reviewed-by: Anup Patel > Signed-off-by: liush > --- > 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