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 <[email protected]> --- 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(-) 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 <linux/list.h> +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 -- To unsubscribe from this list: send the line "unsubscribe linux-api" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
