xen/console: Fix truncation of panic() messages

The panic() function uses a static buffer to format its arguments into, simply
to emit the result via printk("%s", buf).  This buffer is not large enough for
some existing users in Xen.  e.g.:

  (XEN) ****************************************
  (XEN) Panic on CPU 0:
  (XEN) Invalid device tree blob at physical address 0x46a00000.
  (XEN) The DTB must be 8-byte aligned and must not exceed 2 MB in size.
  (XEN)
  (XEN) Plea****************************************

The remainder of this particular message is 'e check your bootloader.', but
has been inherited by RISC-V from ARM.

It is also pointless double buffering.  Implement vprintk() beside printk(),
and use it directly rather than rendering into a local buffer, removing it as
one source of message limitation.

This marginally simplifies panic(), and drops a global used-once buffer.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
master commit: 81f8b1dd94
master date: 2025-02-18 14:15:58 +0000
This commit is contained in:
Andrew Cooper authored and Jan Beulich committed 2025-03-20 13:13:44 +01:00
1 parent f2c5b4b1aa
commit 330ecfc7c1
2 files changed
+15 -8

No files matched your search

+13 -8
View File
@@ -961,11 +961,17 @@ static void vprintk_common(const char *prefix, const char *fmt, va_list args)
local_irq_restore(flags);
}
void vprintk(const char *fmt, va_list args)
{
vprintk_common("(XEN) ", fmt, args);
}
void printk(const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
vprintk_common("(XEN) ", fmt, args);
vprintk(fmt, args);
va_end(args);
}
@@ -1267,23 +1273,22 @@ void panic(const char *fmt, ...)
va_list args;
unsigned long flags;
static DEFINE_SPINLOCK(lock);
static char buf[128];
spin_debug_disable();
spinlock_profile_printall('\0');
debugtrace_dump();
/* Protects buf[] and ensure multi-line message prints atomically. */
/* Ensure multi-line message prints atomically. */
spin_lock_irqsave(&lock, flags);
va_start(args, fmt);
(void)vsnprintf(buf, sizeof(buf), fmt, args);
va_end(args);
console_start_sync();
printk("\n****************************************\n");
printk("Panic on CPU %d:\n", smp_processor_id());
printk("%s", buf);
va_start(args, fmt);
vprintk(fmt, args);
va_end(args);
printk("****************************************\n\n");
if ( opt_noreboot )
printk("Manual reset required ('noreboot' specified)\n");
+2
View File
@@ -61,6 +61,8 @@ debugtrace_printk(const char *fmt, ...) {}
#define _p(_x) ((void *)(unsigned long)(_x))
extern void printk(const char *fmt, ...)
__attribute__ ((format (printf, 1, 2), cold));
void vprintk(const char *fmt, va_list args)
__attribute__ ((format (printf, 1, 0), cold));
#define printk_once(fmt, args...) \
({ \
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.