6.7-stable patches

added patches:
	mm-huge_memory-don-t-force-huge-page-alignment-on-32-bit.patch
	mm-mmap-map-map_stack-to-vm_nohugepage.patch

diff --git a/queue-6.7/mm-huge_memory-don-t-force-huge-page-alignment-on-32-bit.patch b/queue-6.7/mm-huge_memory-don-t-force-huge-page-alignment-on-32-bit.patch
new file mode 100644 (file)
index 0000000..c3bf649
--- /dev/null
+++ b/queue-6.7/mm-huge_memory-don-t-force-huge-page-alignment-on-32-bit.patch
@@ -0,0 +1,55 @@
+From 4ef9ad19e17676b9ef071309bc62020e2373705d Mon Sep 17 00:00:00 2001
+From: Yang Shi <yang@os.amperecomputing.com>
+Date: Thu, 18 Jan 2024 10:05:05 -0800
+Subject: mm: huge_memory: don't force huge page alignment on 32 bit
+
+From: Yang Shi <yang@os.amperecomputing.com>
+
+commit 4ef9ad19e17676b9ef071309bc62020e2373705d upstream.
+
+commit efa7df3e3bb5 ("mm: align larger anonymous mappings on THP
+boundaries") caused two issues [1] [2] reported on 32 bit system or compat
+userspace.
+
+It doesn't make too much sense to force huge page alignment on 32 bit
+system due to the constrained virtual address space.
+
+[1] https://lore.kernel.org/linux-mm/d0a136a0-4a31-46bc-adf4-2db109a61672@kernel.org/
+[2] https://lore.kernel.org/linux-mm/CAJuCfpHXLdQy1a2B6xN2d7quTYwg2OoZseYPZTRpU0eHHKD-sQ@mail.gmail.com/
+
+Link: https://lkml.kernel.org/r/20240118180505.2914778-1-shy828301@gmail.com
+Fixes: efa7df3e3bb5 ("mm: align larger anonymous mappings on THP boundaries")
+Signed-off-by: Yang Shi <yang@os.amperecomputing.com>
+Reported-by: Jiri Slaby <jirislaby@kernel.org>
+Reported-by: Suren Baghdasaryan <surenb@google.com>
+Tested-by: Jiri Slaby <jirislaby@kernel.org>
+Tested-by: Suren Baghdasaryan <surenb@google.com>
+Reviewed-by: Matthew Wilcox (Oracle) <willy@infradead.org>
+Cc: Rik van Riel <riel@surriel.com>
+Cc: Christopher Lameter <cl@linux.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ mm/huge_memory.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/mm/huge_memory.c
++++ b/mm/huge_memory.c
+@@ -37,6 +37,7 @@
+ #include <linux/page_owner.h>
+ #include <linux/sched/sysctl.h>
+ #include <linux/memory-tiers.h>
++#include <linux/compat.h>
+ 
+ #include <asm/tlb.h>
+ #include <asm/pgalloc.h>
+@@ -634,6 +635,9 @@ static unsigned long __thp_get_unmapped_
+       loff_t off_align = round_up(off, size);
+       unsigned long len_pad, ret;
+ 
++      if (IS_ENABLED(CONFIG_32BIT) || in_compat_syscall())
++              return 0;
++
+       if (off_end <= off_align || (off_end - off_align) < size)
+               return 0;
+ 

diff --git a/queue-6.7/mm-mmap-map-map_stack-to-vm_nohugepage.patch b/queue-6.7/mm-mmap-map-map_stack-to-vm_nohugepage.patch
new file mode 100644 (file)
index 0000000..7354d87
--- /dev/null
+++ b/queue-6.7/mm-mmap-map-map_stack-to-vm_nohugepage.patch
@@ -0,0 +1,79 @@
+From c4608d1bf7c6536d1a3d233eb21e50678681564e Mon Sep 17 00:00:00 2001
+From: Yang Shi <yang@os.amperecomputing.com>
+Date: Wed, 20 Dec 2023 22:59:43 -0800
+Subject: mm: mmap: map MAP_STACK to VM_NOHUGEPAGE
+
+From: Yang Shi <yang@os.amperecomputing.com>
+
+commit c4608d1bf7c6536d1a3d233eb21e50678681564e upstream.
+
+commit efa7df3e3bb5 ("mm: align larger anonymous mappings on THP
+boundaries") incured regression for stress-ng pthread benchmark [1].  It
+is because THP get allocated to pthread's stack area much more possible
+than before.  Pthread's stack area is allocated by mmap without
+VM_GROWSDOWN or VM_GROWSUP flag, so kernel can't tell whether it is a
+stack area or not.
+
+The MAP_STACK flag is used to mark the stack area, but it is a no-op on
+Linux.  Mapping MAP_STACK to VM_NOHUGEPAGE to prevent from allocating THP
+for such stack area.
+
+With this change the stack area looks like:
+
+fffd18e10000-fffd19610000 rw-p 00000000 00:00 0
+Size:               8192 kB
+KernelPageSize:        4 kB
+MMUPageSize:           4 kB
+Rss:                  12 kB
+Pss:                  12 kB
+Pss_Dirty:            12 kB
+Shared_Clean:          0 kB
+Shared_Dirty:          0 kB
+Private_Clean:         0 kB
+Private_Dirty:        12 kB
+Referenced:           12 kB
+Anonymous:            12 kB
+KSM:                   0 kB
+LazyFree:              0 kB
+AnonHugePages:         0 kB
+ShmemPmdMapped:        0 kB
+FilePmdMapped:         0 kB
+Shared_Hugetlb:        0 kB
+Private_Hugetlb:       0 kB
+Swap:                  0 kB
+SwapPss:               0 kB
+Locked:                0 kB
+THPeligible:           0
+VmFlags: rd wr mr mw me ac nh
+
+The "nh" flag is set.
+
+[1] https://lore.kernel.org/linux-mm/202312192310.56367035-oliver.sang@intel.com/
+
+Link: https://lkml.kernel.org/r/20231221065943.2803551-2-shy828301@gmail.com
+Fixes: efa7df3e3bb5 ("mm: align larger anonymous mappings on THP boundaries")
+Signed-off-by: Yang Shi <yang@os.amperecomputing.com>
+Reported-by: kernel test robot <oliver.sang@intel.com>
+Tested-by: Oliver Sang <oliver.sang@intel.com>
+Reviewed-by: Yin Fengwei <fengwei.yin@intel.com>
+Cc: Rik van Riel <riel@surriel.com>
+Cc: Matthew Wilcox <willy@infradead.org>
+Cc: Christopher Lameter <cl@linux.com>
+Cc: Huang, Ying <ying.huang@intel.com>
+Cc: <stable@vger.kerenl.org>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/linux/mman.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/include/linux/mman.h
++++ b/include/linux/mman.h
+@@ -156,6 +156,7 @@ calc_vm_flag_bits(unsigned long flags)
+       return _calc_vm_trans(flags, MAP_GROWSDOWN,  VM_GROWSDOWN ) |
+              _calc_vm_trans(flags, MAP_LOCKED,     VM_LOCKED    ) |
+              _calc_vm_trans(flags, MAP_SYNC,       VM_SYNC      ) |
++             _calc_vm_trans(flags, MAP_STACK,      VM_NOHUGEPAGE) |
+              arch_calc_vm_flag_bits(flags);
+ }
+ 

diff --git a/queue-6.7/series b/queue-6.7/series
index b8ea1fcc56e97a51659718c2f75781e38cf82ed4..7e8938f7f59f08fcda35d53b3b31037565dfdbe4 100644 (file)
--- a/queue-6.7/series
+++ b/queue-6.7/series
@@ -1,2 +1,4 @@
 work-around-gcc-bugs-with-asm-goto-with-outputs.patch
 update-workarounds-for-gcc-asm-goto-issue.patch
+mm-huge_memory-don-t-force-huge-page-alignment-on-32-bit.patch
+mm-mmap-map-map_stack-to-vm_nohugepage.patch