From patchwork Tue Apr 8 09:52:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Brodsky X-Patchwork-Id: 14042594 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 5C7DFC3600C for ; Tue, 8 Apr 2025 09:54:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6302628000D; Tue, 8 Apr 2025 05:54:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5DFA8280001; Tue, 8 Apr 2025 05:54:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4578D28000D; Tue, 8 Apr 2025 05:54:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 2560B280001 for ; Tue, 8 Apr 2025 05:54:09 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 24B9EA85AB for ; Tue, 8 Apr 2025 09:54:09 +0000 (UTC) X-FDA: 83310415818.30.DC6BE96 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf24.hostedemail.com (Postfix) with ESMTP id 8F789180005 for ; Tue, 8 Apr 2025 09:54:07 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf24.hostedemail.com: domain of kevin.brodsky@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=kevin.brodsky@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744106047; a=rsa-sha256; cv=none; b=zROf5TBgtCgkuTSeeoU7WlpWFlbkxZneJ0ssL/9ZmXApJ6urtR5XFb08T9yrFSuJjwCdar SzqHuwgWQiNddjXhhIr9cgcLPulrWwxPaL5reDq3KQbm2oBW7S745O2II+OBsjdVfUCxzD iKPM27EtkPa+dTQqnz0i3TtmpoyNYpk= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf24.hostedemail.com: domain of kevin.brodsky@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=kevin.brodsky@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744106047; 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=08E//Tnzm4Otbmgjv5PkMZzFPCICf9ItkLK9Ykz94vQ=; b=zTV6Crc7dH7WMxAtgz+IDJoJPfKPnKQS3t6RVCo1FxhK3BbyO+QJkeAx0xnGtpuNvvXmxN wPvP8TPB2P1a+Uj4/ewUT6122rpTIR5r5GHl+zCEoRnzLnE9gA06WVjVFztyf6a515BQtA C45cArNGhAARpa5f5MGKBsMArdI6ACA= 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 C22912308; Tue, 8 Apr 2025 02:54:07 -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 8289A3F6A8; Tue, 8 Apr 2025 02:54:02 -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, x86@kernel.org Subject: [PATCH v2 12/12] riscv: mm: Call PUD/P4D ctor in special kernel pgtable alloc Date: Tue, 8 Apr 2025 10:52:22 +0100 Message-ID: <20250408095222.860601-13-kevin.brodsky@arm.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250408095222.860601-1-kevin.brodsky@arm.com> References: <20250408095222.860601-1-kevin.brodsky@arm.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 8F789180005 X-Stat-Signature: 3zumbw4bhgr73zzxc5fo9qi3jjybkx19 X-HE-Tag: 1744106047-182198 X-HE-Meta: U2FsdGVkX19HkImlr6fp+Um/dx/0ICoOY+KG9a7XxQ3y8Zcg7L6KYvS2fCg07MfOERAVz8pxIbK6/O0FxVC6hRww7iZ8wgjAVopl8yajmhk3tyfj3DY97iW0xWOoWpHSiZnBCJh9+6esGEj1DX456maMtsBZVYn3Z0QDwHAcmq8hbD+UQfyz30HxrJAlvWlSt+62RSDK+HDs3v9pY8uWO6jN69FM5Q4/Fh9/X9rYdMLfa5sLZMf4P6C4uHCxmlgZ92pcsDVx7aakxffTONp0btbUTkT/Ia6i0ERjwiOv913LLnTmx/ynBegUu2TLqfoAL9KWMjeGZtq4P2mYAEwSlX3TpOtnyXxp/lHVMWsA/toenCI9tl53KDeGYXgd8ZhEb6eucgnV5QjoHrMciuFo9xhE9+mVcKD3RaQq9+31Srqtzdl5hTvlizFUnhKp0fh+LtLsQH3GTKb/yY/ZRLoI5vSbo+252NF5s/sWYp/yPkTpgB2/ftd96hBu7Cfoh3gpWMKa6FYC3LdvmFXLgLHodE5gv/yEyub+JUNnXBiziYqau5YnlcBOOk2RZfwFYqlhntgEcS54eCsbln4IlSkZdt6QF5PTlag5F3qg4PMi540Prkt6wYzys0l4j+GWIZFE8iX66OOLBctSAfRihz7nVJVCsOI9Yyhvb5vDfPEOrceOq7Jf+zM4HmQ/9AAROfjl6de7AbQrKfs5rGn3Ebg26QFbM4jMmFJu8GgrcO2CFxout5f772UPf9leMyb5Z+u/IuHXHxhF1JJc1Gvej8j9amYnz37U2c0HceduJDi2IdLL6KTTtQiBJdIYNNU9lQXCLA0yKGADsHWJLGYWiaFNhqvSk+zTqIBknMDFkFPikCZZt/TrDTvUGdn7ZlIUYc/4yqMbdbCrtiMA4p2olpSUzvPDdbUGYwhmJQB8J64i2Eybxgu8Eec0V0A1ySNxpqpEwHe8UFJiF2c7Syvmdod ouQICpuc L/yOGRbcB0UfcI370NAygENtwsgPBt0hpCKVl/8eG/RKpRQWTrBvgL8baDk8cn3POQ+UjbSombrcDbokm2f1nRy49I8vXWwk/in8E8eAJfIOR7iWHGb6XBRFEsKXp7eGyKhLdrx8KqACmEpILBEx8HRKm6w== 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 59a982f88908..8d0374d7ce8e 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -590,11 +590,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) @@ -628,11 +628,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,