diff options
author | peter <peter@FreeBSD.org> | 2008-05-04 23:29:38 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2008-05-04 23:29:38 +0000 |
commit | 5a3c5f632b4461dbf60ab538e16453104b937231 (patch) | |
tree | dec162871c2e0c2defef809d28858069fac12065 /sys/dev/dcons | |
parent | 40ba3f0b054237aea1c061c7ae1d4a9b1b5dd800 (diff) | |
download | FreeBSD-src-5a3c5f632b4461dbf60ab538e16453104b937231.zip FreeBSD-src-5a3c5f632b4461dbf60ab538e16453104b937231.tar.gz |
Expand kdb_alt_break a little, most commonly used with the option
ALT_BREAK_TO_DEBUGGER. In addition to "Enter ~ ctrl-B" (to enter the
debugger), there is now "Enter ~ ctrl-P" (force panic) and
"Enter ~ ctrl-R" (request clean reboot, ala ctrl-alt-del on syscons).
We've used variations of this at work. The force panic sequence is
best used with KDB_UNATTENDED for when you just want it to dump and
get on with it.
The reboot request is a safer way of getting into single user than
a power cycle. eg: you've hosed the ability to log in (pam, rtld, etc).
It gives init the reboot signal, which causes an orderly reboot.
I've taken my best guess at what the !x86 and non-sio code changes
should be.
This also makes sio release its spinlock before calling KDB/DDB.
Diffstat (limited to 'sys/dev/dcons')
-rw-r--r-- | sys/dev/dcons/dcons_os.c | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/sys/dev/dcons/dcons_os.c b/sys/dev/dcons/dcons_os.c index 7eb89aa..5715343 100644 --- a/sys/dev/dcons/dcons_os.c +++ b/sys/dev/dcons/dcons_os.c @@ -198,22 +198,36 @@ extern struct gdb_dbgport *gdb_cur; static int dcons_check_break(struct dcons_softc *dc, int c) { +#if __FreeBSD_version >= 502122 + int kdb_brk; +#endif if (c < 0) return (c); #if __FreeBSD_version >= 502122 - if (kdb_alt_break(c, &dc->brk_state)) { - if ((dc->flags & DC_GDB) != 0) { + if ((kdb_brk = kdb_alt_break(c, &dc->brk_state)) != 0) { + switch (kdb_brk) { + case KDB_REQ_DEBUGGER: + + if ((dc->flags & DC_GDB) != 0) { #ifdef GDB - if (gdb_cur == &dcons_gdb_dbgport) { - kdb_dbbe_select("gdb"); - kdb_enter(KDB_WHY_BREAK, - "Break sequence on dcons gdb port"); - } + if (gdb_cur == &dcons_gdb_dbgport) { + kdb_dbbe_select("gdb"); + kdb_enter(KDB_WHY_BREAK, + "Break sequence on dcons gdb port"); + } #endif - } else - kdb_enter(KDB_WHY_BREAK, - "Break sequence on dcons console port"); + } else + kdb_enter(KDB_WHY_BREAK, + "Break sequence on dcons console port"); + break; + case KDB_REQ_PANIC: + kdb_panic("Panic sequence on dcons console port"); + break; + case KDB_REQ_BREAK: + kdb_reboot(); + break; + } } #else switch (dc->brk_state) { |