From patchwork Tue Apr 8 09:52:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Brodsky X-Patchwork-Id: 14042565 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 4325DC3600C for ; Tue, 8 Apr 2025 09:53:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5E0E7280005; Tue, 8 Apr 2025 05:53:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5675A280001; Tue, 8 Apr 2025 05:53:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3E0A1280005; Tue, 8 Apr 2025 05:53:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 1FE65280001 for ; Tue, 8 Apr 2025 05:53:22 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 3D4D0C09EE for ; Tue, 8 Apr 2025 09:53:22 +0000 (UTC) X-FDA: 83310413844.18.21D10E4 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf09.hostedemail.com (Postfix) with ESMTP id 9C03114000C for ; Tue, 8 Apr 2025 09:53:20 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf09.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=1744106000; 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=3dDgWlNxtleZVCX3MWpmcRMjX6SMpusMABcu8Cw32FM=; b=3a4GXXNUJeO7Dkb2aYopqgkoaV8rb1VBISfYM3q+Z4JVcKACF2LmXMqew48iHG2S/rQRfc TGW0oJ/pPZuwE12gR7qYj1Z0K3/IRfXIKAwpo8M9QdSUS2Gq2PyukSwEKZzIYjl7GTi0VX u6mGgIqW3wJhMCSefZ54phBGqmqTdfw= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf09.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=1744106000; a=rsa-sha256; cv=none; b=qYW+ECe0bF8yQY1//Gz3oiJJDQ7RDprFiyijLYmln8U3JJodxsKcuvcxOkjlmyRPl3O/Tb OJwEAAh/43D+Xos0eUFFScEfSsAF8iJZkNRzMj/Vw58BdO9TTF/gibXh0BV46JnrcC0x2I 5gntZYeDzqAIXXCIo7gofM51p2sCgi8= 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 AE8B616A3; Tue, 8 Apr 2025 02:53:20 -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 6F7EA3F6A8; Tue, 8 Apr 2025 02:53:15 -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 02/12] x86: pgtable: Always use pte_free_kernel() Date: Tue, 8 Apr 2025 10:52:12 +0100 Message-ID: <20250408095222.860601-3-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: rspam01 X-Stat-Signature: tspb4y7qcijeixbu19xa7scftwfaxrsn X-Rspam-User: X-Rspamd-Queue-Id: 9C03114000C X-HE-Tag: 1744106000-594716 X-HE-Meta: U2FsdGVkX1+8MHt/UTZu/lIHdJdrENfMjmaW9VBP8Vw4VKNQ965JdDlCCCxwTqXWzUXXBuRoOLOABkPpnPxdls7vsPkgwoLiXor2DIG3R2vRNg6DpJ1i0+IHPhCPytZpaMbkX6idbibhJaYTokYRsNJEA9QpoZndiyBkocsSf8rzNR0Ha7zekkJesrti9LBlnggHGmc8m876q1yHj1mxsWu6KCMm2KYc65b/ULq0sD3sgJNS0m80/KxYTk9Y4MInlinZHzLpl90o6ze8XXQkroIauQzLa0qSt8KXAYuLN9TxHv4G28Y643UkBbeSkjYAIlOje3w9hSdt7un+cER6cHlfIAUdbpbe0qihTqOV3B2xUyeURuOBYbDd67DnLSMbBkM2RlntxCCfsPhsmkJaCxGae/8KIipRPEK+DUh63qZBKE9k6Nmg/aL1hbvXzptW5Qzuo3tzM3V8+zs7imlr+nIFnjs+F05jgAsdWqd0JGQfZakSwHjTEYovONMTZW1Dt/TtmHZP57hyF3+ysOF4+iB0L6OJPTCQb9JtvpZFkSQ7zIP+65DzRCrX/WfdyZL3FqBywIi+517/cMj8oRbJ2LT+X30+3YPNfKdYCJBLkfGPcqaL+rc+bJOU+qT/UykwF8DyqH9DhkC5xRHOOfuLr2n/hb85qKyOM667+avL61DHS1+tJPXoVtRFr5OrZgm+Pky366Av5fjpXB/iy/TWuFiPsQ/mM4cRPBpdNpJi5kDwe+Ucg89spEh7TB5QsWiDkEuFYjk6zIOOqxGDhex4F4xCkxr5ahFE7xHLRWrg6qXtRndbdVHHVcto7COIHG+cbhZT8HI46UbPCSpB8nU+vmD+sa6nuHNASP4RUC9V3anozzqVKtynt++ZVbPl0Siiy5rYRi06Y05Y9ywycvnCn1QoAk0T6AP4uIRVqc/8HYOAZYHTSB2XqVqAWiPPXzUAKZXRwnRdT4XPGuVnDzh vN16ajlQ aCYxhsx26Ty2WovkpGlMyELvBZDRXIKNH0CDrcL6NN9DmrCdBNJxul1C/pMWqqx3JziHAy5TGlja5eFbfo4jlO9BshVFs6xpbkPywiJLvrNdSiAA+WDCSwfIKaBITmhdkIeJ96al9PucqviNkzGWS5pKFDdUYVp9DraDifCGC+psYo9sfh3/9JYZHZU2goVVB4bbfQMIORTurj1s= 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: Page table pages are normally freed using the appropriate helper for the given page table level. On x86, pud_free_pmd_page() and pmd_free_pte_page() are an exception to the rule: they call free_page() directly. Constructor/destructor calls are about to be introduced for kernel PTEs. To avoid missing dtor calls in those helpers, free the PTE pages using pte_free_kernel() instead of free_page(). While at it also use pmd_free() instead of calling pagetable_dtor() explicitly at the PMD level. Signed-off-by: Kevin Brodsky Acked-by: Dave Hansen --- arch/x86/mm/pgtable.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index 7930f234c5f6..1dee9bdbeea5 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -809,14 +809,13 @@ int pud_free_pmd_page(pud_t *pud, unsigned long addr) for (i = 0; i < PTRS_PER_PMD; i++) { if (!pmd_none(pmd_sv[i])) { pte = (pte_t *)pmd_page_vaddr(pmd_sv[i]); - free_page((unsigned long)pte); + pte_free_kernel(&init_mm, pte); } } free_page((unsigned long)pmd_sv); - pagetable_dtor(virt_to_ptdesc(pmd)); - free_page((unsigned long)pmd); + pmd_free(&init_mm, pmd); return 1; } @@ -839,7 +838,7 @@ int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) /* INVLPG to clear all paging-structure caches */ flush_tlb_kernel_range(addr, addr + PAGE_SIZE-1); - free_page((unsigned long)pte); + pte_free_kernel(&init_mm, pte); return 1; }