Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2216651/?format=api
{ "id": 2216651, "url": "http://patchwork.ozlabs.org/api/patches/2216651/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20260327021403.214713-19-usama.arif@linux.dev/", "project": { "id": 2, "url": "http://patchwork.ozlabs.org/api/projects/2/?format=api", "name": "Linux PPC development", "link_name": "linuxppc-dev", "list_id": "linuxppc-dev.lists.ozlabs.org", "list_email": "linuxppc-dev@lists.ozlabs.org", "web_url": "https://github.com/linuxppc/wiki/wiki", "scm_url": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git", "webscm_url": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/", "list_archive_url_format": "https://lore.kernel.org/linuxppc-dev/{}/", "commit_url_format": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}" }, "msgid": "<20260327021403.214713-19-usama.arif@linux.dev>", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/20260327021403.214713-19-usama.arif@linux.dev/", "date": "2026-03-27T02:09:00", "name": "[v3,18/24] mm: thp: remove pgtable_trans_huge_{deposit/withdraw} when not needed", "commit_ref": null, "pull_url": null, "state": "handled-elsewhere", "archived": false, "hash": "2331b8f03f734a0b7b28e6a1a86e8343a2041038", "submitter": { "id": 92719, "url": "http://patchwork.ozlabs.org/api/people/92719/?format=api", "name": "Usama Arif", "email": "usama.arif@linux.dev" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20260327021403.214713-19-usama.arif@linux.dev/mbox/", "series": [ { "id": 497678, "url": "http://patchwork.ozlabs.org/api/series/497678/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=497678", "date": "2026-03-27T02:08:43", "name": "[v3,01/24] mm: thp: make split_huge_pmd functions return int for error propagation", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/497678/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2216651/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2216651/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "\n <linuxppc-dev+bounces-18861-incoming=patchwork.ozlabs.org@lists.ozlabs.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "linuxppc-dev@lists.ozlabs.org" ], "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256\n header.s=key1 header.b=txcrfU3Z;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org\n (client-ip=2404:9400:21b9:f100::1; helo=lists.ozlabs.org;\n envelope-from=linuxppc-dev+bounces-18861-incoming=patchwork.ozlabs.org@lists.ozlabs.org;\n receiver=patchwork.ozlabs.org)", "lists.ozlabs.org;\n arc=none smtp.remote-ip=91.218.175.184", "lists.ozlabs.org;\n dmarc=pass (p=none dis=none) header.from=linux.dev", "lists.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256\n header.s=key1 header.b=txcrfU3Z;\n\tdkim-atps=neutral", "lists.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=linux.dev\n (client-ip=91.218.175.184; helo=out-184.mta0.migadu.com;\n envelope-from=usama.arif@linux.dev; receiver=lists.ozlabs.org)" ], "Received": [ "from lists.ozlabs.org (lists.ozlabs.org\n [IPv6:2404:9400:21b9:f100::1])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fhkmH6Ygcz1y1j\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 27 Mar 2026 13:16:47 +1100 (AEDT)", "from boromir.ozlabs.org (localhost [127.0.0.1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4fhklk4pBSz3bTR;\n\tFri, 27 Mar 2026 13:16:18 +1100 (AEDT)", "from out-184.mta0.migadu.com (out-184.mta0.migadu.com\n [91.218.175.184])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 4fhklj1jqJz2xmX\n\tfor <linuxppc-dev@lists.ozlabs.org>; Fri, 27 Mar 2026 13:16:17 +1100 (AEDT)" ], "ARC-Seal": "i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1774577778;\n\tcv=none;\n b=LRqhtAEwMVpXutpBWJz3/DWYGf+eCfBJjF/DCszD6nHCZkMO5Dd5uI5lV7SFo58FJBGjAHRPPmgL9LAChPUw1etrdTvQBetQBhR4T+GDxo/L/CJ8tYfCRMhey5qBi3FhWMa0wiV+SQLoXbjBaIRV4swiRhFallmWsoDBins5C/JkrQuy3FT7QZwzXlMLj2Bkbn3rcNeGn9Nxl0smop88fANkSrVGAanHLJd1hQV/DrYBHNSOZt15FfQRMesVgwlfb9AHKBZ1J1MM4QjmqHN9EcGe5ZdSSBj6VFY2WxDtwKi8hvJ8r71hqf9J+QTQUXq0wTTe+qbhvqOxM9WwKocdzA==", "ARC-Message-Signature": "i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707;\n\tt=1774577778; c=relaxed/relaxed;\n\tbh=iYCwapbn/lTyj+e7LtoHxlqJFgqF7EX0syxt7rVM1Zo=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version:Content-Type;\n b=MT4mhy5po9OhtntybVQqwFymtSgLsdv+3pAOKRGR0+d8+QN2ut7PRj3OD0v4z+XGURRVzB3GpkZvUg0mMYRWeqFoHqO3zMNodOXz1D9MpqNscR9A/2/1MaVk6Vr7RmI5mkKW/tXzwDQak9F/87Kxz4w7pV/zEie91E4dW9M6PLUfYa5/gdULeNpQMw29EyaFG/5fDvZOFAPqgeBZ4RhPuIsgIy3F3heDj4KdYQI/iwTJoL1CJQlDFjqTIMFJW043MChZAOMkJ6Dm2yYai/8vY+9pqR33Wqm6EfysN+vWbX1FaxMWE4SdHWud/sopUczWmpXVGEYUfkutqdtotoovyw==", "ARC-Authentication-Results": "i=1; lists.ozlabs.org;\n dmarc=pass (p=none dis=none) header.from=linux.dev; dkim=pass (1024-bit key;\n unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256\n header.s=key1 header.b=txcrfU3Z; dkim-atps=neutral;\n spf=pass (client-ip=91.218.175.184; helo=out-184.mta0.migadu.com;\n envelope-from=usama.arif@linux.dev;\n receiver=lists.ozlabs.org) smtp.mailfrom=linux.dev", "X-Report-Abuse": "Please report any abuse attempt to abuse@migadu.com and\n include these headers.", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1;\n\tt=1774577758;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\t to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\t content-transfer-encoding:content-transfer-encoding:\n\t in-reply-to:in-reply-to:references:references;\n\tbh=iYCwapbn/lTyj+e7LtoHxlqJFgqF7EX0syxt7rVM1Zo=;\n\tb=txcrfU3Z3cqsr4kM8egih5yBbs+GKiMnbBtOqZAy3/1n6NN5mRJoqoBLEB8uutYAh1MlPA\n\twFv2iEWhRlMUDe5vOtRTYXLnTetgc+HQLwXlzSzSrbTfDFGJVHZvzzIk17r377TEYzDuFp\n\tCuXwGeRfuJ/IB9iX79ItYRHGbBpTagM=", "From": "Usama Arif <usama.arif@linux.dev>", "To": "Andrew Morton <akpm@linux-foundation.org>,\n\tdavid@kernel.org,\n\tLorenzo Stoakes <ljs@kernel.org>,\n\twilly@infradead.org,\n\tlinux-mm@kvack.org", "Cc": "fvdl@google.com,\n\thannes@cmpxchg.org,\n\triel@surriel.com,\n\tshakeel.butt@linux.dev,\n\tkas@kernel.org,\n\tbaohua@kernel.org,\n\tdev.jain@arm.com,\n\tbaolin.wang@linux.alibaba.com,\n\tnpache@redhat.com,\n\tLiam.Howlett@oracle.com,\n\tryan.roberts@arm.com,\n\tVlastimil Babka <vbabka@kernel.org>,\n\tlance.yang@linux.dev,\n\tlinux-kernel@vger.kernel.org,\n\tkernel-team@meta.com,\n\tmaddy@linux.ibm.com,\n\tmpe@ellerman.id.au,\n\tlinuxppc-dev@lists.ozlabs.org,\n\thca@linux.ibm.com,\n\tgor@linux.ibm.com,\n\tagordeev@linux.ibm.com,\n\tborntraeger@linux.ibm.com,\n\tsvens@linux.ibm.com,\n\tlinux-s390@vger.kernel.org,\n\tUsama Arif <usama.arif@linux.dev>", "Subject": "[v3 18/24] mm: thp: remove pgtable_trans_huge_{deposit/withdraw} when\n not needed", "Date": "Thu, 26 Mar 2026 19:09:00 -0700", "Message-ID": "<20260327021403.214713-19-usama.arif@linux.dev>", "In-Reply-To": "<20260327021403.214713-1-usama.arif@linux.dev>", "References": "<20260327021403.214713-1-usama.arif@linux.dev>", "X-Mailing-List": "linuxppc-dev@lists.ozlabs.org", "List-Id": "<linuxppc-dev.lists.ozlabs.org>", "List-Help": "<mailto:linuxppc-dev+help@lists.ozlabs.org>", "List-Owner": "<mailto:linuxppc-dev+owner@lists.ozlabs.org>", "List-Post": "<mailto:linuxppc-dev@lists.ozlabs.org>", "List-Archive": "<https://lore.kernel.org/linuxppc-dev/>,\n <https://lists.ozlabs.org/pipermail/linuxppc-dev/>", "List-Subscribe": "<mailto:linuxppc-dev+subscribe@lists.ozlabs.org>,\n <mailto:linuxppc-dev+subscribe-digest@lists.ozlabs.org>,\n <mailto:linuxppc-dev+subscribe-nomail@lists.ozlabs.org>", "List-Unsubscribe": "<mailto:linuxppc-dev+unsubscribe@lists.ozlabs.org>", "Precedence": "list", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-Migadu-Flow": "FLOW_OUT", "X-Spam-Status": "No, score=-0.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,\n\tDKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS,SPF_PASS\n\tautolearn=disabled version=4.0.1 OzLabs 8", "X-Spam-Checker-Version": "SpamAssassin 4.0.1 (2024-03-25) on lists.ozlabs.org" }, "content": "Since the previous commit made deposit/withdraw only needed for\narchitectures where arch_needs_pgtable_deposit() returns true (currently\nonly powerpc hash MMU), the generic implementation in pgtable-generic.c\nand the s390/sparc overrides are now dead code — all call sites are\nguarded by arch_needs_pgtable_deposit() which is compile-time false on\nthose architectures. Remove them entirely and replace the extern\ndeclarations with static inline no-op stubs for the default case.\n\npgtable_trans_huge_{deposit,withdraw}() are renamed to\narch_pgtable_trans_huge_{deposit,withdraw}().\n\nSigned-off-by: Usama Arif <usama.arif@linux.dev>\n---\n arch/powerpc/include/asm/book3s/64/pgtable.h | 12 +++---\n arch/s390/include/asm/pgtable.h | 6 ---\n arch/s390/mm/pgtable.c | 41 --------------------\n arch/sparc/include/asm/pgtable_64.h | 6 ---\n arch/sparc/mm/tlb.c | 36 -----------------\n include/linux/pgtable.h | 16 +++++---\n mm/debug_vm_pgtable.c | 4 +-\n mm/huge_memory.c | 26 ++++++-------\n mm/khugepaged.c | 2 +-\n mm/memory.c | 2 +-\n mm/migrate_device.c | 2 +-\n mm/pgtable-generic.c | 32 ---------------\n 12 files changed, 35 insertions(+), 150 deletions(-)", "diff": "diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h\nindex 60e283cf22be1..f1f36a4ed2bc8 100644\n--- a/arch/powerpc/include/asm/book3s/64/pgtable.h\n+++ b/arch/powerpc/include/asm/book3s/64/pgtable.h\n@@ -1360,18 +1360,18 @@ pud_t pudp_huge_get_and_clear_full(struct vm_area_struct *vma,\n \t\t\t\t unsigned long addr,\n \t\t\t\t pud_t *pudp, int full);\n \n-#define __HAVE_ARCH_PGTABLE_DEPOSIT\n-static inline void pgtable_trans_huge_deposit(struct mm_struct *mm,\n-\t\t\t\t\t pmd_t *pmdp, pgtable_t pgtable)\n+#define arch_pgtable_trans_huge_deposit arch_pgtable_trans_huge_deposit\n+static inline void arch_pgtable_trans_huge_deposit(struct mm_struct *mm,\n+\t\t\t\t\t\t pmd_t *pmdp, pgtable_t pgtable)\n {\n \tif (radix_enabled())\n \t\treturn radix__pgtable_trans_huge_deposit(mm, pmdp, pgtable);\n \treturn hash__pgtable_trans_huge_deposit(mm, pmdp, pgtable);\n }\n \n-#define __HAVE_ARCH_PGTABLE_WITHDRAW\n-static inline pgtable_t pgtable_trans_huge_withdraw(struct mm_struct *mm,\n-\t\t\t\t\t\t pmd_t *pmdp)\n+#define arch_pgtable_trans_huge_withdraw arch_pgtable_trans_huge_withdraw\n+static inline pgtable_t arch_pgtable_trans_huge_withdraw(struct mm_struct *mm,\n+\t\t\t\t\t\t\t pmd_t *pmdp)\n {\n \tif (radix_enabled())\n \t\treturn radix__pgtable_trans_huge_withdraw(mm, pmdp);\ndiff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h\nindex 40a6fb19dd1dc..9394aabe0442b 100644\n--- a/arch/s390/include/asm/pgtable.h\n+++ b/arch/s390/include/asm/pgtable.h\n@@ -1659,12 +1659,6 @@ pud_t pudp_xchg_direct(struct mm_struct *, unsigned long, pud_t *, pud_t);\n \n #ifdef CONFIG_TRANSPARENT_HUGEPAGE\n \n-#define __HAVE_ARCH_PGTABLE_DEPOSIT\n-void pgtable_trans_huge_deposit(struct mm_struct *mm, pmd_t *pmdp,\n-\t\t\t\tpgtable_t pgtable);\n-\n-#define __HAVE_ARCH_PGTABLE_WITHDRAW\n-pgtable_t pgtable_trans_huge_withdraw(struct mm_struct *mm, pmd_t *pmdp);\n \n #define __HAVE_ARCH_PMDP_SET_ACCESS_FLAGS\n static inline int pmdp_set_access_flags(struct vm_area_struct *vma,\ndiff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c\nindex 4acd8b140c4bd..c9a9ab2c7d937 100644\n--- a/arch/s390/mm/pgtable.c\n+++ b/arch/s390/mm/pgtable.c\n@@ -312,44 +312,3 @@ pud_t pudp_xchg_direct(struct mm_struct *mm, unsigned long addr,\n \treturn old;\n }\n EXPORT_SYMBOL(pudp_xchg_direct);\n-\n-#ifdef CONFIG_TRANSPARENT_HUGEPAGE\n-void pgtable_trans_huge_deposit(struct mm_struct *mm, pmd_t *pmdp,\n-\t\t\t\tpgtable_t pgtable)\n-{\n-\tstruct list_head *lh = (struct list_head *) pgtable;\n-\n-\tassert_spin_locked(pmd_lockptr(mm, pmdp));\n-\n-\t/* FIFO */\n-\tif (!pmd_huge_pte(mm, pmdp))\n-\t\tINIT_LIST_HEAD(lh);\n-\telse\n-\t\tlist_add(lh, (struct list_head *) pmd_huge_pte(mm, pmdp));\n-\tpmd_huge_pte(mm, pmdp) = pgtable;\n-}\n-\n-pgtable_t pgtable_trans_huge_withdraw(struct mm_struct *mm, pmd_t *pmdp)\n-{\n-\tstruct list_head *lh;\n-\tpgtable_t pgtable;\n-\tpte_t *ptep;\n-\n-\tassert_spin_locked(pmd_lockptr(mm, pmdp));\n-\n-\t/* FIFO */\n-\tpgtable = pmd_huge_pte(mm, pmdp);\n-\tlh = (struct list_head *) pgtable;\n-\tif (list_empty(lh))\n-\t\tpmd_huge_pte(mm, pmdp) = NULL;\n-\telse {\n-\t\tpmd_huge_pte(mm, pmdp) = (pgtable_t) lh->next;\n-\t\tlist_del(lh);\n-\t}\n-\tptep = (pte_t *) pgtable;\n-\tset_pte(ptep, __pte(_PAGE_INVALID));\n-\tptep++;\n-\tset_pte(ptep, __pte(_PAGE_INVALID));\n-\treturn pgtable;\n-}\n-#endif /* CONFIG_TRANSPARENT_HUGEPAGE */\ndiff --git a/arch/sparc/include/asm/pgtable_64.h b/arch/sparc/include/asm/pgtable_64.h\nindex 74ede706fb325..60861560f8c40 100644\n--- a/arch/sparc/include/asm/pgtable_64.h\n+++ b/arch/sparc/include/asm/pgtable_64.h\n@@ -987,12 +987,6 @@ void update_mmu_cache_pmd(struct vm_area_struct *vma, unsigned long addr,\n extern pmd_t pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,\n \t\t\t pmd_t *pmdp);\n \n-#define __HAVE_ARCH_PGTABLE_DEPOSIT\n-void pgtable_trans_huge_deposit(struct mm_struct *mm, pmd_t *pmdp,\n-\t\t\t\tpgtable_t pgtable);\n-\n-#define __HAVE_ARCH_PGTABLE_WITHDRAW\n-pgtable_t pgtable_trans_huge_withdraw(struct mm_struct *mm, pmd_t *pmdp);\n #endif\n \n /*\ndiff --git a/arch/sparc/mm/tlb.c b/arch/sparc/mm/tlb.c\nindex 6d9dd5eb13287..9049d54e6e2cb 100644\n--- a/arch/sparc/mm/tlb.c\n+++ b/arch/sparc/mm/tlb.c\n@@ -275,40 +275,4 @@ pmd_t pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,\n \treturn old;\n }\n \n-void pgtable_trans_huge_deposit(struct mm_struct *mm, pmd_t *pmdp,\n-\t\t\t\tpgtable_t pgtable)\n-{\n-\tstruct list_head *lh = (struct list_head *) pgtable;\n-\n-\tassert_spin_locked(&mm->page_table_lock);\n-\n-\t/* FIFO */\n-\tif (!pmd_huge_pte(mm, pmdp))\n-\t\tINIT_LIST_HEAD(lh);\n-\telse\n-\t\tlist_add(lh, (struct list_head *) pmd_huge_pte(mm, pmdp));\n-\tpmd_huge_pte(mm, pmdp) = pgtable;\n-}\n-\n-pgtable_t pgtable_trans_huge_withdraw(struct mm_struct *mm, pmd_t *pmdp)\n-{\n-\tstruct list_head *lh;\n-\tpgtable_t pgtable;\n-\n-\tassert_spin_locked(&mm->page_table_lock);\n-\n-\t/* FIFO */\n-\tpgtable = pmd_huge_pte(mm, pmdp);\n-\tlh = (struct list_head *) pgtable;\n-\tif (list_empty(lh))\n-\t\tpmd_huge_pte(mm, pmdp) = NULL;\n-\telse {\n-\t\tpmd_huge_pte(mm, pmdp) = (pgtable_t) lh->next;\n-\t\tlist_del(lh);\n-\t}\n-\tpte_val(pgtable[0]) = 0;\n-\tpte_val(pgtable[1]) = 0;\n-\n-\treturn pgtable;\n-}\n #endif /* CONFIG_TRANSPARENT_HUGEPAGE */\ndiff --git a/include/linux/pgtable.h b/include/linux/pgtable.h\nindex cdd68ed3ae1a9..f646414e801b7 100644\n--- a/include/linux/pgtable.h\n+++ b/include/linux/pgtable.h\n@@ -1207,13 +1207,19 @@ static inline pmd_t pmdp_collapse_flush(struct vm_area_struct *vma,\n #endif /* CONFIG_TRANSPARENT_HUGEPAGE */\n #endif\n \n-#ifndef __HAVE_ARCH_PGTABLE_DEPOSIT\n-extern void pgtable_trans_huge_deposit(struct mm_struct *mm, pmd_t *pmdp,\n-\t\t\t\t pgtable_t pgtable);\n+#ifndef arch_pgtable_trans_huge_deposit\n+static inline void arch_pgtable_trans_huge_deposit(struct mm_struct *mm,\n+\t\t\t\t\t\t pmd_t *pmdp, pgtable_t pgtable)\n+{\n+}\n #endif\n \n-#ifndef __HAVE_ARCH_PGTABLE_WITHDRAW\n-extern pgtable_t pgtable_trans_huge_withdraw(struct mm_struct *mm, pmd_t *pmdp);\n+#ifndef arch_pgtable_trans_huge_withdraw\n+static inline pgtable_t arch_pgtable_trans_huge_withdraw(struct mm_struct *mm,\n+\t\t\t\t\t\t\t pmd_t *pmdp)\n+{\n+\treturn NULL;\n+}\n #endif\n \n #ifndef arch_needs_pgtable_deposit\ndiff --git a/mm/debug_vm_pgtable.c b/mm/debug_vm_pgtable.c\nindex 23dc3ee095619..db58c5a1f4f48 100644\n--- a/mm/debug_vm_pgtable.c\n+++ b/mm/debug_vm_pgtable.c\n@@ -240,7 +240,7 @@ static void __init pmd_advanced_tests(struct pgtable_debug_args *args)\n \t/* Align the address wrt HPAGE_PMD_SIZE */\n \tvaddr &= HPAGE_PMD_MASK;\n \n-\tpgtable_trans_huge_deposit(args->mm, args->pmdp, args->start_ptep);\n+\tarch_pgtable_trans_huge_deposit(args->mm, args->pmdp, args->start_ptep);\n \n \tpmd = pfn_pmd(args->pmd_pfn, args->page_prot);\n \tset_pmd_at(args->mm, vaddr, args->pmdp, pmd);\n@@ -276,7 +276,7 @@ static void __init pmd_advanced_tests(struct pgtable_debug_args *args)\n \n \t/* Clear the pte entries */\n \tpmdp_huge_get_and_clear(args->mm, vaddr, args->pmdp);\n-\tpgtable_trans_huge_withdraw(args->mm, args->pmdp);\n+\tarch_pgtable_trans_huge_withdraw(args->mm, args->pmdp);\n }\n \n static void __init pmd_leaf_tests(struct pgtable_debug_args *args)\ndiff --git a/mm/huge_memory.c b/mm/huge_memory.c\nindex 2acedb1de7404..48c4884a6f386 100644\n--- a/mm/huge_memory.c\n+++ b/mm/huge_memory.c\n@@ -1343,7 +1343,7 @@ static vm_fault_t __do_huge_pmd_anonymous_page(struct vm_fault *vmf)\n \t\t\treturn ret;\n \t\t}\n \t\tif (pgtable) {\n-\t\t\tpgtable_trans_huge_deposit(vma->vm_mm, vmf->pmd,\n+\t\t\tarch_pgtable_trans_huge_deposit(vma->vm_mm, vmf->pmd,\n \t\t\t\t\t\t pgtable);\n \t\t\tmm_inc_nr_ptes(vma->vm_mm);\n \t\t}\n@@ -1444,7 +1444,7 @@ static void set_huge_zero_folio(pgtable_t pgtable, struct mm_struct *mm,\n \tentry = folio_mk_pmd(zero_folio, vma->vm_page_prot);\n \tentry = pmd_mkspecial(entry);\n \tif (pgtable) {\n-\t\tpgtable_trans_huge_deposit(mm, pmd, pgtable);\n+\t\tarch_pgtable_trans_huge_deposit(mm, pmd, pgtable);\n \t\tmm_inc_nr_ptes(mm);\n \t}\n \tset_pmd_at(mm, haddr, pmd, entry);\n@@ -1577,7 +1577,7 @@ static vm_fault_t insert_pmd(struct vm_area_struct *vma, unsigned long addr,\n \t}\n \n \tif (pgtable) {\n-\t\tpgtable_trans_huge_deposit(mm, pmd, pgtable);\n+\t\tarch_pgtable_trans_huge_deposit(mm, pmd, pgtable);\n \t\tmm_inc_nr_ptes(mm);\n \t\tpgtable = NULL;\n \t}\n@@ -1839,7 +1839,7 @@ static void copy_huge_non_present_pmd(\n \tadd_mm_counter(dst_mm, MM_ANONPAGES, HPAGE_PMD_NR);\n \tif (pgtable) {\n \t\tmm_inc_nr_ptes(dst_mm);\n-\t\tpgtable_trans_huge_deposit(dst_mm, dst_pmd, pgtable);\n+\t\tarch_pgtable_trans_huge_deposit(dst_mm, dst_pmd, pgtable);\n \t}\n \tif (!userfaultfd_wp(dst_vma))\n \t\tpmd = pmd_swp_clear_uffd_wp(pmd);\n@@ -1946,7 +1946,7 @@ int copy_huge_pmd(struct mm_struct *dst_mm, struct mm_struct *src_mm,\n out_zero_page:\n \tif (pgtable) {\n \t\tmm_inc_nr_ptes(dst_mm);\n-\t\tpgtable_trans_huge_deposit(dst_mm, dst_pmd, pgtable);\n+\t\tarch_pgtable_trans_huge_deposit(dst_mm, dst_pmd, pgtable);\n \t}\n \tpmdp_set_wrprotect(src_mm, addr, src_pmd);\n \tif (!userfaultfd_wp(dst_vma))\n@@ -2354,7 +2354,7 @@ static inline void zap_deposited_table(struct mm_struct *mm, pmd_t *pmd)\n {\n \tpgtable_t pgtable;\n \n-\tpgtable = pgtable_trans_huge_withdraw(mm, pmd);\n+\tpgtable = arch_pgtable_trans_huge_withdraw(mm, pmd);\n \tpte_free(mm, pgtable);\n \tmm_dec_nr_ptes(mm);\n }\n@@ -2434,7 +2434,7 @@ bool zap_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma,\n \t/*\n \t * For architectures like ppc64 we look at deposited pgtable\n \t * when calling pmdp_huge_get_and_clear. So do the\n-\t * pgtable_trans_huge_withdraw after finishing pmdp related\n+\t * arch_pgtable_trans_huge_withdraw after finishing pmdp related\n \t * operations.\n \t */\n \torig_pmd = pmdp_huge_get_and_clear_full(vma, addr, pmd,\n@@ -2530,8 +2530,8 @@ bool move_huge_pmd(struct vm_area_struct *vma, unsigned long old_addr,\n \t\tif (pmd_move_must_withdraw(new_ptl, old_ptl, vma) &&\n \t\t arch_needs_pgtable_deposit()) {\n \t\t\tpgtable_t pgtable;\n-\t\t\tpgtable = pgtable_trans_huge_withdraw(mm, old_pmd);\n-\t\t\tpgtable_trans_huge_deposit(mm, new_pmd, pgtable);\n+\t\t\tpgtable = arch_pgtable_trans_huge_withdraw(mm, old_pmd);\n+\t\t\tarch_pgtable_trans_huge_deposit(mm, new_pmd, pgtable);\n \t\t}\n \t\tpmd = move_soft_dirty_pmd(pmd);\n \t\tif (vma_has_uffd_without_event_remap(vma))\n@@ -2838,8 +2838,8 @@ int move_pages_huge_pmd(struct mm_struct *mm, pmd_t *dst_pmd, pmd_t *src_pmd, pm\n \tset_pmd_at(mm, dst_addr, dst_pmd, _dst_pmd);\n \n \tif (arch_needs_pgtable_deposit()) {\n-\t\tsrc_pgtable = pgtable_trans_huge_withdraw(mm, src_pmd);\n-\t\tpgtable_trans_huge_deposit(mm, dst_pmd, src_pgtable);\n+\t\tsrc_pgtable = arch_pgtable_trans_huge_withdraw(mm, src_pmd);\n+\t\tarch_pgtable_trans_huge_deposit(mm, dst_pmd, src_pgtable);\n \t}\n unlock_ptls:\n \tdouble_pt_unlock(src_ptl, dst_ptl);\n@@ -3001,7 +3001,7 @@ static void __split_huge_zero_page_pmd(struct vm_area_struct *vma,\n \told_pmd = pmdp_huge_clear_flush(vma, haddr, pmd);\n \n \tif (arch_needs_pgtable_deposit()) {\n-\t\tpgtable = pgtable_trans_huge_withdraw(mm, pmd);\n+\t\tpgtable = arch_pgtable_trans_huge_withdraw(mm, pmd);\n \t} else {\n \t\tVM_BUG_ON(!pgtable);\n \t\t/*\n@@ -3218,7 +3218,7 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd,\n \t * This's critical for some architectures (Power).\n \t */\n \tif (arch_needs_pgtable_deposit()) {\n-\t\tpgtable = pgtable_trans_huge_withdraw(mm, pmd);\n+\t\tpgtable = arch_pgtable_trans_huge_withdraw(mm, pmd);\n \t} else {\n \t\tVM_BUG_ON(!pgtable);\n \t\t/*\ndiff --git a/mm/khugepaged.c b/mm/khugepaged.c\nindex 40b33263f6135..b6d5da4567fe0 100644\n--- a/mm/khugepaged.c\n+++ b/mm/khugepaged.c\n@@ -1240,7 +1240,7 @@ static enum scan_result collapse_huge_page(struct mm_struct *mm, unsigned long a\n \tspin_lock(pmd_ptl);\n \tBUG_ON(!pmd_none(*pmd));\n \tif (arch_needs_pgtable_deposit()) {\n-\t\tpgtable_trans_huge_deposit(mm, pmd, pgtable);\n+\t\tarch_pgtable_trans_huge_deposit(mm, pmd, pgtable);\n \t} else {\n \t\tmm_dec_nr_ptes(mm);\n \t\tpte_free(mm, pgtable);\ndiff --git a/mm/memory.c b/mm/memory.c\nindex b99ec3ffc18d1..583ca340cef43 100644\n--- a/mm/memory.c\n+++ b/mm/memory.c\n@@ -5551,7 +5551,7 @@ static void deposit_prealloc_pte(struct vm_fault *vmf)\n {\n \tstruct vm_area_struct *vma = vmf->vma;\n \n-\tpgtable_trans_huge_deposit(vma->vm_mm, vmf->pmd, vmf->prealloc_pte);\n+\tarch_pgtable_trans_huge_deposit(vma->vm_mm, vmf->pmd, vmf->prealloc_pte);\n \t/*\n \t * We are going to consume the prealloc table,\n \t * count that as nr_ptes.\ndiff --git a/mm/migrate_device.c b/mm/migrate_device.c\nindex b9242217a81b6..fb0f29a7c73bc 100644\n--- a/mm/migrate_device.c\n+++ b/mm/migrate_device.c\n@@ -888,7 +888,7 @@ static int migrate_vma_insert_huge_pmd_page(struct migrate_vma *migrate,\n \t\tflush_cache_page(vma, addr, addr + HPAGE_PMD_SIZE);\n \t\tpmdp_invalidate(vma, addr, pmdp);\n \t} else if (pgtable) {\n-\t\tpgtable_trans_huge_deposit(vma->vm_mm, pmdp, pgtable);\n+\t\tarch_pgtable_trans_huge_deposit(vma->vm_mm, pmdp, pgtable);\n \t\tmm_inc_nr_ptes(vma->vm_mm);\n \t}\n \tset_pmd_at(vma->vm_mm, addr, pmdp, entry);\ndiff --git a/mm/pgtable-generic.c b/mm/pgtable-generic.c\nindex b91b1a98029c7..5dfdbe6488062 100644\n--- a/mm/pgtable-generic.c\n+++ b/mm/pgtable-generic.c\n@@ -164,38 +164,6 @@ pud_t pudp_huge_clear_flush(struct vm_area_struct *vma, unsigned long address,\n #endif\n #endif\n \n-#ifndef __HAVE_ARCH_PGTABLE_DEPOSIT\n-void pgtable_trans_huge_deposit(struct mm_struct *mm, pmd_t *pmdp,\n-\t\t\t\tpgtable_t pgtable)\n-{\n-\tassert_spin_locked(pmd_lockptr(mm, pmdp));\n-\n-\t/* FIFO */\n-\tif (!pmd_huge_pte(mm, pmdp))\n-\t\tINIT_LIST_HEAD(&pgtable->lru);\n-\telse\n-\t\tlist_add(&pgtable->lru, &pmd_huge_pte(mm, pmdp)->lru);\n-\tpmd_huge_pte(mm, pmdp) = pgtable;\n-}\n-#endif\n-\n-#ifndef __HAVE_ARCH_PGTABLE_WITHDRAW\n-/* no \"address\" argument so destroys page coloring of some arch */\n-pgtable_t pgtable_trans_huge_withdraw(struct mm_struct *mm, pmd_t *pmdp)\n-{\n-\tpgtable_t pgtable;\n-\n-\tassert_spin_locked(pmd_lockptr(mm, pmdp));\n-\n-\t/* FIFO */\n-\tpgtable = pmd_huge_pte(mm, pmdp);\n-\tpmd_huge_pte(mm, pmdp) = list_first_entry_or_null(&pgtable->lru,\n-\t\t\t\t\t\t\t struct page, lru);\n-\tif (pmd_huge_pte(mm, pmdp))\n-\t\tlist_del(&pgtable->lru);\n-\treturn pgtable;\n-}\n-#endif\n \n #ifndef __HAVE_ARCH_PMDP_INVALIDATE\n pmd_t pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,\n", "prefixes": [ "v3", "18/24" ] }