Skip to contentSkip to conversation

mm-arm64-drop-dead-code-for-pud-special-bit-handling.patch removed from -mm tree

merged Andrew Morton 1 participant 1 message Mar 31, 2025

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/arm64: drop dead code for pud special bit handling
has been removed from the -mm tree. Its filename was
mm-arm64-drop-dead-code-for-pud-special-bit-handling.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Peter Xu <[email protected]>
Subject: mm/arm64: drop dead code for pud special bit handling
Date: Thu, 20 Mar 2025 14:34:05 -0400

Keith Busch observed some incorrect macros defined in arm64 code [1].

It turns out the two lines should never be needed and won't be exposed to anyone, because aarch64 doesn't select HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD, hence ARCH_SUPPORTS_PUD_PFNMAP is always N. The only archs that support THP PUDs so far are x86 and powerpc.

Instead of fixing the lines (with no way to test it..), remove the two lines that are in reality dead code, to avoid confusing readers.

Fixes tag is attached to reflect where the wrong macros were introduced, but explicitly not copying stable, because there's no real issue to be fixed. So it's only about removing the dead code so far.

[1] https://lore.kernel.org/all/[email protected]/#t

Fixes 3e509c9b03f9 ("mm/arm64: support large pfn mappings")
Cc Alex Williamson <[email protected]>
Cc Catalin Marinas <[email protected]>
Cc Will Deacon <[email protected]>

---

 arch/arm64/include/asm/pgtable.h |    5 -----
 1 file changed, 5 deletions(-)
arch/arm64/include/asm/pgtable.h renamed from arch/arm64/include/asm/pgtable.h~mm-arm64-drop-dead-code-for-pud-special-bit-handling +0 -5
@@ -620,11 +620,6 @@ static inline pmd_t pmd_mkspecial(pmd_t
 #define pud_pfn(pud)		((__pud_to_phys(pud) & PUD_MASK) >> PAGE_SHIFT)
 #define pfn_pud(pfn,prot)	__pud(__phys_to_pud_val((phys_addr_t)(pfn) << PAGE_SHIFT) | pgprot_val(prot))
 
-#ifdef CONFIG_ARCH_SUPPORTS_PUD_PFNMAP
-#define pud_special(pte)	pte_special(pud_pte(pud))
-#define pud_mkspecial(pte)	pte_pud(pte_mkspecial(pud_pte(pud)))
-#endif
-
 #define pmd_pgprot pmd_pgprot
 static inline pgprot_t pmd_pgprot(pmd_t pmd)
 {

_

Patches currently in -mm which might be from [email protected] are

mm-userfaultfd-fix-release-hang-over-concurrent-gup.patch maintainers-add-myself-as-userfaultfd-reviewer.patch