From patchwork Tue Dec 14 21:30:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Waychison X-Patchwork-Id: 75554 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 9B6CEB6EE9 for ; Wed, 15 Dec 2010 08:33:36 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932620Ab0LNVbq (ORCPT ); Tue, 14 Dec 2010 16:31:46 -0500 Received: from smtp-out.google.com ([74.125.121.35]:54990 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932498Ab0LNVbn (ORCPT ); Tue, 14 Dec 2010 16:31:43 -0500 Received: from wpaz21.hot.corp.google.com (wpaz21.hot.corp.google.com [172.24.198.85]) by smtp-out.google.com with ESMTP id oBELUOT6026827; Tue, 14 Dec 2010 13:30:24 -0800 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=google.com; s=beta; t=1292362225; bh=4BSicpKSg7S8o5aOIuhip+FFJh4=; h=Subject:To:From:Cc:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type:Content-Transfer-Encoding; b=Q6g8n0bDn8sYSbQXp2k93KRnL94uuWKEx3SYYq5BSkxRSHzZCqZ8fEhkZpoirwlnX rb4NgNe2ybdsX0YAMR1pw== DomainKey-Signature: a=rsa-sha1; s=beta; d=google.com; c=nofws; q=dns; h=subject:to:from:cc:date:message-id:in-reply-to:references: user-agent:mime-version:content-type: content-transfer-encoding:x-system-of-record; b=FkEVvnmLb+RZFZD7YYYP28Q5RbxrS6yJ3C9MVgM0umaV7TCiWQ8q2VpLr1m2ejexn hLwY7WMU9YY1+LSXU8Xrw== Received: from mike.mtv.corp.google.com (mike.mtv.corp.google.com [172.22.65.71]) by wpaz21.hot.corp.google.com with ESMTP id oBELULBS003118; Tue, 14 Dec 2010 13:30:22 -0800 Received: from mike.mtv.corp.google.com (unknown [IPv6:::1]) by mike.mtv.corp.google.com (Postfix) with ESMTP id CA5111610C4; Tue, 14 Dec 2010 13:30:21 -0800 (PST) Subject: [PATCH v3 16/22] kmsg_dumper: Pass pt_regs along to dumpers. To: simon.kagstrom@netinsight.net, davem@davemloft.net, nhorman@tuxdriver.com, Matt Mackall From: Mike Waychison Cc: adurbin@google.com, linux-kernel@vger.kernel.org, chavey@google.com, Greg KH , netdev@vger.kernel.org, =?utf-8?q?Am=C3=A9rico?= Wang , akpm@linux-foundation.org, linux-api@vger.kernel.org Date: Tue, 14 Dec 2010 13:30:21 -0800 Message-ID: <20101214213021.17022.14128.stgit@mike.mtv.corp.google.com> In-Reply-To: <20101214212846.17022.64836.stgit@mike.mtv.corp.google.com> References: <20101214212846.17022.64836.stgit@mike.mtv.corp.google.com> User-Agent: StGit/0.15 MIME-Version: 1.0 X-System-Of-Record: true Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org A subsequent commit adding netoops functionality would like access to the pt_regs to have them recorded in the dump. Pass the register values along if available. Signed-off-by: Mike Waychison --- drivers/char/ramoops.c | 4 +++- drivers/mtd/mtdoops.c | 4 +++- include/linux/kmsg_dump.h | 8 ++++++-- kernel/kexec.c | 5 +++-- kernel/panic.c | 4 ++-- kernel/printk.c | 4 ++-- 6 files changed, 19 insertions(+), 10 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/char/ramoops.c b/drivers/char/ramoops.c index 73dcb0e..9d79492 100644 --- a/drivers/char/ramoops.c +++ b/drivers/char/ramoops.c @@ -58,7 +58,9 @@ static struct ramoops_context { } oops_cxt; static void ramoops_do_dump(struct kmsg_dumper *dumper, - enum kmsg_dump_reason reason, const char *s1, unsigned long l1, + enum kmsg_dump_reason reason, + struct pt_regs *pt_regs, + const char *s1, unsigned long l1, const char *s2, unsigned long l2) { struct ramoops_context *cxt = container_of(dumper, diff --git a/drivers/mtd/mtdoops.c b/drivers/mtd/mtdoops.c index 1ee72f3..cf07cf5 100644 --- a/drivers/mtd/mtdoops.c +++ b/drivers/mtd/mtdoops.c @@ -298,7 +298,9 @@ static void find_next_position(struct mtdoops_context *cxt) } static void mtdoops_do_dump(struct kmsg_dumper *dumper, - enum kmsg_dump_reason reason, const char *s1, unsigned long l1, + enum kmsg_dump_reason reason, + struct pt_regs *pt_regs, + const char *s1, unsigned long l1, const char *s2, unsigned long l2) { struct mtdoops_context *cxt = container_of(dumper, diff --git a/include/linux/kmsg_dump.h b/include/linux/kmsg_dump.h index 24b4414..a229acc 100644 --- a/include/linux/kmsg_dump.h +++ b/include/linux/kmsg_dump.h @@ -14,6 +14,8 @@ #include +struct pt_regs; + enum kmsg_dump_reason { KMSG_DUMP_OOPS, KMSG_DUMP_PANIC, @@ -30,6 +32,7 @@ enum kmsg_dump_reason { */ struct kmsg_dumper { void (*dump)(struct kmsg_dumper *dumper, enum kmsg_dump_reason reason, + struct pt_regs *pt_regs, const char *s1, unsigned long l1, const char *s2, unsigned long l2); struct list_head list; @@ -37,13 +40,14 @@ struct kmsg_dumper { }; #ifdef CONFIG_PRINTK -void kmsg_dump(enum kmsg_dump_reason reason); +void kmsg_dump(enum kmsg_dump_reason reason, struct pt_regs *pt_regs); int kmsg_dump_register(struct kmsg_dumper *dumper); int kmsg_dump_unregister(struct kmsg_dumper *dumper); #else -static inline void kmsg_dump(enum kmsg_dump_reason reason) +static inline void kmsg_dump(enum kmsg_dump_reason reason, + struct pt_regs *pt_regs) { } diff --git a/kernel/kexec.c b/kernel/kexec.c index b55045b..840af0c 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c @@ -1078,10 +1078,11 @@ void crash_kexec(struct pt_regs *regs) if (kexec_crash_image) { struct pt_regs fixed_regs; - kmsg_dump(KMSG_DUMP_KEXEC); - crash_setup_regs(&fixed_regs, regs); crash_save_vmcoreinfo(); + + kmsg_dump(KMSG_DUMP_KEXEC, &fixed_regs); + machine_crash_shutdown(&fixed_regs); machine_kexec(kexec_crash_image); } diff --git a/kernel/panic.c b/kernel/panic.c index c3f39cd..b3a4440 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -87,7 +87,7 @@ NORET_TYPE void panic(const char * fmt, ...) */ crash_kexec(NULL); - kmsg_dump(KMSG_DUMP_PANIC); + kmsg_dump(KMSG_DUMP_PANIC, NULL); /* * Note smp_send_stop is the usual smp shutdown function, which @@ -353,7 +353,7 @@ void oops_exit(struct pt_regs *regs) { do_oops_enter_exit(); print_oops_end_marker(); - kmsg_dump(KMSG_DUMP_OOPS); + kmsg_dump(KMSG_DUMP_OOPS, regs); } #ifdef WANT_WARN_ON_SLOWPATH diff --git a/kernel/printk.c b/kernel/printk.c index 9a2264f..6d4d8c5 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -1552,7 +1552,7 @@ static const char *kmsg_to_str(enum kmsg_dump_reason reason) * Iterate through each of the dump devices and call the oops/panic * callbacks with the log buffer. */ -void kmsg_dump(enum kmsg_dump_reason reason) +void kmsg_dump(enum kmsg_dump_reason reason, struct pt_regs *pt_regs) { unsigned long end; unsigned chars; @@ -1589,7 +1589,7 @@ void kmsg_dump(enum kmsg_dump_reason reason) return; } list_for_each_entry(dumper, &dump_list, list) - dumper->dump(dumper, reason, s1, l1, s2, l2); + dumper->dump(dumper, reason, pt_regs, s1, l1, s2, l2); spin_unlock_irqrestore(&dump_list_lock, flags); } #endif