Skip to content

Commit

Permalink
mm: huge_memory: use !CONFIG_64BIT to relax huge page alignment on 32…
Browse files Browse the repository at this point in the history
… bit machines

commit d959202 upstream.

Yves-Alexis Perez reported commit 4ef9ad1 ("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/

Link: https://lkml.kernel.org/r/[email protected]
Fixes: 4ef9ad1 ("mm: huge_memory: don't force huge page alignment on 32 bit")
Signed-off-by: Yang Shi <[email protected]>
Reported-by: Yves-Alexis Perez <[email protected]>
Tested-by: Yves-Alexis Perez <[email protected]>
Acked-by: David Hildenbrand <[email protected]>
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+]
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
Yang Shi authored and gregkh committed Aug 3, 2024
1 parent b14cc2c commit 7e1f4ef
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mm/huge_memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,7 @@ static unsigned long __thp_get_unmapped_area(struct file *filp,
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)
Expand Down

0 comments on commit 7e1f4ef

Please sign in to comment.