From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: akpm@linux-foundation.org, aik@ozlabs.ru
Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
linux-mm@kvack.org
Subject: [PATCH] panic: don't dump stack twice on warn
Date: Sat, 7 Nov 2020 11:26:51 +0000 (UTC) [thread overview]
Message-ID: <e8c055458b080707f1bc1a98ff8bea79d0cec445.1604748361.git.christophe.leroy@csgroup.eu> (raw)
Before commit 3f388f28639f ("panic: dump registers on panic_on_warn"),
__warn() was calling show_regs() when regs was not NULL, and
show_stack() otherwise.
After that commit, show_stack() is called regardless of whether
show_regs() has been called or not, leading to duplicated Call Trace:
[ 7.112617] ------------[ cut here ]------------
[ 7.117041] WARNING: CPU: 0 PID: 1 at arch/powerpc/mm/nohash/8xx.c:186 mmu_mark_initmem_nx+0x24/0x94
[ 7.126021] CPU: 0 PID: 1 Comm: swapper Not tainted 5.10.0-rc2-s3k-dev-01375-gf46ec0d3ecbd-dirty #4092
[ 7.135202] NIP: c00128b4 LR: c0010228 CTR: 00000000
[ 7.140205] REGS: c9023e40 TRAP: 0700 Not tainted (5.10.0-rc2-s3k-dev-01375-gf46ec0d3ecbd-dirty)
[ 7.149131] MSR: 00029032 <EE,ME,IR,DR,RI> CR: 24000424 XER: 00000000
[ 7.155760]
[ 7.155760] GPR00: c0010228 c9023ef8 c2100000 0074c000 ffffffff 00000000 c2151000 c07b3880
[ 7.155760] GPR08: ff000900 0074c000 c8000000 c33b53a8 24000822 00000000 c0003a20 00000000
[ 7.155760] GPR16: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
[ 7.155760] GPR24: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00800000
[ 7.191092] NIP [c00128b4] mmu_mark_initmem_nx+0x24/0x94
[ 7.196333] LR [c0010228] free_initmem+0x20/0x58
[ 7.200855] Call Trace:
[ 7.203319] [c9023f18] [c0010228] free_initmem+0x20/0x58
[ 7.208564] [c9023f28] [c0003a3c] kernel_init+0x1c/0x114
[ 7.213813] [c9023f38] [c000f184] ret_from_kernel_thread+0x14/0x1c
[ 7.219869] Instruction dump:
[ 7.222805] 7d291850 7d234b78 4e800020 9421ffe0 7c0802a6 bfc10018 3fe0c060 3bff0000
[ 7.230462] 3fff4080 3bffffff 90010024 57ff0010 <0fe00000> 392001cd 7c3e0b78 953e0008
[ 7.238327] CPU: 0 PID: 1 Comm: swapper Not tainted 5.10.0-rc2-s3k-dev-01375-gf46ec0d3ecbd-dirty #4092
[ 7.247500] Call Trace:
[ 7.249977] [c9023dc0] [c001e070] __warn+0x8c/0xd8 (unreliable)
[ 7.255815] [c9023de0] [c05e0e5c] report_bug+0x11c/0x154
[ 7.261085] [c9023e10] [c0009ea4] program_check_exception+0x1dc/0x6e0
[ 7.267430] [c9023e30] [c000f43c] ret_from_except_full+0x0/0x4
[ 7.273238] --- interrupt: 700 at mmu_mark_initmem_nx+0x24/0x94
[ 7.273238] LR = free_initmem+0x20/0x58
[ 7.283155] [c9023ef8] [00000000] 0x0 (unreliable)
[ 7.287913] [c9023f18] [c0010228] free_initmem+0x20/0x58
[ 7.293160] [c9023f28] [c0003a3c] kernel_init+0x1c/0x114
[ 7.298410] [c9023f38] [c000f184] ret_from_kernel_thread+0x14/0x1c
[ 7.304479] ---[ end trace 31702cd2a9570752 ]---
Only call show_stack() when regs is NULL.
Fixes: 3f388f28639f ("panic: dump registers on panic_on_warn")
Cc: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
kernel/panic.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/panic.c b/kernel/panic.c
index 396142ee43fd..332736a72a58 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -605,7 +605,8 @@ void __warn(const char *file, int line, void *caller, unsigned taint,
panic("panic_on_warn set ...\n");
}
- dump_stack();
+ if (!regs)
+ dump_stack();
print_irqtrace_events(current);
--
2.25.0
WARNING: multiple messages have this Message-ID (diff)
From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: akpm@linux-foundation.org, aik@ozlabs.ru
Cc: linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] panic: don't dump stack twice on warn
Date: Sat, 7 Nov 2020 11:26:51 +0000 (UTC) [thread overview]
Message-ID: <e8c055458b080707f1bc1a98ff8bea79d0cec445.1604748361.git.christophe.leroy@csgroup.eu> (raw)
Before commit 3f388f28639f ("panic: dump registers on panic_on_warn"),
__warn() was calling show_regs() when regs was not NULL, and
show_stack() otherwise.
After that commit, show_stack() is called regardless of whether
show_regs() has been called or not, leading to duplicated Call Trace:
[ 7.112617] ------------[ cut here ]------------
[ 7.117041] WARNING: CPU: 0 PID: 1 at arch/powerpc/mm/nohash/8xx.c:186 mmu_mark_initmem_nx+0x24/0x94
[ 7.126021] CPU: 0 PID: 1 Comm: swapper Not tainted 5.10.0-rc2-s3k-dev-01375-gf46ec0d3ecbd-dirty #4092
[ 7.135202] NIP: c00128b4 LR: c0010228 CTR: 00000000
[ 7.140205] REGS: c9023e40 TRAP: 0700 Not tainted (5.10.0-rc2-s3k-dev-01375-gf46ec0d3ecbd-dirty)
[ 7.149131] MSR: 00029032 <EE,ME,IR,DR,RI> CR: 24000424 XER: 00000000
[ 7.155760]
[ 7.155760] GPR00: c0010228 c9023ef8 c2100000 0074c000 ffffffff 00000000 c2151000 c07b3880
[ 7.155760] GPR08: ff000900 0074c000 c8000000 c33b53a8 24000822 00000000 c0003a20 00000000
[ 7.155760] GPR16: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
[ 7.155760] GPR24: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00800000
[ 7.191092] NIP [c00128b4] mmu_mark_initmem_nx+0x24/0x94
[ 7.196333] LR [c0010228] free_initmem+0x20/0x58
[ 7.200855] Call Trace:
[ 7.203319] [c9023f18] [c0010228] free_initmem+0x20/0x58
[ 7.208564] [c9023f28] [c0003a3c] kernel_init+0x1c/0x114
[ 7.213813] [c9023f38] [c000f184] ret_from_kernel_thread+0x14/0x1c
[ 7.219869] Instruction dump:
[ 7.222805] 7d291850 7d234b78 4e800020 9421ffe0 7c0802a6 bfc10018 3fe0c060 3bff0000
[ 7.230462] 3fff4080 3bffffff 90010024 57ff0010 <0fe00000> 392001cd 7c3e0b78 953e0008
[ 7.238327] CPU: 0 PID: 1 Comm: swapper Not tainted 5.10.0-rc2-s3k-dev-01375-gf46ec0d3ecbd-dirty #4092
[ 7.247500] Call Trace:
[ 7.249977] [c9023dc0] [c001e070] __warn+0x8c/0xd8 (unreliable)
[ 7.255815] [c9023de0] [c05e0e5c] report_bug+0x11c/0x154
[ 7.261085] [c9023e10] [c0009ea4] program_check_exception+0x1dc/0x6e0
[ 7.267430] [c9023e30] [c000f43c] ret_from_except_full+0x0/0x4
[ 7.273238] --- interrupt: 700 at mmu_mark_initmem_nx+0x24/0x94
[ 7.273238] LR = free_initmem+0x20/0x58
[ 7.283155] [c9023ef8] [00000000] 0x0 (unreliable)
[ 7.287913] [c9023f18] [c0010228] free_initmem+0x20/0x58
[ 7.293160] [c9023f28] [c0003a3c] kernel_init+0x1c/0x114
[ 7.298410] [c9023f38] [c000f184] ret_from_kernel_thread+0x14/0x1c
[ 7.304479] ---[ end trace 31702cd2a9570752 ]---
Only call show_stack() when regs is NULL.
Fixes: 3f388f28639f ("panic: dump registers on panic_on_warn")
Cc: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
kernel/panic.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/panic.c b/kernel/panic.c
index 396142ee43fd..332736a72a58 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -605,7 +605,8 @@ void __warn(const char *file, int line, void *caller, unsigned taint,
panic("panic_on_warn set ...\n");
}
- dump_stack();
+ if (!regs)
+ dump_stack();
print_irqtrace_events(current);
--
2.25.0
next reply other threads:[~2020-11-07 11:26 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-07 11:26 Christophe Leroy [this message]
2020-11-07 11:26 ` [PATCH] panic: don't dump stack twice on warn Christophe Leroy
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=e8c055458b080707f1bc1a98ff8bea79d0cec445.1604748361.git.christophe.leroy@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--cc=aik@ozlabs.ru \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linuxppc-dev@lists.ozlabs.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.