From patchwork Mon Mar 17 14:16:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Brodsky X-Patchwork-Id: 14019349 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 B9FA3C35FF3 for ; Mon, 17 Mar 2025 14:21:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6BABE280007; Mon, 17 Mar 2025 10:21:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 61C4C280001; Mon, 17 Mar 2025 10:21:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 497ED280007; Mon, 17 Mar 2025 10:21:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 2DA6E280001 for ; Mon, 17 Mar 2025 10:21:55 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id B7212C1F38 for ; Mon, 17 Mar 2025 14:21:56 +0000 (UTC) X-FDA: 83231257032.08.E1D24C2 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf23.hostedemail.com (Postfix) with ESMTP id C2108140016 for ; Mon, 17 Mar 2025 14:21:54 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf23.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=1742221315; a=rsa-sha256; cv=none; b=3qpDGJCAWzEVq9l74hzCA246D00heL669Qku0Z7I54m8yn6WOUzGjdlnb702IhGA7QxlkR KGEkyaHUPOib02dduMY2Jd3y07NFjf43C6TU5Nc7luitnr3z7Q3FNrn5xSV6CoZpU6Dffc +ak5jnwYs2A8zKaMUmctlpLgDB6BPB8= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf23.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=1742221314; 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=o+UbYltWTL9nsXjK30sfubrpExxRG1UfppgmpoTi2qk=; b=KGgFZYQD6+Nn5wjhCJ8dG4kPoz/b0MviaJHybjjxCcpaMQLw+LydrUuRA4Sc4SIn8b3/ds 6IVJVeYAuGWS6ZQD3Bypzt0GZ9MV+TR8znTXeCipini+WtnAC9ymr7OWKXzONu2VXFc4lF dlX3GD44ZT+E9XaarQ3pVv5HjZxY8ss= 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 8C87A25DC; Mon, 17 Mar 2025 07:22:02 -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 64BEE3F63F; Mon, 17 Mar 2025 07:21:49 -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 05/11] sparc64: mm: Call ctor/dtor for kernel PTEs Date: Mon, 17 Mar 2025 14:16:54 +0000 Message-ID: <20250317141700.3701581-6-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: C2108140016 X-Stat-Signature: z59eusr94hp4sykooc7pc4qf9sw5hwgm X-Rspamd-Server: rspam06 X-HE-Tag: 1742221314-591007 X-HE-Meta: U2FsdGVkX1+ZJuw4UKY+pt/T5WAk9hwTfG6AfmAsNC97r7LAswwaoPDHmiNnJ6sfpe1RxOhFNydULDWjuW1QA8Vw01ODGgCUH5ndMY0kWT6fWhk+ZnWuAHIxDWUxu8ZBhFCGtUadGXRXnYyMa12NN9n82Gu/nH03BDsU5bo3RU2nZFkIkDh0cEs23c/HO/SV25kzgVviqs1UjiPZHsTknm5HZuUFrGZgL+4ukdou5JnhF4+3RYysS7wpncTF585V+2hYrSu2Fmwqz16nfXcDX0Rdw3IRwx0EaHbw33V42HPDmEv6oRgpFTWJohMBm48bfL3s37b3z8xugzT+8VzbxVVhpP2GyivY42v4nzlMK7KXL/E1jskdhXAQH4R7c8RSXnY3CuGQXq6I1fm113Sd2x+NKLxO83DylO6O8MeTtzglwLMG7JLASeNCy5RjAHGzdEV1hVRu04bKSQz9VCfRcK03M3xjcnTL0pM1Ut4eSZ4Ap4TLzR01wCEuLJmxAhHZm4puJ9VhPrJOMsVxST0yqWxP7pe1xr3R8DL6+Un+vEZhEEmMbtgdQ3nCa6r6UmoIvVjMz+MVHt5F1PJLCTm/+AvLjxEiiMJzA/xnJimUk49Lkbcyixe6Oa6i4DOUAxJ67u05VsCTAK9Pc5MBzTrfdPded/U3l4g9WZa/eO5skEfJKfOe57s2BI0h23DzVze5/HiHToqJ+0FUDtC9DvzXTtOxfd2Budvb4P8lSjXIditytBQ48eDczVJFoaaifFRzQg6hWXFxZJX47zO4RdbDrY11yzYrf5sF0djPaxTtPQW4NhU2hk7p3oeVYn6eitJgKy826lpN8TFuTJrrym0lvQCOgeQi76aWSviepwFHbHrBAv8pAAf5fj6fBDQwYul1kOnY6wevYMqlEdUT3DBg7h+BMszPV/+irkAxALhlynp7lBmREfDb1kCuPGfsBe3eHfuzQHyqE85L34Q6gIw qzr+yhUO TzQwuOXEV9MlJnGBost8ywX1F34hccoM5dVp31bNW432opIgM4oVoN7fD42snTzdlPtuCRd+U2NJgsPB6ayp94fuUw7S+8c/kee8gnngVr3DzGS1pYP+HByPKDfes1RMoYuyuKOjSwJrKQe5kELNRGdPfUw== 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: The generic implementation of pte_{alloc_one,free}_kernel now calls the [cd]tor, without initialising the ptlock needlessly as pagetable_pte_ctor() skips it for init_mm. Align sparc64 with the generic implementation by ensuring pagetable_pte_[cd]tor() are called for kernel PTEs. As a result the kernel and user alloc/free functions have the same implementation, and since pgtable_t is defined as pte_t *, we can have both call a common helper. Signed-off-by: Kevin Brodsky --- arch/sparc/mm/init_64.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index cd60a0a8ca0e..0a1b2b1adad4 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c @@ -2882,18 +2882,7 @@ void __flush_tlb_all(void) : : "r" (pstate)); } -pte_t *pte_alloc_one_kernel(struct mm_struct *mm) -{ - struct page *page = alloc_page(GFP_KERNEL | __GFP_ZERO); - pte_t *pte = NULL; - - if (page) - pte = (pte_t *) page_address(page); - - return pte; -} - -pgtable_t pte_alloc_one(struct mm_struct *mm) +static pte_t *__pte_alloc_one(struct mm_struct *mm) { struct ptdesc *ptdesc = pagetable_alloc(GFP_KERNEL | __GFP_ZERO, 0); @@ -2906,9 +2895,14 @@ pgtable_t pte_alloc_one(struct mm_struct *mm) return ptdesc_address(ptdesc); } -void pte_free_kernel(struct mm_struct *mm, pte_t *pte) +pte_t *pte_alloc_one_kernel(struct mm_struct *mm) { - free_page((unsigned long)pte); + return __pte_alloc_one(mm); +} + +pgtable_t pte_alloc_one(struct mm_struct *mm) +{ + return __pte_alloc_one(mm); } static void __pte_free(pgtable_t pte) @@ -2919,6 +2913,11 @@ static void __pte_free(pgtable_t pte) pagetable_free(ptdesc); } +void pte_free_kernel(struct mm_struct *mm, pte_t *pte) +{ + __pte_free(pte); +} + void pte_free(struct mm_struct *mm, pgtable_t pte) { __pte_free(pte);