6.12-stable patches

added patches:
	media-mediatek-vcodec-mark-vdec_vp9_slice_map_counts_eob_coef-noinline.patch

diff --git a/queue-6.12/media-mediatek-vcodec-mark-vdec_vp9_slice_map_counts_eob_coef-noinline.patch b/queue-6.12/media-mediatek-vcodec-mark-vdec_vp9_slice_map_counts_eob_coef-noinline.patch
new file mode 100644 (file)
index 0000000..27ebfd7
--- /dev/null
+++ b/queue-6.12/media-mediatek-vcodec-mark-vdec_vp9_slice_map_counts_eob_coef-noinline.patch
@@ -0,0 +1,42 @@
+From 8b55f8818900c99dd4f55a59a103f5b29e41eb2c Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Fri, 18 Oct 2024 15:14:42 +0000
+Subject: media: mediatek: vcodec: mark vdec_vp9_slice_map_counts_eob_coef noinline
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+commit 8b55f8818900c99dd4f55a59a103f5b29e41eb2c upstream.
+
+With KASAN enabled, clang fails to optimize the inline version of
+vdec_vp9_slice_map_counts_eob_coef() properly, leading to kilobytes
+of temporary values spilled to the stack:
+
+drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c:1526:12: error: stack frame size (2160) exceeds limit (2048) in 'vdec_vp9_slice_update_prob' [-Werror,-Wframe-larger-than]
+
+This seems to affect all versions of clang including the latest (clang-20),
+but the degree of stack overhead is different per release.
+
+Marking the function as noinline_for_stack is harmless here and avoids
+the problem completely.
+
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Reviewed-by: Nathan Chancellor <nathan@kernel.org>
+Signed-off-by: Sebastian Fricke <sebastian.fricke@collabora.com>
+Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c
++++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c
+@@ -1188,7 +1188,8 @@ err:
+       return ret;
+ }
+ 
+-static
++/* clang stack usage explodes if this is inlined */
++static noinline_for_stack
+ void vdec_vp9_slice_map_counts_eob_coef(unsigned int i, unsigned int j, unsigned int k,
+                                       struct vdec_vp9_slice_frame_counts *counts,
+                                       struct v4l2_vp9_frame_symbol_counts *counts_helper)

diff --git a/queue-6.12/series b/queue-6.12/series
index 5271b595b29178f14283cfb4ed7a5cb7d1c04d7f..f753b66e7af91b61d0c582b29162cf70f0349b22 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -388,3 +388,4 @@ nfsd-don-t-ignore-the-return-code-of-svc_proc_register.patch
 x86-e820-fix-handling-of-subpage-regions-when-calculating-nosave-ranges-in-e820__register_nosave_regions.patch
 libbpf-prevent-compiler-warnings-errors.patch
 kbuild-add-fno-builtin-wcslen.patch
+media-mediatek-vcodec-mark-vdec_vp9_slice_map_counts_eob_coef-noinline.patch