From patchwork Mon Oct 26 12:46:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liush X-Patchwork-Id: 11857055 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A6A1D697 for ; Mon, 26 Oct 2020 12:46:33 +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 766D4207F7 for ; Mon, 26 Oct 2020 12:46:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="AJsde3lY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 766D4207F7 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+patchwork-linux-riscv=patchwork.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=N4SDqDQrmHnzVU5cJB7O61H0QDuqEU+W4jbzTpkICS4=; b=AJsde3lYZT6R7+MgxGuBtKHTQu vSkQCS4c6TQfYLzFJGDVSuSrmMxBrmNVyf8okq2xyKmRyEbyG7MM2m+Cp4BSTkK3x1IepExPXc/jS S/W6svtMUSBEI6K0BbhpXt5vh5oclEq4LuSZ9AtkeDGyQu0SvgxrPW9m3YqmAQ8Of1jl4IJUEKC6B pp2Z2M86AAQUz0qNPHcVr5ruj3hiUvWQZuFyfK72iWmBsuh6Rnixr8M6KnhU/bjwBPlUq2N6zOQuG FV/naPhtNi04Qy1wHxodchf5p4DAl+M4IUWavhIvqj2MHLa/ca9ly6op134QVXAzVFlAN1IE9ixSF x/HqcrmQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kX1tM-0000fu-KO; Mon, 26 Oct 2020 12:46:28 +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 1kX1tJ-0000et-Kj for linux-riscv@lists.infradead.org; Mon, 26 Oct 2020 12:46:26 +0000 X-Alimail-AntiSpam: AC=CONTINUE; BC=0.08028037|-1; CH=green; DM=|CONTINUE|false|; DS=CONTINUE|ham_system_inform|0.0175674-0.00702877-0.975404; FP=2159615626745500650|1|1|10|0|-1|-1|-1; HT=ay29a033018047205; MF=liush@allwinnertech.com; NM=1; PH=DS; RN=11; RT=11; SR=0; TI=SMTPD_---.IodzosZ_1603716370; Received: from localhost.localdomain(mailfrom:liush@allwinnertech.com fp:SMTPD_---.IodzosZ_1603716370) by smtp.aliyun-inc.com(10.147.40.233); Mon, 26 Oct 2020 20:46:14 +0800 From: liush To: 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 Subject: [PATCH v4] riscv: fix pfn_to_virt err in do_page_fault(). Date: Mon, 26 Oct 2020 20:46:08 +0800 Message-Id: <1603716368-29896-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-20201026_084625_951370_B5FED4CC X-CRM114-Status: UNSURE ( 9.49 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [121.197.207.205 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines 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: Shaohua Liu , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Sender: "linux-riscv" Errors-To: linux-riscv-bounces+patchwork-linux-riscv=patchwork.kernel.org@lists.infradead.org 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)) {