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=-15.7 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_GIT 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 B5DB7C43464 for ; Fri, 18 Sep 2020 08:56:32 +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 3C95021D42 for ; Fri, 18 Sep 2020 08:56:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="FHrSDblR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3C95021D42 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:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=8wqqnnR1QEMq2wIHZSWxOVvj93kcKR7lCQA4KmXGd9k=; b=FHrSDblRHnoA7Aw7xrvz/rdGC+ GEVTFIO+5VGNjUDeZ67YBVPAaus3XGeC+N+2hLP3+Xpy8LAfcemWsO4eVb0AKE47eGMEI3rzwmDyJ Yy7SSTny5y96B9hDcvVNJKUdBkwUlvOCzSynQIoi90iiT70YN9UD1qW07/4qyxxWALLt888PFlwoO BJpA7pTLNdCZ8jYU7nNDHFuOX+qc0vBMQREvKSq8tliPff8ygDxWPAgsmaU5LWaOJJRlabAH3dA09 Z95pYQN+IVLXri1frcD/TSfGZGfOFJ0Eib8kQ9zpS5KvCTmINAR299HdLOniJcPjXSwVaoNghcUkt lTuNmvJA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kJCBp-00065t-2t; Fri, 18 Sep 2020 08:56:21 +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 1kJCBl-000640-Of for linux-riscv@lists.infradead.org; Fri, 18 Sep 2020 08:56:19 +0000 X-Alimail-AntiSpam: AC=CONTINUE; BC=0.1160887|-1; CH=green; DM=|CONTINUE|false|; DS=CONTINUE|ham_system_inform|0.00896768-0.00102384-0.990008; FP=0|0|0|0|0|-1|-1|-1; HT=e01a16368; MF=liush@allwinnertech.com; NM=1; PH=DS; RN=12; RT=12; SR=0; TI=SMTPD_---.IYnLyfc_1600419360; Received: from localhost.localdomain(mailfrom:liush@allwinnertech.com fp:SMTPD_---.IYnLyfc_1600419360) by smtp.aliyun-inc.com(10.147.42.16); Fri, 18 Sep 2020 16:56:07 +0800 From: liush To: paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, akpm@linux-foundation.org, peterx@redhat.com, daniel.m.jordan@oracle.com, walken@google.com, vbabka@suse.cz, rppt@kernel.org Subject: [V2] riscv: fix pfn_to_virt err in do_page_fault(). Date: Fri, 18 Sep 2020 16:55:58 +0800 Message-Id: <1600419358-21446-1-git-send-email-liush@allwinnertech.com> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200918_045618_122128_824DE48E X-CRM114-Status: UNSURE ( 8.02 ) X-CRM114-Notice: Please train this message. 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: liush , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 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 The argument to pfn_to_virt() should be pfn not the value of CSR_SATP. 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 716d64e..3e560ec13 100644 --- a/arch/riscv/mm/fault.c +++ b/arch/riscv/mm/fault.c @@ -198,6 +198,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs) 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)) @@ -212,7 +213,8 @@ 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; + 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