diff --git a/patches.suse/mm-huge_memory-don-t-force-huge-page-alignment-on-32.patch b/patches.suse/mm-huge_memory-don-t-force-huge-page-alignment-on-32.patch index 27d1fd2..7a6acb4 100644 --- a/patches.suse/mm-huge_memory-don-t-force-huge-page-alignment-on-32.patch +++ b/patches.suse/mm-huge_memory-don-t-force-huge-page-alignment-on-32.patch @@ -1,10 +1,11 @@ From: Yang Shi Date: Thu, 18 Jan 2024 10:05:05 -0800 Subject: mm: huge_memory: don't force huge page alignment on 32 bit -Patch-mainline: submitted 20240118180505.2914778-1-shy828301@gmail.com +Git-commit: 4ef9ad19e17676b9ef071309bc62020e2373705d +Patch-mainline: v6.8-rc3 References: bsc#1218841 -The commit efa7df3e3bb5 ("mm: align larger anonymous mappings on THP +commit efa7df3e3bb5 ("mm: align larger anonymous mappings on THP boundaries") caused two issues [1] [2] reported on 32 bit system or compat userspace. @@ -14,23 +15,22 @@ 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 Reported-by: Jiri Slaby Reported-by: Suren Baghdasaryan Tested-by: Jiri Slaby Tested-by: Suren Baghdasaryan +Reviewed-by: Matthew Wilcox (Oracle) Cc: Rik van Riel -Cc: Matthew Wilcox Cc: Christopher Lameter -Signed-off-by: Yang Shi -Reviewed-by: Matthew Wilcox (Oracle) +Signed-off-by: Andrew Morton Signed-off-by: Jiri Slaby --- - mm/huge_memory.c | 4 ++++ + mm/huge_memory.c | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/mm/huge_memory.c b/mm/huge_memory.c -index 86ee29b5..5c9f016f 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -37,6 +37,7 @@ @@ -41,7 +41,7 @@ index 86ee29b5..5c9f016f 100644 #include #include -@@ -634,6 +635,9 @@ static unsigned long __thp_get_unmapped_area(struct file *filp, +@@ -811,6 +812,9 @@ static unsigned long __thp_get_unmapped_ loff_t off_align = round_up(off, size); unsigned long len_pad, ret; @@ -51,6 +51,3 @@ index 86ee29b5..5c9f016f 100644 if (off_end <= off_align || (off_end - off_align) < size) return 0; --- -2.43.0 - diff --git a/series.conf b/series.conf index ba4c80b..206771c 100644 --- a/series.conf +++ b/series.conf @@ -54,6 +54,7 @@ ######################################################## # sorted patches ######################################################## + patches.suse/mm-huge_memory-don-t-force-huge-page-alignment-on-32.patch ######################################################## # end of sorted patches @@ -72,7 +73,6 @@ # to area specific sections below. ######################################################## patches.suse/firmware-qemu_fw_cfg-Do-not-hard-depend-on-CONFIG_HA.patch - patches.suse/mm-huge_memory-don-t-force-huge-page-alignment-on-32.patch ######################################################## # kbuild/module infrastructure fixes