From patchwork Mon Mar 17 14:16:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Brodsky X-Patchwork-Id: 14019348 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 73D2AC35FF3 for ; Mon, 17 Mar 2025 14:21:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2428F280006; Mon, 17 Mar 2025 10:21:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1CDCF280001; Mon, 17 Mar 2025 10:21:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 046B5280006; Mon, 17 Mar 2025 10:21:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id DBEFA280001 for ; Mon, 17 Mar 2025 10:21:50 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 388B2141F97 for ; Mon, 17 Mar 2025 14:21:52 +0000 (UTC) X-FDA: 83231256864.22.E0626C1 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf04.hostedemail.com (Postfix) with ESMTP id DC2804001D for ; Mon, 17 Mar 2025 14:21:49 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=none; spf=pass (imf04.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=1742221310; 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=/BkpJ0cTKq4ChrXalGvhAQpS6e0Bp2XA+877e60Q9Ds=; b=casQlAUkKaJ8rvRkClIekiymZxYR7bkKde4J3m6VsWlW1VApIDeq/aG51vWZgcbsaHpw4t qmbJHmT8o9/bGevF6e0KN3SrALjut9s7h3sd0SWEQefWpNd2ihpJ9NgTbPz4cHh3FkYA8Z XWsHU10JxzV2ligmF0v+90T9qAOB274= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742221310; a=rsa-sha256; cv=none; b=rKOZmD/C9UBTOCstJNnCkf0yxgV0FsaFoCcquQgOjEfj8CYiLsuQ9HcJe+8UZG4tWJaxu8 ilFeL390RbfaY6y8qziteLkFrzYgUjrCjo/+emxIwehQEL9pGIPEx4fwmYCm4D0NPaULco ZMY7L/UdI7NfRkDGTUYaXBqdq0NtESk= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=none; spf=pass (imf04.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 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 005532576; Mon, 17 Mar 2025 07:21:58 -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 CC9AA3F63F; Mon, 17 Mar 2025 07:21:44 -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 04/11] powerpc: mm: Call ctor/dtor for kernel PTEs Date: Mon, 17 Mar 2025 14:16:53 +0000 Message-ID: <20250317141700.3701581-5-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-Server: rspam01 X-Rspamd-Queue-Id: DC2804001D X-Stat-Signature: xeob7pt67zzj8yrsap4ubjnu9hjxebq7 X-HE-Tag: 1742221309-105431 X-HE-Meta: U2FsdGVkX19vK02TTiRiqeHJ2lE+6Hz/cqAPvZteAPzNIx5Kd+ywGVJyste6xnbbr+FmzBhcSjeGP5Cz00Vp//oWjbmsSNjotoSwK7nqAP31cIEUFbyo+rJvrmaFWWnsGLVcfqUMx4x58baRfRT/2qn31jypRueQ6oiGv3A7iqg9zyWuKaGnhrzAga8RSxhdkTLSh9BZSo8uqar3iRFWSvmrKSwl5vUsLyLO1JWmO45y67QTENLqQMpFTe5ofyCPDiONcKtkcSuY5Of/J6gBAMMPu2aJQ1MC5wCjdggMPARk+z4ZOpAeidmxxTJkE9WgYvab9ZhXB4D8s/jb/eprOSmc6aQca6GPxsPfqOtQhosPTC0jHkqMgvYOd0CFfWUbK+plyY16muw0ky+AYQDgf1RmzlJkjATuuRXa5ZIj8rUZI2VEqRMIKwIFass+BoI2qpD4DCec+6iAemltBMoaiNbpwMKNoXDwtVVfqCO8U8AHA2eXdvqcSGaakgu8xwgjL9Nk9FZBk3AchLFNwmcKQeyI16NYNJ5h/3THI3xa5V7wFG0Ml6NGbFpLARBVPqaZYVmP9nTvJNT3++8WVVOOzBMFuTt/pcpTM9aBB8dMmQZuNL/M2O3pWtpN4QdDLfSl1Gso/UF0zuD8iS7YpfNzqN158t5XI4irGBEqdQaTzKlEJ2YddehN4IY9ww/+WHsdjK2nrUD2pFjUYPvcNmzsm3wXMhheXfLIi7F9OemKBjJaOiR+1V374jFdkvqeUEv8KoD6PfvP97qaM2/sNlVDIR3SEpkKIKpiR4DvaZMqst4MypQXir6S67LOq20kEdajUYFJwJQQ8lBvXryJob9dB+QarTGxboHiu3U1PH9YQfjV8TNoxL52PyC0xORzyq2gKJ2U6AwIfYfmWl1z74NCwxFErTmN60r9bnTFhlFObpupiyTryvtVWY4sbkanu40qXAPrSvulECuY3Kyy3HQ ONJXMfzo med5l9cfAHvrjnKUc5VxxPIQ9KoV2j3m1UkrYIpyzZpYUtUB1yy86nt95PqXimWPKKjzyh24edxRC46KSJtwBy+4GeLIeyZsP+p3jr6I2dMVA6L6jKEnsB6L2YJXXoySMTvU07qZSOjZYjJP2XGvasE1J3g== 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. On powerpc, all functions related to PTE allocation are implemented by common helpers, which are passed a boolean to differentiate user from kernel pgtables. This patch aligns the powerpc implementation with the generic one by calling pagetable_pte_[cd]tor() unconditionally in those helpers. Signed-off-by: Kevin Brodsky --- arch/powerpc/mm/pgtable-frag.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/arch/powerpc/mm/pgtable-frag.c b/arch/powerpc/mm/pgtable-frag.c index 387e9b1fe12c..77e55eac16e4 100644 --- a/arch/powerpc/mm/pgtable-frag.c +++ b/arch/powerpc/mm/pgtable-frag.c @@ -56,19 +56,17 @@ static pte_t *__alloc_for_ptecache(struct mm_struct *mm, int kernel) { void *ret = NULL; struct ptdesc *ptdesc; + gfp_t gfp = PGALLOC_GFP; - if (!kernel) { - ptdesc = pagetable_alloc(PGALLOC_GFP | __GFP_ACCOUNT, 0); - if (!ptdesc) - return NULL; - if (!pagetable_pte_ctor(mm, ptdesc)) { - pagetable_free(ptdesc); - return NULL; - } - } else { - ptdesc = pagetable_alloc(PGALLOC_GFP, 0); - if (!ptdesc) - return NULL; + if (!kernel) + gfp |= __GFP_ACCOUNT; + + ptdesc = pagetable_alloc(gfp, 0); + if (!ptdesc) + return NULL; + if (!pagetable_pte_ctor(mm, ptdesc)) { + pagetable_free(ptdesc); + return NULL; } atomic_set(&ptdesc->pt_frag_refcount, 1); @@ -124,12 +122,10 @@ void pte_fragment_free(unsigned long *table, int kernel) BUG_ON(atomic_read(&ptdesc->pt_frag_refcount) <= 0); if (atomic_dec_and_test(&ptdesc->pt_frag_refcount)) { - if (kernel) - pagetable_free(ptdesc); - else if (folio_test_clear_active(ptdesc_folio(ptdesc))) - call_rcu(&ptdesc->pt_rcu_head, pte_free_now); - else + if (kernel || !folio_test_clear_active(ptdesc_folio(ptdesc))) pte_free_now(&ptdesc->pt_rcu_head); + else + call_rcu(&ptdesc->pt_rcu_head, pte_free_now); } }