From patchwork Tue Apr 8 09:52:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Brodsky X-Patchwork-Id: 14042569 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 2ACE6C369A1 for ; Tue, 8 Apr 2025 09:53:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 26452280003; Tue, 8 Apr 2025 05:53:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 23AB7280001; Tue, 8 Apr 2025 05:53:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 12978280003; Tue, 8 Apr 2025 05:53:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id E9260280001 for ; Tue, 8 Apr 2025 05:53:40 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id EB98C1A0A09 for ; Tue, 8 Apr 2025 09:53:40 +0000 (UTC) X-FDA: 83310414600.21.A5BE6FD Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf10.hostedemail.com (Postfix) with ESMTP id 521F5C0003 for ; Tue, 8 Apr 2025 09:53:39 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf10.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=1744106019; a=rsa-sha256; cv=none; b=kbEG8y8LBQ1fMVLCeNfGq7loXPwEjOkbqXmwq+lkO4+disNXWSPA2OupoHge3UM4oYJw2E Lqn7VS5O/6+n/1pmvihEc3fBE1u7OuS26gPgM198zCNog4qEwYZfAyvxZ5ZacIU1S+0Y+g G1gjIjrRBsRLGy8+zIYvEbM8DbAst+4= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf10.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=1744106019; 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=mhR2Iq+beAhq3GZKKAxztcVBqkxIucxufOP5/zFYWuY=; b=FdGoAK2vCiCs9U5X30gp8u3lzxVFwCanNW1QBq4WQyOB4XaCs1Hj96tkS52cJBIQXZPvxR W1P1F4Du9Lik0V8QRTPYvqGSX2ux78F2oaXqzqRh3Gwru+MK1GmwRQ7BzUL9dQj8rCZZ98 PlTV7seagIZtF7J3AgA4Ddu2loZ+fUw= 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 861E82309; Tue, 8 Apr 2025 02:53:39 -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 4566F3F6A8; Tue, 8 Apr 2025 02:53:34 -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 06/12] sparc64: mm: Call ctor/dtor for kernel PTEs Date: Tue, 8 Apr 2025 10:52:16 +0100 Message-ID: <20250408095222.860601-7-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-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 521F5C0003 X-Stat-Signature: fxecdotyh83wa7y751nrxzgq8sgg6yrf X-Rspam-User: X-HE-Tag: 1744106019-985248 X-HE-Meta: U2FsdGVkX18rhu5G97DxXJYXWKDMD6N2cJNCqOwlUVjBwWvJfv7Zx4Uyaa81igmIhyQ05tL+3dkZhlyYmkHSiQv3lirpHQkKF03z12s2imV3WIxECv7A4sc61IDgAEX7wXHPXvizjJ2r1XZ87euxUDTBFwDWyISAY3bopuymCF50LpSMEGa2oCWCXJsaTmmaBp3vFEnlPkmjhmrldkjiKCYBBvcw3KExG2j3nJuKa6lU45R3KXUy3J6wTAO4erCqLkmazms8daNZZvH2GCap7CdFwo2rnv+cDtNHojUuZRcUSITajn6+bfKXa+2ybHL6Divp2iAEDm5kRF5DhoBJTNr88PdNp05DZ1V3dHcHMDU+Ik/3Vl13e304eUkh+FBiDqcI7PJo4I+BNOv6eUaj1kZO1rlVqrac1EAeW4PysmHkTfWq7nPaJdPbxQIZAl8YCjciCOxgfFhp0UMPysmbkXfzRUk4pQIjy4e0dQrzQwWb1xC+VkzDAx9ahhoRCBpr4hh+waM2nd3qtGeEhxk9TDAvCFfe/awNYaIAODORUHaitUQnuvnwapGPnp2E2hSiwZPdqTcb45Z65mKSEev4RuCA7iQ/FMuZPZDQkRfMCxlwRn+reVo5QTwfqyFTPtRqixCLdWIItONXaQfoaT6JjUE1LfYDvVOvyCrrEZDarVG8Kv8UBaO9NPwKxqlvIpXVByeQEXFmdX91i9skaHF+pEneeuQCBhY343jLEm2X38tOqR7Rbx1RtUWOKmiZqe1pE5t+s4GECIWs2bzi8cOfVa2fyrZtyJkKBpd4Rj84j4PcJvv5hUgI6uKdPzjhYDRUtACIxglBA09PnNZNi1EcaDKfbKzrifjbY3L6FktWzyAzXd5YhtekunvhQ6BlLexNvP6WZaIdSnc+lkm309jWI8tkEGxws+7dNRU5hWdt5KnQCjwE8gxIq0B7qjOIyc+wA4nw+agAL7tqgnA5yvm M9W1DoXq yVlgod52HyGs0T1/a9lqYKvyjUMt6eJ3MUfd5+6t+5Aa4dEo1kOMD7brUizCLS3pcnNdRrSQNRNhFnxbLeSLT/nQIEs4Tirqbi6+I1uR8admAoOi0byg4PNZZpFqyvcX7CMhtABnq7/t4aHC43Yt943E+0w== 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 5c8eabda1d17..25ae4c897aae 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c @@ -2878,18 +2878,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); @@ -2902,9 +2891,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) @@ -2915,6 +2909,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);