From patchwork Tue Apr 8 09:52:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Brodsky X-Patchwork-Id: 14042568 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 3CCF1C369A1 for ; Tue, 8 Apr 2025 09:53:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 565D7280008; Tue, 8 Apr 2025 05:53:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 515C8280001; Tue, 8 Apr 2025 05:53:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3DD68280008; Tue, 8 Apr 2025 05:53:36 -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 1FF2A280001 for ; Tue, 8 Apr 2025 05:53:36 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 4420A160953 for ; Tue, 8 Apr 2025 09:53:36 +0000 (UTC) X-FDA: 83310414432.06.EC7063F Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf29.hostedemail.com (Postfix) with ESMTP id 95FF612000B for ; Tue, 8 Apr 2025 09:53:34 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf29.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=1744106014; a=rsa-sha256; cv=none; b=QypjVpp3DvwgraylonoSZcrt0Bez/cporGco8j8KP6oYp2fX5iCnutZbbUtnG8K/I7xtrt qGTylO+xk6xFEZMX9uvZFfK15Fpc//l3bwJKZIcHl/8eFaH9u9EQElgpyqQQdnO8FhzSev YqdjBFA4ArlIsC+Zz2/w0t8nRJW92V8= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf29.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=1744106014; 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=M9SR2aqaVOrRm74lvLlr1e6UM+MnPC7HI/1sr3s7I3iIivjVROCniyfPP7tXUZL6xIwR++ DsBT5JO+EP+GoOeyqGe0a+6VwC1MVaKcontYJLHbLtg5kTm1fq6UetijLGITCLXtE951KB LIVBdeb78aHIO6+0bUPAhax+J+y9SrU= 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 CCE4822FC; Tue, 8 Apr 2025 02:53:34 -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 8D5873F6A8; Tue, 8 Apr 2025 02:53:29 -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 05/12] powerpc: mm: Call ctor/dtor for kernel PTEs Date: Tue, 8 Apr 2025 10:52:15 +0100 Message-ID: <20250408095222.860601-6-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: 95FF612000B X-Stat-Signature: accfmqq4ytru31nyu1q5nx4e8e5kqz3c X-HE-Tag: 1744106014-981398 X-HE-Meta: U2FsdGVkX19pv6jQBzSqrCql2lfAJys9Bk+RR0iM0E3VHSYzj7otzM97YD94+4oRCcaNBoIZXpEvYVSPN2ALkU9c0D3PjxV8t7NRvIxLcXi0LugKEsIcl0ZRAY/tEVzJFF9Pqygtv0THtymqE1pVUVTNndpFNQ1N+HAY1CcLDfPODLjcCe0EjBY+Tsf0cxnostzjMCg3xkf95xiE8cPbK2dEh01Fom6kIuAQv8jTUfB3wJZloF65lbOfI48V5TEfaTu07ZfSBh2/Uo67C/st6Zh3arPD/SzJG34bdolqhd/ywYT9enLo5k4ogHGVm7pEoU/p12OoVBqKgkgCoz9lk39/cJm0OP71nWJLvyOUlY7ztqpUu9xWQWeQjcN9S7HK1Gq614fLWdLVZWz60Kgbxddtgx0+qdVPhRAuUjN51y85uiNy6MVAHZTSPqZ27itU8SRpSDuQdrmpgpz38PLlh0MO2BgznUAVOcXDQq0Ooma9226j2jBCAETkcmIm0l1+0MP6e1c3++U6C9ZU8TKjtvEnsTaM156ba9VwxL7+zlzij4MOPWomA8WVsuk41Ve05F+8mC5QMgAMdxnS/BzwTa44O91JqB83dDrNt96t08TTqR4bCO80zdBJCSCeVAJOIn9O+gK7kyeYu/QMulcVpfL91ixAKqLfufQpVVuC7hnNnQ++WEv7nujXRr93WDa4hYdNTmkI8llfEx8fmUg5/zHtOh8iqMWngZXImAPXaG0Bwv01FGorqUw+qj3t0G6xUDGy/zN0R4myaLmXLJAdbgl8uZkGUs2DBelq7sXxGyRBRxry/iLtB9mug5pDrWwXuAMZkVmc2LuO59tPVGcHoxhMd4F5cuLwnjwnIYVNrxD4gj14FtqQkb+k+hZz8VkW13LJxo6lUr9hLonF5BLWqYlWykNdxMBGGHLFNYXItLRVqqMR1SHCJfZPN9X89OqP1solIXZy1iVckX6D3kF jkLxeYpS 54m9UD3eH0OtNCVUSnPt3b0mMW2oAYj9seFFoF8F7orfBVLyqqrC3VHKml0glCZv1GO2bhy2O/4ONp//2h4cXJ3NB8PyNseuekHFJnkQtct5eFXrk6Bs3tCxl27kovAU7QaJpjmmR8UIrIXjr1A9b+v9YTw== 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); } }