superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug: Add BUG_FORMAT_ARGS infrastructure 

Add BUG_FORMAT_ARGS; when an architecture is able to provide a va_list
given pt_regs, use this to print format arguments.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://patch.msgid.link/20251110115757.457339417@infradead.org
pull/1354/merge
Peter Zijlstra 2025-06-07 10:51:24 +02:00
parent 30b82568b0
commit 5c47b7f3d1
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/asm-generic/bug.h
View File

@ -13,6 +13,7 @@
#define BUGFLAG_ONCE (1 << 1) #define BUGFLAG_ONCE (1 << 1)
#define BUGFLAG_DONE (1 << 2) #define BUGFLAG_DONE (1 << 2)
#define BUGFLAG_NO_CUT_HERE (1 << 3) /* CUT_HERE already sent */ #define BUGFLAG_NO_CUT_HERE (1 << 3) /* CUT_HERE already sent */
#define BUGFLAG_ARGS (1 << 4)
#define BUGFLAG_TAINT(taint) ((taint) << 8) #define BUGFLAG_TAINT(taint) ((taint) << 8)
#define BUG_GET_TAINT(bug) ((bug)->flags >> 8) #define BUG_GET_TAINT(bug) ((bug)->flags >> 8)
#endif #endif

17
lib/bug.c
View File

@ -163,11 +163,23 @@ struct bug_entry *find_bug(unsigned long bugaddr)
return module_find_bug(bugaddr); return module_find_bug(bugaddr);
} }
static void __warn_printf(const char *fmt) static void __warn_printf(const char *fmt, struct pt_regs *regs)
{ {
if (!fmt) if (!fmt)
return; return;
#ifdef HAVE_ARCH_BUG_FORMAT_ARGS
if (regs) {
struct arch_va_list _args;
va_list *args = __warn_args(&_args, regs);
if (args) {
vprintk(fmt, *args);
return;
}
}
#endif
printk("%s", fmt); printk("%s", fmt);
} }
@ -193,6 +205,7 @@ static enum bug_trap_type __report_bug(unsigned long bugaddr, struct pt_regs *re
once = bug->flags & BUGFLAG_ONCE; once = bug->flags & BUGFLAG_ONCE;
done = bug->flags & BUGFLAG_DONE; done = bug->flags & BUGFLAG_DONE;
no_cut = bug->flags & BUGFLAG_NO_CUT_HERE; no_cut = bug->flags & BUGFLAG_NO_CUT_HERE;
has_args = bug->flags & BUGFLAG_ARGS;
if (warning && once) { if (warning && once) {
if (done) if (done)
@ -212,7 +225,7 @@ static enum bug_trap_type __report_bug(unsigned long bugaddr, struct pt_regs *re
*/ */
if (!no_cut) { if (!no_cut) {
printk(KERN_DEFAULT CUT_HERE); printk(KERN_DEFAULT CUT_HERE);
__warn_printf(fmt); __warn_printf(fmt, has_args ? regs : NULL);
} }
if (warning) { if (warning) {