Fixes for 6.5

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.5/powerpc-mm-allow-arch_force_max_order-up-to-12.patch b/queue-6.5/powerpc-mm-allow-arch_force_max_order-up-to-12.patch
new file mode 100644 (file)
index 0000000..cd41e6f
--- /dev/null
+++ b/queue-6.5/powerpc-mm-allow-arch_force_max_order-up-to-12.patch
@@ -0,0 +1,56 @@
+From 3f537e2dcbb231ee27108a132ad1b439be47d040 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Thu, 24 Aug 2023 22:28:49 +1000
+Subject: powerpc/mm: Allow ARCH_FORCE_MAX_ORDER up to 12
+
+From: Michael Ellerman <mpe@ellerman.id.au>
+
+[ Upstream commit ff9e8f41513669e290f6e1904e1bc75950584491 ]
+
+Christophe reported that the change to ARCH_FORCE_MAX_ORDER to limit the
+range to 10 had broken his ability to configure hugepages:
+
+  # echo 1 > /sys/kernel/mm/hugepages/hugepages-8192kB/nr_hugepages
+  sh: write error: Invalid argument
+
+Several of the powerpc defconfigs previously set the
+ARCH_FORCE_MAX_ORDER value to 12, via the definition in
+arch/powerpc/configs/fsl-emb-nonhw.config, used by:
+
+  mpc85xx_defconfig
+  mpc85xx_smp_defconfig
+  corenet32_smp_defconfig
+  corenet64_smp_defconfig
+  mpc86xx_defconfig
+  mpc86xx_smp_defconfig
+
+Fix it by increasing the allowed range to 12 to restore the previous
+behaviour.
+
+Fixes: 358e526a1648 ("powerpc/mm: Reinstate ARCH_FORCE_MAX_ORDER ranges")
+Reported-by: Christophe Leroy <christophe.leroy@csgroup.eu>
+Closes: https://lore.kernel.org/all/8011d806-5b30-bf26-2bfe-a08c39d57e20@csgroup.eu/
+Tested-by: Christophe Leroy <christophe.leroy@csgroup.eu>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Link: https://msgid.link/20230824122849.942072-1-mpe@ellerman.id.au
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/powerpc/Kconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
+index 0b1172cbeccb3..b3fdb3d268367 100644
+--- a/arch/powerpc/Kconfig
++++ b/arch/powerpc/Kconfig
+@@ -917,7 +917,7 @@ config ARCH_FORCE_MAX_ORDER
+       default "6" if PPC32 && PPC_64K_PAGES
+       range 4 10 if PPC32 && PPC_256K_PAGES
+       default "4" if PPC32 && PPC_256K_PAGES
+-      range 10 10
++      range 10 12
+       default "10"
+       help
+         The kernel page allocator limits the size of maximal physically
+-- 
+2.42.0
+

diff --git a/queue-6.5/series b/queue-6.5/series
index fc1b91bda9b7c70ed71bf552dad649290269d98f..e3c5bd0f2616c1489dbc359c3e7e95b4c426218e 100644 (file)
--- a/queue-6.5/series
+++ b/queue-6.5/series
@@ -223,3 +223,4 @@ drm-bridge-ti-sn65dsi86-associate-dsi-device-lifetim.patch
 drm-panel-move-aux-b116xw03-out-of-panel-edp-back-to.patch
 drm-i915-cx0-only-clear-set-the-pipe-reset-bit-of-th.patch
 drm-amdgpu-fix-possible-null-pointer-dereference.patch
+powerpc-mm-allow-arch_force_max_order-up-to-12.patch