From patchwork Mon Mar 17 14:17:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Brodsky X-Patchwork-Id: 14019355 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5AB2FC282EC for ; Mon, 17 Mar 2025 14:22:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 080D428000C; Mon, 17 Mar 2025 10:22:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 00802280001; Mon, 17 Mar 2025 10:22:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D9DFD28000C; Mon, 17 Mar 2025 10:22:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id BC0EC280001 for ; Mon, 17 Mar 2025 10:22:22 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 572031CD33D for ; Mon, 17 Mar 2025 14:22:24 +0000 (UTC) X-FDA: 83231258208.06.8BBD2FC Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf20.hostedemail.com (Postfix) with ESMTP id 2BD351C0015 for ; Mon, 17 Mar 2025 14:22:21 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=none; spf=pass (imf20.hostedemail.com: domain of kevin.brodsky@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=kevin.brodsky@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742221342; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FjqsABZix1moSeU8RQR7pgSF9B7lHOGmA+zkeUwNAF8=; b=l6gQtKfQsPuKv45U+YACa5YJGFuZ5nTRcjpUPx1MR9Uyf0gBokF1fjFGct/dxtVha2k8JL /q64G2SDz6ejHH7NqbOWKLfTUMIeTJSDFLSfOBwTsLtp5ePJ55xnVP20f8DWGJqr6V6Mq0 G6buex/11rIri5TI3+6Imu2DniAWB2E= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=none; spf=pass (imf20.hostedemail.com: domain of kevin.brodsky@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=kevin.brodsky@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742221342; a=rsa-sha256; cv=none; b=39gEirTRHufXxZRmbuySg57K7e4F0S5i1VsdGNxZWZZk//QGzKzrvGHZEks851KcebuVrx Y3sn5vUpLqnhInb6hZpZ+NKTRKPhYnM16kyskoDGaFs0R8cHMZqM637JePqDs0XHh0rLHv ULK0ixh5ER/JadEjqnk7IA+t0FuBbcM= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 06A762573; Mon, 17 Mar 2025 07:22:30 -0700 (PDT) Received: from e123572-lin.arm.com (e123572-lin.cambridge.arm.com [10.1.194.54]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D35C43F63F; Mon, 17 Mar 2025 07:22:16 -0700 (PDT) From: Kevin Brodsky To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, Kevin Brodsky , Albert Ou , Andreas Larsson , Andrew Morton , Catalin Marinas , Dave Hansen , "David S. Miller" , Geert Uytterhoeven , Linus Walleij , Madhavan Srinivasan , Mark Rutland , Matthew Wilcox , Michael Ellerman , "Mike Rapoport (IBM)" , Palmer Dabbelt , Paul Walmsley , Peter Zijlstra , Qi Zheng , Ryan Roberts , Will Deacon , Yang Shi , linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-openrisc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, sparclinux@vger.kernel.org Subject: [PATCH 11/11] riscv: mm: Call PUD/P4D ctor in special kernel pgtable alloc Date: Mon, 17 Mar 2025 14:17:00 +0000 Message-ID: <20250317141700.3701581-12-kevin.brodsky@arm.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250317141700.3701581-1-kevin.brodsky@arm.com> References: <20250317141700.3701581-1-kevin.brodsky@arm.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 2BD351C0015 X-Rspamd-Server: rspam03 X-Stat-Signature: xwetj6tr43ftqhkxxafx7hcm9sbdr8ci X-HE-Tag: 1742221341-671368 X-HE-Meta: U2FsdGVkX1+qnUnOy1Ghcpu9TIpoid2eqzQ1OqhRJFrjZWb7EbcJtazGOAB393WacWfeF3UNbqgf30BY+7hPxva7EB5yOqXNlDzXyMVZsTTJ1I3mCR2J+boFw5sKH5QvRKxs6HeBdu8hDPAPHrx61s/PTVH1Lskt/PhDPWr0nCNzY6nlKp8TLvTrS5qM8M8zD+aEwaAz80sVDUxFdBfDDefu4q1r/bWQhzhTAhBJPy7trlVaMpifBpD4qYlJKLf8KA3e0VSf5tcG8ou9qy6ejdf4TXM7elRTkJErLpm/Jp/3M+2nfqfvtFTBOo/gI0Vqu64OM37RMN9UijSEBmdrfmj+lVOtS38ia5pd/nfzWDerENzTC/PINwurjBHcJZmk/4yjgQt59/mYPQgQ14Hix0sZVk94i8SMkgP2LIT0ULgDcqg5uf+dNLSkY4WUfxKqwcNSQv/sJiJo1bTedz6PSuE26CtZmD9xJL9g99Uw4xR2WptTe2nAat6WBVGTJh+Gulb2nvvFLvco/ZaZiZhGHnygHzYKcECwVic1spT3CabIDCAOkT9JJAkSRDCVc2mR7Dg7nPbwJZvq40YV0D/TSGusf6wb5bLwWhM9IM/5ejTy8JNNyXiziF+cGsmxOwFJrcCsERgoczqQNKhuZWPynqKCpUDOYruaLlMqZtZDPgJ+hin0ACklqWcYRKHYlk9cJiNHJonFlVdyi5a04BMaaxBx52nr6L+QJOYHnx10itZZhK5+M365VoJlCCVj2dUpPnE+lRumn7GhrXPTE0owVkYUbCcUSTIrvhA0Vmg6By2EOkaqg64pN7JrQmDgC67ieKjYZATz28MBpzSgvNy2SB+oxNOMPsfa9lv3ASbikxPV5dCuL8uuFxn7wBaEAkM9ElGaOSCWZWWHNVtDD+D6+eYslqfeE17bcbzYxlQRx7I8F+RmKHJFNZt86NafkvSQE7rBXWIjioSFavCLEMD SqxCX/5U OyhABgAozlEl1iBXwp3SgqLN9+DzZIdo7zhsxtzaW1NVoe76lvIPNhOIpa2sJfAEjIRCbpYdlYpVtnrOE01YXCY3vlSUKQd5YJClVNtGSwfJu6NvGmAove4PPj6LXG6Gn5Y18WUh7iqXYx92T4/Mizj17IQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Constructors for PUD/P4D-level pgtables were recently introduced. They should be called for all pgtables; make sure they are called for special kernel mappings created by create_pgd_mapping() too. While at it also switch to using pagetable_alloc() like in alloc_{pte,pmd}_late(). Signed-off-by: Kevin Brodsky --- arch/riscv/mm/init.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index fb18940113f2..dc2715f3fd00 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -557,11 +557,11 @@ static phys_addr_t __init alloc_pud_fixmap(uintptr_t va) static phys_addr_t __meminit alloc_pud_late(uintptr_t va) { - unsigned long vaddr; + struct ptdesc *ptdesc = pagetable_alloc(GFP_KERNEL, 0); - vaddr = __get_free_page(GFP_KERNEL); - BUG_ON(!vaddr); - return __pa(vaddr); + BUG_ON(!ptdesc); + pagetable_pud_ctor(ptdesc); + return __pa((pud_t *)ptdesc_address(ptdesc)); } static p4d_t *__init get_p4d_virt_early(phys_addr_t pa) @@ -595,11 +595,11 @@ static phys_addr_t __init alloc_p4d_fixmap(uintptr_t va) static phys_addr_t __meminit alloc_p4d_late(uintptr_t va) { - unsigned long vaddr; + struct ptdesc *ptdesc = pagetable_alloc(GFP_KERNEL, 0); - vaddr = __get_free_page(GFP_KERNEL); - BUG_ON(!vaddr); - return __pa(vaddr); + BUG_ON(!ptdesc); + pagetable_p4d_ctor(ptdesc); + return __pa((p4d_t *)ptdesc_address(ptdesc)); } static void __meminit create_pud_mapping(pud_t *pudp, uintptr_t va, phys_addr_t pa, phys_addr_t sz,