From: Peter Zijlstra <peterz@infradead.org>
To: x86@kernel.org
Cc: linux-kernel@vger.kernel.org, peterz@infradead.org,
kees@kernel.org, acarmina@redhat.com, jpoimboe@kernel.org,
mark.rutland@arm.com, torvalds@linuxfoundation.org
Subject: [PATCH 04/11] bug: Add BUG_FORMAT_ARGS infrastructure
Date: Sat, 07 Jun 2025 11:42:28 +0200 [thread overview]
Message-ID: <20250607095618.472060044@infradead.org> (raw)
In-Reply-To: <20250607094224.104791182@infradead.org>
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>
---
include/asm-generic/bug.h | 1 +
lib/bug.c | 17 +++++++++++++++--
2 files changed, 16 insertions(+), 2 deletions(-)
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
@@ -13,6 +13,7 @@
#define BUGFLAG_ONCE (1 << 1)
#define BUGFLAG_DONE (1 << 2)
#define BUGFLAG_NO_CUT_HERE (1 << 3) /* CUT_HERE already sent */
+#define BUGFLAG_ARGS (1 << 4)
#define BUGFLAG_TAINT(taint) ((taint) << 8)
#define BUG_GET_TAINT(bug) ((bug)->flags >> 8)
#endif
--- a/lib/bug.c
+++ b/lib/bug.c
@@ -163,11 +163,23 @@ struct bug_entry *find_bug(unsigned long
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)
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);
}
@@ -193,6 +205,7 @@ static enum bug_trap_type __report_bug(u
once = bug->flags & BUGFLAG_ONCE;
done = bug->flags & BUGFLAG_DONE;
no_cut = bug->flags & BUGFLAG_NO_CUT_HERE;
+ has_args = bug->flags & BUGFLAG_ARGS;
if (warning && once) {
if (done)
@@ -212,7 +225,7 @@ static enum bug_trap_type __report_bug(u
*/
if (!no_cut) {
printk(KERN_DEFAULT CUT_HERE);
- __warn_printf(fmt);
+ __warn_printf(fmt, has_args ? regs : NULL);
}
if (warning) {
next prev parent reply other threads:[~2025-06-07 10:03 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-07 9:42 [PATCH 00/11] x86: WARN() hackery Peter Zijlstra
2025-06-07 9:42 ` [PATCH 01/11] x86: Provide assembly __bug_table helpers Peter Zijlstra
2025-06-07 9:42 ` [PATCH 02/11] bug: Add BUG_FORMAT infrastructure Peter Zijlstra
2025-06-07 9:42 ` [PATCH 03/11] bug: Clean up CONFIG_GENERIC_BUG_RELATIVE_POINTERS Peter Zijlstra
2025-06-07 9:42 ` Peter Zijlstra [this message]
2025-06-07 9:42 ` [PATCH 05/11] bug: Add report_bug_entry() Peter Zijlstra
2025-06-07 9:42 ` [PATCH 06/11] bug: Allow architectures to provide __WARN_printf() Peter Zijlstra
2025-06-07 9:42 ` [PATCH 07/11] x86_64/bug: Add BUG_FORMAT basics Peter Zijlstra
2025-06-07 9:42 ` [PATCH 08/11] x86_64/bug: Implement __WARN_printf() Peter Zijlstra
2025-06-07 10:08 ` Peter Zijlstra
2025-06-07 9:42 ` [PATCH 09/11] x86/bug: Implement WARN_ONCE() Peter Zijlstra
2025-06-07 9:42 ` [PATCH 10/11] x86: Clean up default rethunk warning Peter Zijlstra
2025-06-07 9:42 ` [PATCH 11/11] x86_64/bug: Inline the UD1 Peter Zijlstra
2025-06-07 14:22 ` [PATCH 00/11] x86: WARN() hackery Linus Torvalds
2025-07-03 13:40 ` Maxime Ripard
2025-07-03 13:47 ` Peter Zijlstra
2025-07-09 9:33 ` Maxime Ripard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250607095618.472060044@infradead.org \
--to=peterz@infradead.org \
--cc=acarmina@redhat.com \
--cc=jpoimboe@kernel.org \
--cc=kees@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=torvalds@linuxfoundation.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®