From nobody Thu Apr 30 09:31:26 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C6FFC433EF for ; Mon, 30 May 2022 09:47:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234913AbiE3JrP (ORCPT ); Mon, 30 May 2022 05:47:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234892AbiE3JrL (ORCPT ); Mon, 30 May 2022 05:47:11 -0400 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5C6638B4 for ; Mon, 30 May 2022 02:47:09 -0700 (PDT) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id CE6633FBF5 for ; Mon, 30 May 2022 09:47:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1653904027; bh=0UZymv9RVAChspHI58gTmQkqQr5ViPWxsQqyFUaGwGI=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=BQynBlSIrLEmYQRf+w2HXFMDTvf97rwyOncqlhH1ugNqF9+QZk+anHNnipANfsbA2 R7F2tEkTgJyT7wKz50y8fDXRGcSyFZY7dP8zZjkelZcDXGLIofQmHAoT7aznr0J/N7 +1Y3oHVlC/zyrNd+M8Tsgl2ULJD5c9LUyg3RpcQwrNQw8NeCxvnEQZFBCIxQNqXgMk ct8in+v1Ip8YVeldJ5xd72J+30fn/NOS9NBObnaLznL9b7HXPjTM5VWqSqAKimsTzz jquSd7jb2oVBcQVkLYrnKCuVwZDsSRQTG7avBXvXEM1si/tOJ4ZSUSZYiHWb9rjZrJ GLNWya8RFamww== Received: by mail-wr1-f70.google.com with SMTP id p10-20020adfaa0a000000b0020c4829af5fso1524276wrd.16 for ; Mon, 30 May 2022 02:47:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0UZymv9RVAChspHI58gTmQkqQr5ViPWxsQqyFUaGwGI=; b=sDpJSicet2fhB1V6HtIGLm+SS5vlf2T47Hgmf6otKkIcwFrHnIRgo/UcSgtLSiKCMK yqeg3Odk8+8jWdQFNPtXErCtGLNbV/M51Eu6k89bO+dHtgjc9GP9B8072oqybXab+TFW 0bz9/5P0cUJ8Jd4/FtNzbnkYdK+0I6a2NPRXVXxNkoWUNbB+hP4S/eXSDLkTpqBSCqtS a7EmpOJ/osH4TT5LdPUt5NatdEpWtykLigrE60/yc/DnWjnaAAX8JAioF9jPjhbG78t4 uy0bzaYdjAW8cPMOAV+xRiq8SiKHr8dnXXTyjyNRP/uZZckwpxSxpDVK3qZrqEL602BF mrfA== X-Gm-Message-State: AOAM530OwDsUXCPr6rN/MCC6XdKN7kWhzIXfHK3blsEk7mp9dvFd4mR6 SEjk4ib/d7wUDcJM7JM7fJQcdBH6NzEcW6K3G/VQSRymDrYh2Pe3pfh11deggA06jslm/PIyN5O HoADQWc95n5TPSG9miqWARdIEOOWcyrU8Qw3hVcTu6Q== X-Received: by 2002:a05:600c:501f:b0:397:74e2:caa1 with SMTP id n31-20020a05600c501f00b0039774e2caa1mr18326906wmr.89.1653904023986; Mon, 30 May 2022 02:47:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxcIRFrZmFoHMctcwJfjIoXZM+fuLzFmiVCBZ3hBYIMDRUovPi+iGVmBjDvXX5Wh2a1poEgFA== X-Received: by 2002:a05:600c:501f:b0:397:74e2:caa1 with SMTP id n31-20020a05600c501f00b0039774e2caa1mr18326883wmr.89.1653904023811; Mon, 30 May 2022 02:47:03 -0700 (PDT) Received: from alex.home (lfbn-gre-1-146-29.w90-112.abo.wanadoo.fr. [90.112.113.29]) by smtp.gmail.com with ESMTPSA id f12-20020a05600c154c00b003942a244f30sm13897640wmg.9.2022.05.30.02.47.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 May 2022 02:47:03 -0700 (PDT) From: Alexandre Ghiti To: =?UTF-8?q?Heiko=20St=C3=BCbner?= , Paul Walmsley , Palmer Dabbelt , Albert Ou , Anup Patel , Atish Patra , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org Cc: Alexandre Ghiti Subject: [PATCH -for-next] riscv: Fix missing PAGE_PFN_MASK Date: Mon, 30 May 2022 11:47:01 +0200 Message-Id: <20220530094701.2891404-1-alexandre.ghiti@canonical.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" There are a bunch of functions that use the PFN from a page table entry that end up with the svpbmt upper-bits because they are missing the newly introduced PAGE_PFN_MASK which leads to wrong addresses conversions and then crash: fix this by adding this mask. Fixes: 100631b48ded ("riscv: Fix accessing pfn bits in PTEs for non-32bit v= ariants") Signed-off-by: Alexandre Ghiti Reviewed-by: Guo Ren --- arch/riscv/include/asm/pgtable-64.h | 4 ++-- arch/riscv/include/asm/pgtable.h | 4 ++-- arch/riscv/kvm/mmu.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/riscv/include/asm/pgtable-64.h b/arch/riscv/include/asm/p= gtable-64.h index 6d59e4695200..0e57bf1e25e9 100644 --- a/arch/riscv/include/asm/pgtable-64.h +++ b/arch/riscv/include/asm/pgtable-64.h @@ -153,7 +153,7 @@ static inline pud_t pfn_pud(unsigned long pfn, pgprot_t= prot) =20 static inline unsigned long _pud_pfn(pud_t pud) { - return pud_val(pud) >> _PAGE_PFN_SHIFT; + return (pud_val(pud) & _PAGE_PFN_MASK) >> _PAGE_PFN_SHIFT; } =20 static inline pmd_t *pud_pgtable(pud_t pud) @@ -240,7 +240,7 @@ static inline void p4d_clear(p4d_t *p4d) static inline pud_t *p4d_pgtable(p4d_t p4d) { if (pgtable_l4_enabled) - return (pud_t *)pfn_to_virt(p4d_val(p4d) >> _PAGE_PFN_SHIFT); + return (pud_t *)pfn_to_virt((p4d_val(p4d) & _PAGE_PFN_MASK) >> _PAGE_PFN= _SHIFT); =20 return (pud_t *)pud_pgtable((pud_t) { p4d_val(p4d) }); } diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgta= ble.h index e2658a25f06d..43064025f4b0 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -255,7 +255,7 @@ static inline pgd_t pfn_pgd(unsigned long pfn, pgprot_t= prot) =20 static inline unsigned long _pgd_pfn(pgd_t pgd) { - return pgd_val(pgd) >> _PAGE_PFN_SHIFT; + return (pgd_val(pgd) & _PAGE_PFN_MASK) >> _PAGE_PFN_SHIFT; } =20 static inline struct page *pmd_page(pmd_t pmd) @@ -568,7 +568,7 @@ static inline pmd_t pmd_mkinvalid(pmd_t pmd) return __pmd(pmd_val(pmd) & ~(_PAGE_PRESENT|_PAGE_PROT_NONE)); } =20 -#define __pmd_to_phys(pmd) (pmd_val(pmd) >> _PAGE_PFN_SHIFT << PAGE_SHIFT) +#define __pmd_to_phys(pmd) ((pmd_val(pmd) & _PAGE_PFN_MASK) >> _PAGE_PFN_= SHIFT << PAGE_SHIFT) =20 static inline unsigned long pmd_pfn(pmd_t pmd) { diff --git a/arch/riscv/kvm/mmu.c b/arch/riscv/kvm/mmu.c index f80a34fbf102..db03c5a29d4c 100644 --- a/arch/riscv/kvm/mmu.c +++ b/arch/riscv/kvm/mmu.c @@ -55,7 +55,7 @@ static inline unsigned long stage2_pte_index(gpa_t addr, = u32 level) =20 static inline unsigned long stage2_pte_page_vaddr(pte_t pte) { - return (unsigned long)pfn_to_virt(pte_val(pte) >> _PAGE_PFN_SHIFT); + return (unsigned long)pfn_to_virt((pte_val(pte) & _PAGE_PFN_MASK) >> _PAG= E_PFN_SHIFT); } =20 static int stage2_page_size_to_level(unsigned long page_size, u32 *out_lev= el) --=20 2.34.1