From: anton@samba•org
To: linuxppc-dev@ozlabs•org
Cc: paulus@samba•org
Subject: [patch 06/10] Add notify die hooks and remove some redundant debugger hooks
Date: Tue, 20 Mar 2007 20:38:16 -0500 [thread overview]
Message-ID: <20070321013825.283024000@samba.org> (raw)
In-Reply-To: 20070321013810.404636000@samba.org
Add a DIE_OOPS and DIE_MACHINE_CHECK notify_die hook and remove some
redundant debugger* hooks.
Signed-off-by: Anton Blanchard <anton@samba•org>
---
Index: linux-2.6/arch/powerpc/kernel/traps.c
===================================================================
--- linux-2.6.orig/arch/powerpc/kernel/traps.c 2007-03-11 12:11:13.000000000 -0500
+++ linux-2.6/arch/powerpc/kernel/traps.c 2007-03-11 12:40:41.000000000 -0500
@@ -122,6 +122,10 @@
static int die_counter;
unsigned long flags;
+ if (notify_die(DIE_OOPS, str, regs, err, regs->trap, SIGSEGV) ==
+ NOTIFY_STOP)
+ return 1;
+
if (debugger(regs))
return 1;
@@ -374,6 +378,11 @@
return;
#endif
+ if (notify_die(DIE_MACHINE_CHECK, "machine_check", regs, 7, 7,
+ SIGBUS) == NOTIFY_STOP) {
+ return;
+ }
+
if (debugger_fault_handler(regs)) {
regs->msr |= MSR_RI;
return;
@@ -505,8 +514,6 @@
*/
platform_machine_check(regs);
- if (debugger_fault_handler(regs))
- return;
die("Machine check", regs, SIGBUS);
/* Must die if the interrupt is not recoverable */
@@ -890,7 +897,6 @@
{
printk(KERN_ERR "Non-recoverable exception at PC=%lx MSR=%lx\n",
regs->nip, regs->msr);
- debugger(regs);
die("nonrecoverable exception", regs, SIGKILL);
}
@@ -936,10 +942,8 @@
CHECK_FULL_REGS(regs);
- if (!user_mode(regs)) {
- debugger(regs);
+ if (!user_mode(regs))
die("Kernel Mode Software FPU Emulation", regs, SIGFPE);
- }
#ifdef CONFIG_MATH_EMULATION
errcode = do_mathemu(regs);
@@ -992,6 +996,9 @@
mtspr(SPRN_DBCR0, mfspr(SPRN_DBCR0) & ~DBCR0_IC);
/* Clear the instruction completion event */
mtspr(SPRN_DBSR, DBSR_IC);
+ if (notify_die(DIE_SSTEP, "single_step", regs, 5, 5,
+ SIGTRAP) == NOTIFY_STOP)
+ return;
if (debugger_sstep(regs))
return;
}
Index: linux-2.6/include/asm-powerpc/kdebug.h
===================================================================
--- linux-2.6.orig/include/asm-powerpc/kdebug.h 2007-03-11 12:36:52.000000000 -0500
+++ linux-2.6/include/asm-powerpc/kdebug.h 2007-03-11 12:37:05.000000000 -0500
@@ -30,6 +30,7 @@
DIE_BPT,
DIE_SSTEP,
DIE_PAGE_FAULT,
+ DIE_MACHINE_CHECK,
};
static inline int notify_die(enum die_val val,char *str,struct pt_regs *regs,long err,int trap, int sig)
--
next prev parent reply other threads:[~2007-03-21 1:38 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-21 1:38 [patch 00/10] Oops path and debugger hooks rework anton
2007-03-21 1:38 ` [patch 01/10] Add missing oops_enter/oops_exit anton
2007-03-21 1:38 ` [patch 02/10] Clean up pmac_backlight_unblank in oops path anton
2007-03-21 1:38 ` [patch 03/10] Handle recursive oopses anton
2007-03-21 1:38 ` [patch 04/10] Fix backwards ? : when printing machine type anton
2007-03-21 1:38 ` [patch 05/10] Use KERN_EMERG everywhere in oops printout anton
2007-03-21 2:23 ` Stephen Rothwell
2007-03-23 11:00 ` Paul Mackerras
2007-03-21 1:38 ` anton [this message]
2007-03-21 16:14 ` [patch 06/10] Add notify die hooks and remove some redundant debugger hooks Christoph Hellwig
2007-03-23 11:14 ` Paul Mackerras
2007-03-23 11:29 ` Christoph Hellwig
2007-03-23 12:04 ` Ananth N Mavinakayanahalli
2007-03-23 14:09 ` Anton Blanchard
2007-03-24 3:17 ` Paul Mackerras
2007-04-09 10:21 ` Paul Mackerras
2007-04-10 4:49 ` Ananth N Mavinakayanahalli
2007-03-21 1:38 ` [patch 07/10] Page fault handler should not depend on CONFIG_KPROBES anton
2007-03-21 16:13 ` Christoph Hellwig
2007-03-23 14:19 ` Anton Blanchard
2007-03-21 1:38 ` [patch 08/10] Use notifier hooks for xmon anton
2007-03-21 1:38 ` [patch 09/10] Use lowercase for hex printouts in oops messages anton
2007-03-21 2:14 ` Olof Johansson
2007-03-21 7:17 ` Geert Uytterhoeven
2007-03-21 16:44 ` Segher Boessenkool
2007-03-21 1:38 ` [patch 10/10] Make sure we only enable xmon once anton
2007-03-21 2:04 ` Anton Blanchard
2007-03-21 2:11 ` Olof Johansson
2007-03-21 2:05 ` Anton Blanchard
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=20070321013825.283024000@samba.org \
--to=anton@samba$(echo .)org \
--cc=linuxppc-dev@ozlabs$(echo .)org \
--cc=paulus@samba$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox