Skip to contentSkip to conversation

mm-huge_memory-use-config_64bit-to-relax-huge-page-alignment-on-32-bit-machines.patch removed from -mm tree

merged mm-hotfixes-stable Andrew Morton 1 participant 1 message Jul 26, 2024 Stable branch

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm: huge_memory: use !CONFIG_64BIT to relax huge page alignment on 32 bit machines
has been removed from the -mm tree. Its filename was
mm-huge_memory-use-config_64bit-to-relax-huge-page-alignment-on-32-bit-machines.patch

This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Yang Shi <[email protected]>
Subject: mm: huge_memory: use !CONFIG_64BIT to relax huge page alignment on 32 bit machines
Date: Fri, 12 Jul 2024 08:58:55 -0700

Yves-Alexis Perez reported commit 4ef9ad19e176 ("mm: huge_memory: don't force huge page alignment on 32 bit") didn't work for x86_32 [1]. It is because x86_32 uses CONFIG_X86_32 instead of CONFIG_32BIT.

!CONFIG_64BIT should cover all 32 bit machines.

[1] https://lore.kernel.org/linux-mm/CAHbLzkr1LwH3pcTgM+aGQ31ip2bKqiqEQ8=FQB+t2c3dhNKNHA@mail.gmail.com/

Fixes 4ef9ad19e176 ("mm: huge_memory: don't force huge page alignment on 32 bit")
Cc Ben Hutchings <[email protected]>
Cc Christoph Lameter <[email protected]>
Cc Jiri Slaby <[email protected]>
Cc Matthew Wilcox (Oracle) <[email protected]>
Cc Rik van Riel <[email protected]>
Cc Salvatore Bonaccorso <[email protected]>
Cc Suren Baghdasaryan <[email protected]>
Cc <[email protected]> [6.8+]

---

 mm/huge_memory.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mm/huge_memory.c renamed from mm/huge_memory.c~mm-huge_memory-use-config_64bit-to-relax-huge-page-alignment-on-32-bit-machines +1 -1
@@ -877,7 +877,7 @@ static unsigned long __thp_get_unmapped_
 	loff_t off_align = round_up(off, size);
 	unsigned long len_pad, ret, off_sub;
 
-	if (IS_ENABLED(CONFIG_32BIT) || in_compat_syscall())
+	if (!IS_ENABLED(CONFIG_64BIT) || in_compat_syscall())
 		return 0;
 
 	if (off_end <= off_align || (off_end - off_align) < size)

_

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