printk: introduce dump_stack_lvl()
Subsystems (4)
Alexander Potapenko
reviewerPATCH 1/2 printk: introduce dump_stack_lvl()
dump_stack() is used for many different cases, which may require a log level consistent with other kernel messages surrounding the dump_stack() call.
Without that, certain systems that are configured to ignore the default level messages will miss stack traces in critical error reports.
This patch introduces dump_stack_lvl() that behaves similarly to dump_stack(), but accepts a custom log level.
The old dump_stack() becomes equal to dump_stack_lvl(KERN_DEFAULT).
A somewhat similar patch has been proposed in 2012:
https://lore.kernel.org/lkml/1332493269.2359.9.camel@hebo/
, but wasn't merged.
--- include/linux/printk.h | 1 + lib/dump_stack.c | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-)
include/linux/printk.h +1 -0
@@ -206,6 +206,7 @@ void __init setup_log_buf(int early); __printf(1, 2) void dump_stack_set_arch_desc(const char *fmt, ...);void dump_stack_print_info (const char *log_lvl);void show_regs_print_info (const char *log_lvl); +extern asmlinkage void dump_stack_lvl(const char *log_lvl) __cold; extern asmlinkage void dump_stack(void) __cold;extern void printk_safe_flush (void );extern void printk_safe_flush_on_panic (void );
lib/dump_stack.c +12 -7
@@ -73,10 +73,10 @@ void show_regs_print_info(const char *log_lvl)dump_stack_print_info (log_lvl); } -static void __dump_stack (void ) +static void __dump_stack (const char *log_lvl) { -dump_stack_print_info (KERN_DEFAULT ); -show_stack (NULL ,NULL ,KERN_DEFAULT ); +dump_stack_print_info (log_lvl); +show_stack (NULL ,NULL , log_lvl); }/**
@@ -87,7 +87,7 @@ static void __dump_stack(void)#ifdef CONFIG_SMP static atomic_t dump_lock =ATOMIC_INIT (-1 ); -asmlinkage __visible void dump_stack(void) +asmlinkage __visible void dump_stack_lvl(const char *log_lvl) {unsigned long flags;int was_locked;
@@ -117,7 +117,7 @@ asmlinkage __visible void dump_stack(void) goto retry; } -__dump_stack (); +__dump_stack (log_lvl);if (!was_locked)atomic_set (&dump_lock,-1 );
@@ -125,9 +125,14 @@ asmlinkage __visible void dump_stack(void)local_irq_restore (flags); }#else -asmlinkage __visible void dump_stack(void) +asmlinkage __visible void dump_stack_lvl(const char *log_lvl) { -__dump_stack (); +__dump_stack (log_lvl); }#endif + +asmlinkage __visible void dump_stack(void) +{ +dump_stack_lvl (KERN_DEFAULT ); +}EXPORT_SYMBOL (dump_stack);
Signature · 1 line
2.31.1.527.g47e6f16901-goog
Alexander Potapenko
reviewerPATCH 2/2 kasan: use dump_stack_lvl(KERN_ERR) to print stacks
Most of the contents of KASAN reports are printed with pr_err(), so use a consistent logging level to print the memory access stacks.
--- mm/kasan/report.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
mm/kasan/report.c +3 -3
@@ -230,7 +230,7 @@ static void print_address_description(void *addr, u8 tag) {struct page *page =kasan_addr_to_page (addr); -dump_stack (); +dump_stack_lvl (KERN_ERR );pr_err ("\n" );if (page &&PageSlab (page)) {
@@ -375,7 +375,7 @@ void kasan_report_async(void)pr_err ("BUG: KASAN: invalid-access\n" );pr_err ("Asynchronous mode enabled: no access details available\n" );pr_err ("\n" ); -dump_stack (); +dump_stack_lvl (KERN_ERR ); end_report(&flags, 0); }#endif /* CONFIG_KASAN_HW_TAGS */
@@ -420,7 +420,7 @@ static void __kasan_report(unsigned long addr, size_t size, bool is_write,pr_err ("\n" );print_memory_metadata (info.first_bad_addr); }else { -dump_stack (); +dump_stack_lvl (KERN_ERR ); }end_report (&flags, addr);
Signature · 1 line
2.31.1.527.g47e6f16901-goog
Quoted 78 lines · Alexander Potapenko
dump_stack()is used for many different cases, which may require a log level consistent with other kernel messages surrounding thedump_stack()call.
Without that, certain systems that are configured to ignore the default level messages will miss stack traces in critical error reports.This patch introduces
dump_stack_lvl()that behaves similarly todump_stack(), but accepts a custom log level.
The olddump_stack()becomes equal todump_stack_lvl(KERN_DEFAULT).A somewhat similar patch has been proposed in 2012:
https://lore.kernel.org/lkml/1332493269.2359.9.camel@hebo/
, but wasn't merged.Cc Andrew Morton <[email protected]>Cc Petr Mladek <[email protected]>Cc Ingo Molnar <[email protected]>Cc he, bo <[email protected]>Cc Yanmin Zhang <[email protected]>Cc Prasad Sodagudi <[email protected]>Cc Dmitry Vyukov <[email protected]>Cc Marco Elver <[email protected]>Signed-off-by Alexander Potapenko <[email protected]>--- include/linux/printk.h | 1 + lib/dump_stack.c | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-)include/linux/printk.h +1
-0@@ -206,6 +206,7 @@ void __init setup_log_buf(int early); __printf(1, 2) void dump_stack_set_arch_desc(const char *fmt, ...);void dump_stack_print_info (const char *log_lvl);void show_regs_print_info (const char *log_lvl); +extern asmlinkage void dump_stack_lvl(const char *log_lvl) __cold; extern asmlinkage void dump_stack(void) __cold;extern void printk_safe_flush (void );extern void printk_safe_flush_on_panic (void );lib/dump_stack.c +5
-5@@ -73,10 +73,10 @@ void show_regs_print_info(const char *log_lvl)dump_stack_print_info (log_lvl); } -static void __dump_stack (void ) +static void __dump_stack (const char *log_lvl) { -dump_stack_print_info (KERN_DEFAULT ); -show_stack (NULL ,NULL ,KERN_DEFAULT ); +dump_stack_print_info (log_lvl); +show_stack (NULL ,NULL , log_lvl); }/** @@ -87,7 +87,7 @@ static void __dump_stack(void)#ifdef CONFIG_SMP static atomic_t dump_lock =ATOMIC_INIT (-1 ); -asmlinkage __visible void dump_stack(void) +asmlinkage __visible void dump_stack_lvl(const char *log_lvl) {unsigned long flags;int was_locked;@@ -117,7 +117,7 @@ asmlinkage __visible void dump_stack(void) goto retry; } -__dump_stack (); +__dump_stack (log_lvl);if (!was_locked)atomic_set (&dump_lock,-1 );
lib/dump_stack.c asmlinkage __visible void dump_stack(void) · line 132
Quoted 10 lines
lib/dump_stack.c +2
-2@@ -125,9 +125,14 @@ asmlinkage __visible void dump_stack(void)local_irq_restore (flags); }#else -asmlinkage __visible void dump_stack(void) +asmlinkage __visible void dump_stack_lvl(const char *log_lvl) { -__dump_stack (); +__dump_stack (log_lvl); }#endif
+EXPORT_SYMBOL(dump_stack_lvl);
is missing here?
Quoted 9 lines
lib/dump_stack.c +5
-1+ +asmlinkage __visible void dump_stack(void) +{ +dump_stack_lvl (KERN_DEFAULT ); +}EXPORT_SYMBOL (dump_stack); --2.31.1.527.g47e6f16901-goog
Alexander Potapenko
reviewerQuoted 93 lines · Marco Elver
Quoted 78 lines · Alexander Potapenko
dump_stack()is used for many different cases, which may require a log level consistent with other kernel messages surrounding thedump_stack()call.
Without that, certain systems that are configured to ignore the default level messages will miss stack traces in critical error reports.This patch introduces
dump_stack_lvl()that behaves similarly todump_stack(), but accepts a custom log level.
The olddump_stack()becomes equal todump_stack_lvl(KERN_DEFAULT).A somewhat similar patch has been proposed in 2012:
https://lore.kernel.org/lkml/1332493269.2359.9.camel@hebo/
, but wasn't merged.Cc Andrew Morton <[email protected]>Cc Petr Mladek <[email protected]>Cc Ingo Molnar <[email protected]>Cc he, bo <[email protected]>Cc Yanmin Zhang <[email protected]>Cc Prasad Sodagudi <[email protected]>Cc Dmitry Vyukov <[email protected]>Cc Marco Elver <[email protected]>Signed-off-by Alexander Potapenko <[email protected]>--- include/linux/printk.h | 1 + lib/dump_stack.c | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-)include/linux/printk.h +1
-0@@ -206,6 +206,7 @@ void __init setup_log_buf(int early); __printf(1, 2) void dump_stack_set_arch_desc(const char *fmt, ...);void dump_stack_print_info (const char *log_lvl);void show_regs_print_info (const char *log_lvl); +extern asmlinkage void dump_stack_lvl(const char *log_lvl) __cold; extern asmlinkage void dump_stack(void) __cold;extern void printk_safe_flush (void );extern void printk_safe_flush_on_panic (void );lib/dump_stack.c +5
-5@@ -73,10 +73,10 @@ void show_regs_print_info(const char *log_lvl)dump_stack_print_info (log_lvl); } -static void __dump_stack (void ) +static void __dump_stack (const char *log_lvl) { -dump_stack_print_info (KERN_DEFAULT ); -show_stack (NULL ,NULL ,KERN_DEFAULT ); +dump_stack_print_info (log_lvl); +show_stack (NULL ,NULL , log_lvl); }/** @@ -87,7 +87,7 @@ static void __dump_stack(void)#ifdef CONFIG_SMP static atomic_t dump_lock =ATOMIC_INIT (-1 ); -asmlinkage __visible void dump_stack(void) +asmlinkage __visible void dump_stack_lvl(const char *log_lvl) {unsigned long flags;int was_locked;@@ -117,7 +117,7 @@ asmlinkage __visible void dump_stack(void) goto retry; } -__dump_stack (); +__dump_stack (log_lvl);if (!was_locked)atomic_set (&dump_lock,-1 );lib/dump_stack.c asmlinkage __visible void dump_stack(void) · line 132
Quoted 10 lines
lib/dump_stack.c +2
-2@@ -125,9 +125,14 @@ asmlinkage __visible void dump_stack(void)local_irq_restore (flags); }#else -asmlinkage __visible void dump_stack(void) +asmlinkage __visible void dump_stack_lvl(const char *log_lvl) { -__dump_stack (); +__dump_stack (log_lvl); }#endif +EXPORT_SYMBOL(dump_stack_lvl);
Quoted 1 line
is missing here?
You are right, will fix in v2.