From: Joshua Wise <jwise@google.com>
To: akpm@linux-foundation.org
Cc: ak@suse.de, benh@kernel.crashing.org, ink@jurassic.park.msu.ru,
linux-arch@vger.kernel.org, paulus@samba.org,
rmk@arm.linux.org.uk, rth@twiddle.net,
mm-commits@vger.kernel.org
Subject: Re: - print-utsname-on-oops-on-all-architectures.patch removed from -mm tree
Date: Mon, 9 Jul 2007 11:22:45 -0700 (PDT) [thread overview]
Message-ID: <Pine.LNX.4.64.0707091121570.617@internets.corp.google.com> (raw)
In-Reply-To: <200707062207.l66M7hQA023027@imap1.linux-foundation.org>
[-- Attachment #1: Type: TEXT/PLAIN, Size: 6272 bytes --]
On Fri, 6 Jul 2007, akpm@linux-foundation.org wrote:
> The patch titled
> Print utsname on Oops on all architectures
> has been removed from the -mm tree. Its filename was
> print-utsname-on-oops-on-all-architectures.patch
>
> This patch was dropped because an updated version will be merged
OK, how's this:
--
From: Joshua Wise <jwise@google.com>
Background:
This patch is a follow-on to "Info dump on Oops or panic()" [1].
On some architectures, the kernel printed some information on the running
kernel, but not on all architectures. The information printed was generally
the version and build number, but it was not located in a consistant place,
and some architectures did not print it at all.
Description:
This patch uses the already-existing die_chain to print utsname information
on Oops. This patch also removes the architecture-specific utsname
printers. To avoid crashing the system further (and hence not printing the
Oops) in the case where the system is so hopelessly smashed that utsname
might be destroyed, we vsprintf the utsname data into a static buffer
first, and then just print that on crash.
Testing:
I wrote a module that does a *(int*)0 = 0; and observed that I got my
utsname data printed.
Potential impact:
This adds another line to the Oops output, causing the first few lines to
potentially scroll off the screen. This also adds a few more pointer
dereferences in the Oops path, because it adds to the die_chain notifier
chain, reducing the likelihood that the Oops will be printed if there is
very bad memory corruption.
Version: 2
Changelog:
v2 -- Removed the delete of the printk on ARM, as per RMK's request.
Patch:
This patch is against git 0471448f4d017470995d8a2272dc8c06dbed3b77.
[1] http://lkml.org/lkml/2007/6/28/316
--
diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c
index 92b6162..13f342e 100644
--- a/arch/alpha/kernel/process.c
+++ b/arch/alpha/kernel/process.c
@@ -20,7 +20,6 @@ #include <linux/ptrace.h>
#include <linux/slab.h>
#include <linux/user.h>
#include <linux/a.out.h>
-#include <linux/utsname.h>
#include <linux/time.h>
#include <linux/major.h>
#include <linux/stat.h>
diff --git a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c
index 06dfa65..1703243 100644
--- a/arch/i386/kernel/process.c
+++ b/arch/i386/kernel/process.c
@@ -27,7 +27,6 @@ #include <linux/vmalloc.h>
#include <linux/user.h>
#include <linux/a.out.h>
#include <linux/interrupt.h>
-#include <linux/utsname.h>
#include <linux/delay.h>
#include <linux/reboot.h>
#include <linux/init.h>
@@ -308,10 +307,8 @@ void show_regs(struct pt_regs * regs)
if (user_mode_vm(regs))
printk(" ESP: %04x:%08lx",0xffff & regs->xss,regs->esp);
- printk(" EFLAGS: %08lx %s (%s %.*s)\n",
- regs->eflags, print_tainted(), init_utsname()->release,
- (int)strcspn(init_utsname()->version, " "),
- init_utsname()->version);
+ printk(" EFLAGS: %08lx %s\n",
+ regs->eflags, print_tainted());
printk("EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
regs->eax,regs->ebx,regs->ecx,regs->edx);
printk("ESI: %08lx EDI: %08lx EBP: %08lx",
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 6e2f035..04c4abd 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -32,7 +32,6 @@ #include <linux/module.h>
#include <linux/kallsyms.h>
#include <linux/mqueue.h>
#include <linux/hardirq.h>
-#include <linux/utsname.h>
#include <asm/pgtable.h>
#include <asm/uaccess.h>
@@ -414,8 +413,8 @@ void show_regs(struct pt_regs * regs)
printk("NIP: "REG" LR: "REG" CTR: "REG"\n",
regs->nip, regs->link, regs->ctr);
- printk("REGS: %p TRAP: %04lx %s (%s)\n",
- regs, regs->trap, print_tainted(), init_utsname()->release);
+ printk("REGS: %p TRAP: %04lx %s\n",
+ regs, regs->trap, print_tainted());
printk("MSR: "REG" ", regs->msr);
printbits(regs->msr, msr_bits);
printk(" CR: %08lx XER: %08lx\n", regs->ccr, regs->xer);
diff --git a/arch/x86_64/kernel/process.c b/arch/x86_64/kernel/process.c
index 5909039..94fb7e3 100644
--- a/arch/x86_64/kernel/process.c
+++ b/arch/x86_64/kernel/process.c
@@ -32,7 +32,6 @@ #include <linux/a.out.h>
#include <linux/interrupt.h>
#include <linux/delay.h>
#include <linux/ptrace.h>
-#include <linux/utsname.h>
#include <linux/random.h>
#include <linux/notifier.h>
#include <linux/kprobes.h>
@@ -310,11 +309,8 @@ void __show_regs(struct pt_regs * regs)
printk("\n");
print_modules();
- printk("Pid: %d, comm: %.20s %s %s %.*s\n",
- current->pid, current->comm, print_tainted(),
- init_utsname()->release,
- (int)strcspn(init_utsname()->version, " "),
- init_utsname()->version);
+ printk("Pid: %d, comm: %.20s %s\n",
+ current->pid, current->comm, print_tainted());
printk("RIP: %04lx:[<%016lx>] ", regs->cs & 0xffff, regs->rip);
printk_address(regs->rip);
printk("RSP: %04lx:%016lx EFLAGS: %08lx\n", regs->ss, regs->rsp,
diff --git a/kernel/sys.c b/kernel/sys.c
index 872271c..6e01085 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -31,6 +31,7 @@ #include <linux/signal.h>
#include <linux/cn_proc.h>
#include <linux/getcpu.h>
#include <linux/task_io_accounting_ops.h>
+#include <linux/kdebug.h>
#include <linux/compat.h>
#include <linux/syscalls.h>
@@ -98,6 +99,36 @@ struct pid *cad_pid;
EXPORT_SYMBOL(cad_pid);
/*
+ * Dump out UTS info on oops / panic. We pregenerate utsname_info so that
+ * we don't access utsname() if the machine is in a potentially bad state.
+ */
+
+static char *utsname_info;
+
+static int dump_utsname(struct notifier_block *self, unsigned long diecode,
+ void *p)
+{
+ printk(KERN_EMERG "%s\n", utsname_info);
+ return 0;
+}
+
+static struct notifier_block utsname_notifier = {
+ .notifier_call = dump_utsname
+};
+
+static int __init register_utsname_dump(void)
+{
+ utsname_info = kasprintf(GFP_KERNEL, "%s %s %s %s",
+ utsname()->sysname,
+ utsname()->release,
+ utsname()->version,
+ utsname()->machine);
+ register_die_notifier(&utsname_notifier);
+ return 0;
+}
+module_init(register_utsname_dump);
+
+/*
* Notifier list for kernel code which wants to be called
* at shutdown. This is used to stop any idling DMA operations
* and the like.
[-- Attachment #2: Type: TEXT/plain, Size: 6123 bytes --]
From: Joshua Wise <jwise@google.com>
Background:
This patch is a follow-on to "Info dump on Oops or panic()" [1].
On some architectures, the kernel printed some information on the running
kernel, but not on all architectures. The information printed was generally
the version and build number, but it was not located in a consistant place,
and some architectures did not print it at all.
Description:
This patch uses the already-existing die_chain to print utsname information
on Oops. This patch also removes the architecture-specific utsname
printers. To avoid crashing the system further (and hence not printing the
Oops) in the case where the system is so hopelessly smashed that utsname
might be destroyed, we vsprintf the utsname data into a static buffer
first, and then just print that on crash.
Testing:
I wrote a module that does a *(int*)0 = 0; and observed that I got my
utsname data printed.
Potential impact:
This adds another line to the Oops output, causing the first few lines to
potentially scroll off the screen. This also adds a few more pointer
dereferences in the Oops path, because it adds to the die_chain notifier
chain, reducing the likelihood that the Oops will be printed if there is
very bad memory corruption.
Version: 2
Changelog:
v2 -- Removed the delete of the printk on ARM, as per RMK's request.
Patch:
This patch is against git 0471448f4d017470995d8a2272dc8c06dbed3b77.
[1] http://lkml.org/lkml/2007/6/28/316
--
diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c
index 92b6162..13f342e 100644
--- a/arch/alpha/kernel/process.c
+++ b/arch/alpha/kernel/process.c
@@ -20,7 +20,6 @@ #include <linux/ptrace.h>
#include <linux/slab.h>
#include <linux/user.h>
#include <linux/a.out.h>
-#include <linux/utsname.h>
#include <linux/time.h>
#include <linux/major.h>
#include <linux/stat.h>
diff --git a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c
index 06dfa65..1703243 100644
--- a/arch/i386/kernel/process.c
+++ b/arch/i386/kernel/process.c
@@ -27,7 +27,6 @@ #include <linux/vmalloc.h>
#include <linux/user.h>
#include <linux/a.out.h>
#include <linux/interrupt.h>
-#include <linux/utsname.h>
#include <linux/delay.h>
#include <linux/reboot.h>
#include <linux/init.h>
@@ -308,10 +307,8 @@ void show_regs(struct pt_regs * regs)
if (user_mode_vm(regs))
printk(" ESP: %04x:%08lx",0xffff & regs->xss,regs->esp);
- printk(" EFLAGS: %08lx %s (%s %.*s)\n",
- regs->eflags, print_tainted(), init_utsname()->release,
- (int)strcspn(init_utsname()->version, " "),
- init_utsname()->version);
+ printk(" EFLAGS: %08lx %s\n",
+ regs->eflags, print_tainted());
printk("EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
regs->eax,regs->ebx,regs->ecx,regs->edx);
printk("ESI: %08lx EDI: %08lx EBP: %08lx",
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 6e2f035..04c4abd 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -32,7 +32,6 @@ #include <linux/module.h>
#include <linux/kallsyms.h>
#include <linux/mqueue.h>
#include <linux/hardirq.h>
-#include <linux/utsname.h>
#include <asm/pgtable.h>
#include <asm/uaccess.h>
@@ -414,8 +413,8 @@ void show_regs(struct pt_regs * regs)
printk("NIP: "REG" LR: "REG" CTR: "REG"\n",
regs->nip, regs->link, regs->ctr);
- printk("REGS: %p TRAP: %04lx %s (%s)\n",
- regs, regs->trap, print_tainted(), init_utsname()->release);
+ printk("REGS: %p TRAP: %04lx %s\n",
+ regs, regs->trap, print_tainted());
printk("MSR: "REG" ", regs->msr);
printbits(regs->msr, msr_bits);
printk(" CR: %08lx XER: %08lx\n", regs->ccr, regs->xer);
diff --git a/arch/x86_64/kernel/process.c b/arch/x86_64/kernel/process.c
index 5909039..94fb7e3 100644
--- a/arch/x86_64/kernel/process.c
+++ b/arch/x86_64/kernel/process.c
@@ -32,7 +32,6 @@ #include <linux/a.out.h>
#include <linux/interrupt.h>
#include <linux/delay.h>
#include <linux/ptrace.h>
-#include <linux/utsname.h>
#include <linux/random.h>
#include <linux/notifier.h>
#include <linux/kprobes.h>
@@ -310,11 +309,8 @@ void __show_regs(struct pt_regs * regs)
printk("\n");
print_modules();
- printk("Pid: %d, comm: %.20s %s %s %.*s\n",
- current->pid, current->comm, print_tainted(),
- init_utsname()->release,
- (int)strcspn(init_utsname()->version, " "),
- init_utsname()->version);
+ printk("Pid: %d, comm: %.20s %s\n",
+ current->pid, current->comm, print_tainted());
printk("RIP: %04lx:[<%016lx>] ", regs->cs & 0xffff, regs->rip);
printk_address(regs->rip);
printk("RSP: %04lx:%016lx EFLAGS: %08lx\n", regs->ss, regs->rsp,
diff --git a/kernel/sys.c b/kernel/sys.c
index 872271c..6e01085 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -31,6 +31,7 @@ #include <linux/signal.h>
#include <linux/cn_proc.h>
#include <linux/getcpu.h>
#include <linux/task_io_accounting_ops.h>
+#include <linux/kdebug.h>
#include <linux/compat.h>
#include <linux/syscalls.h>
@@ -98,6 +99,36 @@ struct pid *cad_pid;
EXPORT_SYMBOL(cad_pid);
/*
+ * Dump out UTS info on oops / panic. We pregenerate utsname_info so that
+ * we don't access utsname() if the machine is in a potentially bad state.
+ */
+
+static char *utsname_info;
+
+static int dump_utsname(struct notifier_block *self, unsigned long diecode,
+ void *p)
+{
+ printk(KERN_EMERG "%s\n", utsname_info);
+ return 0;
+}
+
+static struct notifier_block utsname_notifier = {
+ .notifier_call = dump_utsname
+};
+
+static int __init register_utsname_dump(void)
+{
+ utsname_info = kasprintf(GFP_KERNEL, "%s %s %s %s",
+ utsname()->sysname,
+ utsname()->release,
+ utsname()->version,
+ utsname()->machine);
+ register_die_notifier(&utsname_notifier);
+ return 0;
+}
+module_init(register_utsname_dump);
+
+/*
* Notifier list for kernel code which wants to be called
* at shutdown. This is used to stop any idling DMA operations
* and the like.
next prev parent reply other threads:[~2007-07-09 18:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-06 22:07 - print-utsname-on-oops-on-all-architectures.patch removed from -mm tree akpm
2007-07-09 18:22 ` Joshua Wise [this message]
2007-07-13 8:25 ` Andrew Morton
2007-07-13 19:26 ` Joshua Wise
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=Pine.LNX.4.64.0707091121570.617@internets.corp.google.com \
--to=jwise@google.com \
--cc=ak@suse.de \
--cc=akpm@linux-foundation.org \
--cc=benh@kernel.crashing.org \
--cc=ink@jurassic.park.msu.ru \
--cc=linux-arch@vger.kernel.org \
--cc=mm-commits@vger.kernel.org \
--cc=paulus@samba.org \
--cc=rmk@arm.linux.org.uk \
--cc=rth@twiddle.net \
/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 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).