* [PATCH 3/3] x86: Unify page fault oops printing
@ 2008-01-21 22:58 Harvey Harrison
2008-01-22 11:29 ` Ingo Molnar
0 siblings, 1 reply; 2+ messages in thread
From: Harvey Harrison @ 2008-01-21 22:58 UTC (permalink / raw)
To: Ingo Molnar; +Cc: H. Peter Anvin, LKML, Thomas Gleixner, Arjan van de Ven
This changes the oops dumping format for page faults to
be similar between X86_32 and 64.
This is the first user of printk_address on X86_32.
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
Ingo, this patch has behavior changes that will need discussion
arch/x86/mm/fault_32.c | 12 ++++++------
arch/x86/mm/fault_64.c | 9 ++++++---
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/arch/x86/mm/fault_32.c b/arch/x86/mm/fault_32.c
index fda3997..28ea3d3 100644
--- a/arch/x86/mm/fault_32.c
+++ b/arch/x86/mm/fault_32.c
@@ -340,15 +340,15 @@ static void show_fault_oops(struct pt_regs *regs, unsigned long error_code,
"(uid: %d)\n", current->uid);
}
#endif
+ printk(KERN_ALERT "BUG: unable to handle kernel ");
if (address < PAGE_SIZE)
- printk(KERN_ALERT "BUG: unable to handle kernel NULL "
- "pointer dereference");
+ printk(KERN_CONT "NULL pointer dereference");
else
- printk(KERN_ALERT "BUG: unable to handle kernel paging"
- " request");
- printk(" at virtual address %08lx\n", address);
- printk(KERN_ALERT "printing ip: %08lx ", regs->ip);
+ printk(KERN_CONT "paging request");
+ printk(KERN_CONT " at %08lx\n", address);
+ printk(KERN_ALERT "IP:");
+ printk_address(regs->ip, 1);
dump_pagetable(address);
}
diff --git a/arch/x86/mm/fault_64.c b/arch/x86/mm/fault_64.c
index 1897704..e12c34b 100644
--- a/arch/x86/mm/fault_64.c
+++ b/arch/x86/mm/fault_64.c
@@ -296,11 +296,14 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
static void show_fault_oops(struct pt_regs *regs, unsigned long error_code,
unsigned long address)
{
+ printk(KERN_ALERT "BUG: unable to handle kernel ");
if (address < PAGE_SIZE)
- printk(KERN_ALERT "Unable to handle kernel NULL pointer dereference");
+ printk(KERN_CONT "NULL pointer dereference");
else
- printk(KERN_ALERT "Unable to handle kernel paging request");
- printk(" at %016lx RIP: \n" KERN_ALERT, address);
+ printk(KERN_CONT "paging request");
+ printk(KERN_CONT " at %016lx\n", address);
+
+ printk(KERN_ALERT "IP:");
printk_address(regs->ip, 1);
dump_pagetable(address);
}
--
1.5.4.rc3.1118.gf6754c
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 3/3] x86: Unify page fault oops printing
2008-01-21 22:58 [PATCH 3/3] x86: Unify page fault oops printing Harvey Harrison
@ 2008-01-22 11:29 ` Ingo Molnar
0 siblings, 0 replies; 2+ messages in thread
From: Ingo Molnar @ 2008-01-22 11:29 UTC (permalink / raw)
To: Harvey Harrison; +Cc: H. Peter Anvin, LKML, Thomas Gleixner, Arjan van de Ven
* Harvey Harrison <harvey.harrison@gmail.com> wrote:
> This changes the oops dumping format for page faults to be similar
> between X86_32 and 64.
>
> This is the first user of printk_address on X86_32.
could you please send an actual before/after dump, so that we can see
the behavioral changes?
Ingo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-01-22 11:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-01-21 22:58 [PATCH 3/3] x86: Unify page fault oops printing Harvey Harrison
2008-01-22 11:29 ` Ingo Molnar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).