From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 30 Aug 2023 20:01:22 +0000 (+0200)
Subject: 6.4-stable patches
X-Git-Tag: v6.5.1~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ab6f52923f53c36e7317349209bd2c89ad343003;p=thirdparty%2Fkernel%2Fstable-queue.git

6.4-stable patches

added patches:
	module-decompress-use-vmalloc-for-zstd-decompression-workspace.patch
---

diff --git a/queue-6.4/module-decompress-use-vmalloc-for-zstd-decompression-workspace.patch b/queue-6.4/module-decompress-use-vmalloc-for-zstd-decompression-workspace.patch
new file mode 100644
index 00000000000..7f29836a7cb
--- /dev/null
+++ b/queue-6.4/module-decompress-use-vmalloc-for-zstd-decompression-workspace.patch
@@ -0,0 +1,73 @@
+From a419beac4a070aff63c520f36ebf7cb8a76a8ae5 Mon Sep 17 00:00:00 2001
+From: Andrea Righi <andrea.righi@canonical.com>
+Date: Tue, 29 Aug 2023 14:05:08 +0200
+Subject: module/decompress: use vmalloc() for zstd decompression workspace
+
+From: Andrea Righi <andrea.righi@canonical.com>
+
+commit a419beac4a070aff63c520f36ebf7cb8a76a8ae5 upstream.
+
+Using kmalloc() to allocate the decompression workspace for zstd may
+trigger the following warning when large modules are loaded (i.e., xfs):
+
+[    2.961884] WARNING: CPU: 1 PID: 254 at mm/page_alloc.c:4453 __alloc_pages+0x2c3/0x350
+...
+[    2.989033] Call Trace:
+[    2.989841]  <TASK>
+[    2.990614]  ? show_regs+0x6d/0x80
+[    2.991573]  ? __warn+0x89/0x160
+[    2.992485]  ? __alloc_pages+0x2c3/0x350
+[    2.993520]  ? report_bug+0x17e/0x1b0
+[    2.994506]  ? handle_bug+0x51/0xa0
+[    2.995474]  ? exc_invalid_op+0x18/0x80
+[    2.996469]  ? asm_exc_invalid_op+0x1b/0x20
+[    2.997530]  ? module_zstd_decompress+0xdc/0x2a0
+[    2.998665]  ? __alloc_pages+0x2c3/0x350
+[    2.999695]  ? module_zstd_decompress+0xdc/0x2a0
+[    3.000821]  __kmalloc_large_node+0x7a/0x150
+[    3.001920]  __kmalloc+0xdb/0x170
+[    3.002824]  module_zstd_decompress+0xdc/0x2a0
+[    3.003857]  module_decompress+0x37/0xc0
+[    3.004688]  init_module_from_file+0xd0/0x100
+[    3.005668]  idempotent_init_module+0x11c/0x2b0
+[    3.006632]  __x64_sys_finit_module+0x64/0xd0
+[    3.007568]  do_syscall_64+0x59/0x90
+[    3.008373]  ? ksys_read+0x73/0x100
+[    3.009395]  ? exit_to_user_mode_prepare+0x30/0xb0
+[    3.010531]  ? syscall_exit_to_user_mode+0x37/0x60
+[    3.011662]  ? do_syscall_64+0x68/0x90
+[    3.012511]  ? do_syscall_64+0x68/0x90
+[    3.013364]  entry_SYSCALL_64_after_hwframe+0x6e/0xd8
+
+However, continuous physical memory does not seem to be required in
+module_zstd_decompress(), so use vmalloc() instead, to prevent the
+warning and avoid potential failures at loading compressed modules.
+
+Fixes: 169a58ad824d ("module/decompress: Support zstd in-kernel decompression")
+Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
+Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ kernel/module/decompress.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/kernel/module/decompress.c
++++ b/kernel/module/decompress.c
+@@ -241,7 +241,7 @@ static ssize_t module_zstd_decompress(st
+ 	}
+ 
+ 	wksp_size = zstd_dstream_workspace_bound(header.windowSize);
+-	wksp = kmalloc(wksp_size, GFP_KERNEL);
++	wksp = vmalloc(wksp_size);
+ 	if (!wksp) {
+ 		retval = -ENOMEM;
+ 		goto out;
+@@ -284,7 +284,7 @@ static ssize_t module_zstd_decompress(st
+ 	retval = new_size;
+ 
+  out:
+-	kfree(wksp);
++	vfree(wksp);
+ 	return retval;
+ }
+ #else
diff --git a/queue-6.4/series b/queue-6.4/series
index 1f56db43702..7a1191bdeb1 100644
--- a/queue-6.4/series
+++ b/queue-6.4/series
@@ -1 +1,2 @@
 acpi-thermal-drop-nocrt-parameter.patch
+module-decompress-use-vmalloc-for-zstd-decompression-workspace.patch