diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-05-15 14:46:44 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-07-28 08:06:55 +0200 |
| commit | 28ea295f941e39965c562097d5de0e66a373f19d (patch) | |
| tree | a64828b8681efb49ec7c7fdab332e6e6634a51a1 /kernel/panic.c | |
| parent | be2ba2fef1676861b295053c2a567b057e9031b9 (diff) | |
bugs/core: Reorganize fields in the first line of WARNING output, add ->comm[] output
With the introduction of the condition string as part of the 'file'
string output of kernel warnings, the first line has become a bit
harder to read:
WARNING: CPU: 0 PID: 0 at [ptr == 0 && 1] kernel/sched/core.c:8511 sched_init+0x20/0x410
Re-order the fields by importance (higher to lower), make the 'at' meaningful
again, and add '->comm[]' output which is often more valuable than a PID.
Also, remove the 'PID' prefix - in combination with comm it's clear what it is.
These changes make the output only slightly longer:
WARNING: [ptr == 0 && 1] kernel/sched/core.c:8511 at sched_init+0x20/0x410 CPU#0: swapper/0
While adding more information and making it better organized.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org> # Rebased ancestor commits
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-16-mingo@kernel.org
Diffstat (limited to 'kernel/panic.c')
| -rw-r--r-- | kernel/panic.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/kernel/panic.c b/kernel/panic.c index b0b9a8bf4560..8cb3649a79b6 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -753,13 +753,15 @@ void __warn(const char *file, int line, void *caller, unsigned taint, disable_trace_on_warning(); - if (file) - pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS\n", - raw_smp_processor_id(), current->pid, file, line, - caller); - else - pr_warn("WARNING: CPU: %d PID: %d at %pS\n", - raw_smp_processor_id(), current->pid, caller); + if (file) { + pr_warn("WARNING: %s:%d at %pS, CPU#%d: %s/%d\n", + file, line, caller, + raw_smp_processor_id(), current->comm, current->pid); + } else { + pr_warn("WARNING: at %pS, CPU#%d: %s/%d\n", + caller, + raw_smp_processor_id(), current->comm, current->pid); + } #pragma GCC diagnostic push #ifndef __clang__ |