| Message ID | 20190110115737.30931-2-mpe@ellerman.id.au (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 184051396b9d75a2a9ae64f134f3ee9d7250801c |
| Headers | show |
| Series | [v2,1/3] powerpc: Stop using pr_cont() in __die() | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | next/apply_patch Successfully applied |
| snowpatch_ozlabs/checkpatch | warning | total: 0 errors, 1 warnings, 0 checks, 10 lines checked |
Le 10/01/2019 à 12:57, Michael Ellerman a écrit : > The page size the kernel is built with is useful info when debugging a > crash, so add it to the output in __die(). > > Result looks like eg: > > kernel BUG at drivers/misc/lkdtm/bugs.c:63! > Oops: Exception in kernel mode, sig: 5 [#1] > LE PAGE_SIZE=64K SMP NR_CPUS=2048 NUMA pSeries > Modules linked in: vmx_crypto kvm binfmt_misc ip_tables > > Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Reviewed-by: Christophe Leroy <christophe.leroy@c-s.fr> > --- > arch/powerpc/kernel/traps.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > v2: Adapt to single printk. > > diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c > index 164fc92895be..a872c64618ad 100644 > --- a/arch/powerpc/kernel/traps.c > +++ b/arch/powerpc/kernel/traps.c > @@ -257,8 +257,9 @@ static int __die(const char *str, struct pt_regs *regs, long err) > { > printk("Oops: %s, sig: %ld [#%d]\n", str, err, ++die_counter); > > - printk("%s %s%s%s%s%s %s\n", > + printk("%s PAGE_SIZE=%luK%s%s%s%s%s %s\n", > IS_ENABLED(CONFIG_CPU_LITTLE_ENDIAN) ? "LE" : "BE", > + PAGE_SIZE / 1024, > IS_ENABLED(CONFIG_PREEMPT) ? " PREEMPT" : "", > IS_ENABLED(CONFIG_SMP) ? " SMP" : "", > IS_ENABLED(CONFIG_SMP) ? (" NR_CPUS=" __stringify(NR_CPUS)) : "", >
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index 164fc92895be..a872c64618ad 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -257,8 +257,9 @@ static int __die(const char *str, struct pt_regs *regs, long err) { printk("Oops: %s, sig: %ld [#%d]\n", str, err, ++die_counter); - printk("%s %s%s%s%s%s %s\n", + printk("%s PAGE_SIZE=%luK%s%s%s%s%s %s\n", IS_ENABLED(CONFIG_CPU_LITTLE_ENDIAN) ? "LE" : "BE", + PAGE_SIZE / 1024, IS_ENABLED(CONFIG_PREEMPT) ? " PREEMPT" : "", IS_ENABLED(CONFIG_SMP) ? " SMP" : "", IS_ENABLED(CONFIG_SMP) ? (" NR_CPUS=" __stringify(NR_CPUS)) : "",
The page size the kernel is built with is useful info when debugging a crash, so add it to the output in __die(). Result looks like eg: kernel BUG at drivers/misc/lkdtm/bugs.c:63! Oops: Exception in kernel mode, sig: 5 [#1] LE PAGE_SIZE=64K SMP NR_CPUS=2048 NUMA pSeries Modules linked in: vmx_crypto kvm binfmt_misc ip_tables Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> --- arch/powerpc/kernel/traps.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) v2: Adapt to single printk.