archives/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-03-08 02:24:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

bugs/core: Extend __WARN_FLAGS() with the 'cond_str' parameter

Browse source 
Push the new parameter down into every architecture that defines __WARN_FLAGS():

  arm64
  loongarch
  parisc
  powerpc
  riscv
  s390
  sh
  x86

Don't pass anything substantial down yet, just propagate the
new parameter with empty strings, without generating it or
using it.

( The string is never NULL, so it can be concatenated at the
  preprocessor level. )

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-arch@vger.kernel.org
Link: https://lore.kernel.org/r/20250515124644.2958810-2-mingo@kernel.org
This commit is contained in:
Ingo Molnar 2025-05-15 14:46:30 +02:00
parent 19272b37aa
commit aec58b4851
9 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/arm64/include/asm/bug.h
View file

@ -19,7 +19,7 @@
unreachable(); \ unreachable(); \
} while (0) } while (0)
#define __WARN_FLAGS(flags) __BUG_FLAGS(BUGFLAG_WARNING|(flags)) #define __WARN_FLAGS(cond_str, flags) __BUG_FLAGS(BUGFLAG_WARNING|(flags))
#define HAVE_ARCH_BUG #define HAVE_ARCH_BUG

2
arch/loongarch/include/asm/bug.h
View file

@ -42,7 +42,7 @@
asm_inline volatile (__stringify(ASM_BUG_FLAGS(flags)) \ asm_inline volatile (__stringify(ASM_BUG_FLAGS(flags)) \
extra); extra);
#define __WARN_FLAGS(flags) \ #define __WARN_FLAGS(cond_str, flags) \
do { \ do { \
instrumentation_begin(); \ instrumentation_begin(); \
__BUG_FLAGS(BUGFLAG_WARNING|(flags), ANNOTATE_REACHABLE(10001b));\ __BUG_FLAGS(BUGFLAG_WARNING|(flags), ANNOTATE_REACHABLE(10001b));\

4
arch/parisc/include/asm/bug.h
View file

@ -50,7 +50,7 @@
#endif #endif
#ifdef CONFIG_DEBUG_BUGVERBOSE #ifdef CONFIG_DEBUG_BUGVERBOSE
#define __WARN_FLAGS(flags) \ #define __WARN_FLAGS(cond_str, flags) \
do { \ do { \
asm volatile("\n" \ asm volatile("\n" \
"1:\t" PARISC_BUG_BREAK_ASM "\n" \ "1:\t" PARISC_BUG_BREAK_ASM "\n" \
@ -66,7 +66,7 @@
"i" (sizeof(struct bug_entry)) ); \ "i" (sizeof(struct bug_entry)) ); \
} while(0) } while(0)
#else #else
#define __WARN_FLAGS(flags) \ #define __WARN_FLAGS(cond_str, flags) \
do { \ do { \
asm volatile("\n" \ asm volatile("\n" \
"1:\t" PARISC_BUG_BREAK_ASM "\n" \ "1:\t" PARISC_BUG_BREAK_ASM "\n" \

2
arch/powerpc/include/asm/bug.h
View file

@ -72,7 +72,7 @@
} while (0) } while (0)
#define HAVE_ARCH_BUG #define HAVE_ARCH_BUG
#define __WARN_FLAGS(flags) BUG_ENTRY("twi 31, 0, 0", BUGFLAG_WARNING | (flags)) #define __WARN_FLAGS(cond_str, flags) BUG_ENTRY("twi 31, 0, 0", BUGFLAG_WARNING | (flags))
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
#define BUG_ON(x) do { \ #define BUG_ON(x) do { \

2
arch/riscv/include/asm/bug.h
View file

@ -76,7 +76,7 @@ do { \
unreachable(); \ unreachable(); \
} while (0) } while (0)
#define __WARN_FLAGS(flags) __BUG_FLAGS(BUGFLAG_WARNING|(flags)) #define __WARN_FLAGS(cond_str, flags) __BUG_FLAGS(BUGFLAG_WARNING|(flags))
#define HAVE_ARCH_BUG #define HAVE_ARCH_BUG

2
arch/s390/include/asm/bug.h
View file

@ -46,7 +46,7 @@
unreachable(); \ unreachable(); \
} while (0) } while (0)
#define __WARN_FLAGS(flags) do { \ #define __WARN_FLAGS(cond_str, flags) do { \
__EMIT_BUG(BUGFLAG_WARNING|(flags)); \ __EMIT_BUG(BUGFLAG_WARNING|(flags)); \
} while (0) } while (0)

2
arch/sh/include/asm/bug.h
View file

@ -52,7 +52,7 @@ do { \
unreachable(); \ unreachable(); \
} while (0) } while (0)
#define __WARN_FLAGS(flags) \ #define __WARN_FLAGS(cond_str, flags) \
do { \ do { \
__asm__ __volatile__ ( \ __asm__ __volatile__ ( \
"1:\t.short %O0\n" \ "1:\t.short %O0\n" \

2
arch/x86/include/asm/bug.h
View file

@ -92,7 +92,7 @@ do { \
* were to trigger, we'd rather wreck the machine in an attempt to get the * were to trigger, we'd rather wreck the machine in an attempt to get the
* message out than not know about it. * message out than not know about it.
*/ */
#define __WARN_FLAGS(flags) \ #define __WARN_FLAGS(cond_str, flags) \
do { \ do { \
__auto_type __flags = BUGFLAG_WARNING|(flags); \ __auto_type __flags = BUGFLAG_WARNING|(flags); \
instrumentation_begin(); \ instrumentation_begin(); \

7
include/asm-generic/bug.h
View file

@ -100,17 +100,18 @@ extern __printf(1, 2) void __warn_printk(const char *fmt, ...);
instrumentation_end(); \ instrumentation_end(); \
} while (0) } while (0)
#else #else
#define __WARN() __WARN_FLAGS(BUGFLAG_TAINT(TAINT_WARN)) #define __WARN() __WARN_FLAGS("", BUGFLAG_TAINT(TAINT_WARN))
#define __WARN_printf(taint, arg...) do { \ #define __WARN_printf(taint, arg...) do { \
instrumentation_begin(); \ instrumentation_begin(); \
__warn_printk(arg); \ __warn_printk(arg); \
__WARN_FLAGS(BUGFLAG_NO_CUT_HERE | BUGFLAG_TAINT(taint));\ __WARN_FLAGS("", BUGFLAG_NO_CUT_HERE | BUGFLAG_TAINT(taint));\
instrumentation_end(); \ instrumentation_end(); \
} while (0) } while (0)
#define WARN_ON_ONCE(condition) ({ \ #define WARN_ON_ONCE(condition) ({ \
int __ret_warn_on = !!(condition); \ int __ret_warn_on = !!(condition); \
if (unlikely(__ret_warn_on)) \ if (unlikely(__ret_warn_on)) \
__WARN_FLAGS(BUGFLAG_ONCE | \ __WARN_FLAGS("", \
BUGFLAG_ONCE | \
BUGFLAG_TAINT(TAINT_WARN)); \ BUGFLAG_TAINT(TAINT_WARN)); \
unlikely(__ret_warn_on); \ unlikely(__ret_warn_on); \
}) })