| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 3 Jul 2019 10:03:54 -0700
From: Douglas Anderson <dianders@...omium.org>
To: Jason Wessel <jason.wessel@...driver.com>,
Daniel Thompson <daniel.thompson@...aro.org>,
Andrew Morton <akpm@...ux-foundation.org>
Cc: Douglas Anderson <dianders@...omium.org>,
Martin Schwidefsky <schwidefsky@...ibm.com>,
Kees Cook <keescook@...omium.org>,
kgdb-bugreport@...ts.sourceforge.net, Borislav Petkov <bp@...e.de>,
linux-kernel@...r.kernel.org, Thomas Gleixner <tglx@...utronix.de>,
Feng Tang <feng.tang@...el.com>,
YueHaibing <yuehaibing@...wei.com>,
Sergey Senozhatsky <sergey.senozhatsky.work@...il.com>,
"Steven Rostedt (VMware)" <rostedt@...dmis.org>
Subject: [PATCH] kgdb: Don't use a notifier to enter kgdb at panic; call directly
Right now kgdb/kdb hooks up to debug panics by registering for the
panic notifier. This works OK except that it means that kgdb/kdb gets
called _after_ the CPUs in the system are taken offline. That means
that if anything important was happening on those CPUs (like something
that might have contributed to the panic) you can't debug them.
Specifically I ran into a case where I got a panic because a task was
"blocked for more than 120 seconds" which was detected on CPU 2. I
nicely got shown stack traces in the kernel log for all CPUs including
CPU 0, which was running 'PID: 111 Comm: kworker/0:1H' and was in the
middle of __mmc_switch().
I then ended up at the kdb prompt where switched over to kgdb to try
to look at local variables of the process on CPU 0. I found that I
couldn't. Digging more, I found that I had no info on any tasks
running on CPUs other than CPU 2 and that asking kdb for help showed
me "Error: no saved data for this cpu". This was because all the CPUs
were offline.
Let's move the entry of kdb/kgdb to a direct call from panic() and
stop using the generic notifier. Putting a direct call in allows us
to order things more properly and it also doesn't seem like we're
breaking any abstractions by calling into the debugger from the panic
function.
Signed-off-by: Douglas Anderson <dianders@...omium.org>
---
include/linux/kgdb.h | 2 ++
kernel/debug/debug_core.c | 31 +++++++++++--------------------
kernel/panic.c | 8 ++++++++
3 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
index fbf144aaa749..b072aeb1fd78 100644
--- a/include/linux/kgdb.h
+++ b/include/linux/kgdb.h
@@ -326,8 +326,10 @@ extern atomic_t kgdb_active;
(raw_smp_processor_id() == atomic_read(&kgdb_active))
extern bool dbg_is_early;
extern void __init dbg_late_init(void);
+extern void kgdb_panic(const char *msg);
#else /* ! CONFIG_KGDB */
#define in_dbg_master() (0)
#define dbg_late_init()
+static inline void kgdb_panic(const char *msg) {}
#endif /* ! CONFIG_KGDB */
#endif /* _KGDB_H_ */
diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
index 5cc608de6883..b26bf06cff9e 100644
--- a/kernel/debug/debug_core.c
+++ b/kernel/debug/debug_core.c
@@ -896,30 +896,25 @@ static struct sysrq_key_op sysrq_dbg_op = {
};
#endif
-static int kgdb_panic_event(struct notifier_block *self,
- unsigned long val,
- void *data)
+void kgdb_panic(const char *msg)
{
+ if (!kgdb_io_module_registered)
+ return;
+
/*
- * Avoid entering the debugger if we were triggered due to a panic
- * We don't want to get stuck waiting for input from user in such case.
- * panic_timeout indicates the system should automatically
+ * We don't want to get stuck waiting for input from user if
+ * "panic_timeout" indicates the system should automatically
* reboot on panic.
*/
if (panic_timeout)
- return NOTIFY_DONE;
+ return;
if (dbg_kdb_mode)
- kdb_printf("PANIC: %s\n", (char *)data);
+ kdb_printf("PANIC: %s\n", msg);
+
kgdb_breakpoint();
- return NOTIFY_DONE;
}
-static struct notifier_block kgdb_panic_event_nb = {
- .notifier_call = kgdb_panic_event,
- .priority = INT_MAX,
-};
-
void __weak kgdb_arch_late(void)
{
}
@@ -968,8 +963,6 @@ static void kgdb_register_callbacks(void)
kgdb_arch_late();
register_module_notifier(&dbg_module_load_nb);
register_reboot_notifier(&dbg_reboot_notifier);
- atomic_notifier_chain_register(&panic_notifier_list,
- &kgdb_panic_event_nb);
#ifdef CONFIG_MAGIC_SYSRQ
register_sysrq_key('g', &sysrq_dbg_op);
#endif
@@ -983,16 +976,14 @@ static void kgdb_register_callbacks(void)
static void kgdb_unregister_callbacks(void)
{
/*
- * When this routine is called KGDB should unregister from the
- * panic handler and clean up, making sure it is not handling any
+ * When this routine is called KGDB should unregister from
+ * handlers and clean up, making sure it is not handling any
* break exceptions at the time.
*/
if (kgdb_io_module_registered) {
kgdb_io_module_registered = 0;
unregister_reboot_notifier(&dbg_reboot_notifier);
unregister_module_notifier(&dbg_module_load_nb);
- atomic_notifier_chain_unregister(&panic_notifier_list,
- &kgdb_panic_event_nb);
kgdb_arch_exit();
#ifdef CONFIG_MAGIC_SYSRQ
unregister_sysrq_key('g', &sysrq_dbg_op);
diff --git a/kernel/panic.c b/kernel/panic.c
index 4d9f55bf7d38..e2971168b059 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -12,6 +12,7 @@
#include <linux/debug_locks.h>
#include <linux/sched/debug.h>
#include <linux/interrupt.h>
+#include <linux/kgdb.h>
#include <linux/kmsg_dump.h>
#include <linux/kallsyms.h>
#include <linux/notifier.h>
@@ -219,6 +220,13 @@ void panic(const char *fmt, ...)
dump_stack();
#endif
+ /*
+ * If kgdb is enabled, give it a chance to run before we stop all
+ * the other CPUs or else we won't be able to debug processes left
+ * running on them.
+ */
+ kgdb_panic(buf);
+
/*
* If we have crashed and we have a crash kernel loaded let it handle
* everything else.
--
2.22.0.410.gd8fdbe21b5-goog
Powered by blists - more mailing lists