Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp210919pxk; Thu, 17 Sep 2020 00:28:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyc+BnPvpAdA6EOoxzFkYjtfEwLz6PSeouxT6mX+qLy5TcsTzoM2mwo5Hj9rV82LE3ez86i X-Received: by 2002:a05:6402:2c3:: with SMTP id b3mr31564078edx.213.1600327738477; Thu, 17 Sep 2020 00:28:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600327738; cv=none; d=google.com; s=arc-20160816; b=m4WE3HKlext3eqB3J0kCBfInbSUM2jiqjAK7WLIWe7L6QyVT++rTvyo+NcxkZMgXkE 2tDaSSMuY32mkJKpTH1JIUdOS0+OJFcF3T0OIDerJSLrqh7YrzFF7m+RU8/jMpnrsVFb G5e1aF/iP9+nbWwO9yVtbkQQ2V3RX7eiAnhCz55h4C+VI4cE9Z8BGSQ/jecaUc3yKb0U Mpkhv4MRFWv6QOorsnlIxWHkNGiHwhflkqtmqPf40H495si4UwABnkJSSYtbENCLcp38 tMcS8q6TDBjLXDi57OIBKIEYRLDim3gq6OIm2HIdFhp78/VJWU9ZRmLD2vBRP0Io+MCn IP3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from; bh=hhtAP7Ddx1jk8uMWVg2leFVANF+eDYc2jdiMvSIRb54=; b=u96Z+LLC7sOGnpla+W8fW20R/H95lkYwb3U2wwb2L39YHkdY0egsW+2bgrZXGVaNSU njCaNLIwMHOWI3l1z9gr46THCvC5JCIGZgDMWZGyBI/VowAkekcxgQPrvdw7jV1lkyAR CK+9ZWnLj0yfIknkjBvvtq4+WZpesbxPrnqFdh4sxM+W/cz3w4LMStJE2r8vpTXNg5GD 0yUxYGnRGFIL8U33Wc8sx9A8iwDe0JauC53gq2ma4TEEOkNXyFl9gzvN4EDNhe1GwZub 109jiD8t6tK6UoIg1hYfmnE0MVoSR163I50ugvMY0krIjTu2turB6JtYZTkI/af8OVN3 dkFA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b23si11038436edx.34.2020.09.17.00.28.35; Thu, 17 Sep 2020 00:28:58 -0700 (PDT) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726171AbgIQH0G (ORCPT + 99 others); Thu, 17 Sep 2020 03:26:06 -0400 Received: from smtp2207-205.mail.aliyun.com ([121.197.207.205]:39244 "EHLO smtp2207-205.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726210AbgIQH0E (ORCPT ); Thu, 17 Sep 2020 03:26:04 -0400 X-Alimail-AntiSpam: AC=CONTINUE;BC=0.2132557|-1;CH=green;DM=|CONTINUE|false|;DS=CONTINUE|ham_system_inform|0.00687124-0.000952784-0.992176;FP=0|0|0|0|0|-1|-1|-1;HT=e01a16378;MF=liush@allwinnertech.com;NM=1;PH=DS;RN=12;RT=12;SR=0;TI=SMTPD_---.IYFcKJ1_1600327552; Received: from localhost.localdomain(mailfrom:liush@allwinnertech.com fp:SMTPD_---.IYFcKJ1_1600327552) by smtp.aliyun-inc.com(10.147.41.199); Thu, 17 Sep 2020 15:25:59 +0800 From: liush To: paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, akpm@linux-foundation.org, peterx@redhat.com, walken@google.com, daniel.m.jordan@oracle.com, vbabka@suse.cz, rppt@kernel.org Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, liush Subject: [PATCH] riscv: fix pfn_to_virt err in do_page_fault(). Date: Thu, 17 Sep 2020 15:25:49 +0800 Message-Id: <1600327549-3995-1-git-send-email-liush@allwinnertech.com> X-Mailer: git-send-email 2.7.4 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 | 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; pgd_k = init_mm.pgd + index; if (!pgd_present(*pgd_k)) -- 2.7.4