6.12-stable patches

added patches:
	loongarch-use-asm_reachable.patch

diff --git a/queue-6.12/loongarch-use-asm_reachable.patch b/queue-6.12/loongarch-use-asm_reachable.patch
new file mode 100644 (file)
index 0000000..a72f703
--- /dev/null
+++ b/queue-6.12/loongarch-use-asm_reachable.patch
@@ -0,0 +1,66 @@
+From 624bde3465f660e54a7cd4c1efc3e536349fead5 Mon Sep 17 00:00:00 2001
+From: Peter Zijlstra <peterz@infradead.org>
+Date: Thu, 28 Nov 2024 10:39:03 +0100
+Subject: loongarch: Use ASM_REACHABLE
+
+From: Peter Zijlstra <peterz@infradead.org>
+
+commit 624bde3465f660e54a7cd4c1efc3e536349fead5 upstream.
+
+annotate_reachable() is unreliable since the compiler is free to place
+random code inbetween two consecutive asm() statements.
+
+This removes the last and only annotate_reachable() user.
+
+Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
+Acked-by: Josh Poimboeuf <jpoimboe@kernel.org>
+Link: https://lore.kernel.org/r/20241128094312.133437051@infradead.org
+Closes: https://lore.kernel.org/loongarch/20250307214943.372210-1-ojeda@kernel.org/
+Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/loongarch/include/asm/bug.h |   13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+--- a/arch/loongarch/include/asm/bug.h
++++ b/arch/loongarch/include/asm/bug.h
+@@ -4,6 +4,7 @@
+ 
+ #include <asm/break.h>
+ #include <linux/stringify.h>
++#include <linux/objtool.h>
+ 
+ #ifndef CONFIG_DEBUG_BUGVERBOSE
+ #define _BUGVERBOSE_LOCATION(file, line)
+@@ -33,25 +34,25 @@
+ 
+ #define ASM_BUG_FLAGS(flags)                                  \
+       __BUG_ENTRY(flags)                                      \
+-      break           BRK_BUG
++      break           BRK_BUG;
+ 
+ #define ASM_BUG()     ASM_BUG_FLAGS(0)
+ 
+-#define __BUG_FLAGS(flags)                                    \
+-      asm_inline volatile (__stringify(ASM_BUG_FLAGS(flags)));
++#define __BUG_FLAGS(flags, extra)                                     \
++      asm_inline volatile (__stringify(ASM_BUG_FLAGS(flags))          \
++                           extra);
+ 
+ #define __WARN_FLAGS(flags)                                   \
+ do {                                                          \
+       instrumentation_begin();                                \
+-      __BUG_FLAGS(BUGFLAG_WARNING|(flags));                   \
+-      annotate_reachable();                                   \
++      __BUG_FLAGS(BUGFLAG_WARNING|(flags), ASM_REACHABLE);    \
+       instrumentation_end();                                  \
+ } while (0)
+ 
+ #define BUG()                                                 \
+ do {                                                          \
+       instrumentation_begin();                                \
+-      __BUG_FLAGS(0);                                         \
++      __BUG_FLAGS(0, "");                                     \
+       unreachable();                                          \
+ } while (0)
+ 

diff --git a/queue-6.12/series b/queue-6.12/series
index e0240d82976a8fed2ab960f2e657667ace9ddacb..571fcb345cae06a8744d94670e0db6ffaf68a2be 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -8,3 +8,4 @@ cifs-remove-symlink-member-from-cifs_open_info_data-.patch
 smb311-failure-to-open-files-of-length-1040-when-mou.patch
 btrfs-fix-data-overwriting-bug-during-buffered-write.patch
 x86-microcode-amd-add-some-forgotten-models-to-the-sha-check.patch
+loongarch-use-asm_reachable.patch