From: <check.kernel@gmail.com>
To: Joe Perches <joe@perches.com>, Petr Mladek <pmladek@suse.cz>,
Alex Elder <elder@linaro.org>, Anton Vorontsov <anton@enomsg.org>,
Colin Cross <ccross@android.com>,
Kees Cook <keescook@chromium.org>,
Tony Luck <tony.luck@intel.com>,
Andrew Morton <akpm@linux-foundation.org>,
"Luis R. Rodriguez" <mcgrof@suse.com>,
Peter Hurley <peter@hurleysoftware.com>,
Tejun Heo <tj@kernel.org>, Hui Du <duhui@xiaomi.com>,
Linghua Gu <gulinghua@xiaomi.com>
Cc: linux-kernel@vger.kernel.org, Dongdong Yang <yangdongdong@xiaomi.com>
Subject: [PATCH v4] fs/pstore: provide panic data even in suspend
Date: Mon, 17 Aug 2015 16:51:39 +0800 [thread overview]
Message-ID: <1439801499-1818-1-git-send-email-check.kernel@gmail.com> (raw)
From: Dongdong Yang <yangdongdong@xiaomi.com>
If system restart after panic, this patch also enables
panic and oops messages which in suspend context to be
logged into ramoops console buffer where it can be read
back at some later point.
Signed-off-by: Dongdong Yang <yangdongdong@xiaomi.com>
Signed-off-by: Linghua Gu <gulinghua@xiaomi.com>
Signed-off-by: Hui Du <duhui@xiaomi.com>
---
fs/pstore/ram.c | 16 ++++++++++++++++
include/linux/printk.h | 6 ++++++
kernel/printk/printk.c | 6 ++++++
3 files changed, 28 insertions(+)
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 6c26c4d..3d981a1 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -642,8 +642,23 @@ static void ramoops_register_dummy(void)
}
}
+static int ramoops_console_notify(struct notifier_block *this,
+ unsigned long event, void *ptr)
+{
+ pr_emerg("ramoops unlock console ...\n");
+ emergency_unlock_console();
+
+ return 0;
+}
+
+static struct notifier_block ramoop_nb = {
+ .notifier_call = ramoops_console_notify,
+ .priority = INT_MAX,
+};
+
static int __init ramoops_init(void)
{
+ atomic_notifier_chain_register(&panic_notifier_list, &ramoop_nb);
ramoops_register_dummy();
return platform_driver_register(&ramoops_driver);
}
@@ -654,6 +669,7 @@ static void __exit ramoops_exit(void)
platform_driver_unregister(&ramoops_driver);
platform_device_unregister(dummy);
kfree(dummy_data);
+ atomic_notifier_chain_unregister(&panic_notifier_list, &ramoop_nb);
}
module_exit(ramoops_exit);
diff --git a/include/linux/printk.h b/include/linux/printk.h
index a6298b2..bd043ed 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -230,6 +230,12 @@ static inline void show_regs_print_info(const char *log_lvl)
}
#endif
+/*
+ * Enables printk() before emergency_restart
+ * if we go into suspend states and run into oops.
+ */
+void emergency_unlock_console(void);
+
extern asmlinkage void dump_stack(void) __cold;
#ifndef pr_fmt
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index cf8c242..abb8af4 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2107,6 +2107,12 @@ void resume_console(void)
console_unlock();
}
+void emergency_unlock_console(void)
+{
+ if (oops_in_progress && panic_timeout != 0 && console_suspended)
+ resume_console();
+}
+
/**
* console_cpu_notify - print deferred console messages after CPU hotplug
* @self: notifier struct
--
2.5.0
v4:
- Move declaration emergency_unlock_console to printk.h from pstore_ram.h
- Update sign-off information.
Thanks,
Dongdong Yang
next reply other threads:[~2015-08-17 8:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-17 8:51 check.kernel [this message]
2015-08-19 9:32 ` [PATCH v4] fs/pstore: provide panic data even in suspend Petr Mladek
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=1439801499-1818-1-git-send-email-check.kernel@gmail.com \
--to=check.kernel@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=anton@enomsg.org \
--cc=ccross@android.com \
--cc=duhui@xiaomi.com \
--cc=elder@linaro.org \
--cc=gulinghua@xiaomi.com \
--cc=joe@perches.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mcgrof@suse.com \
--cc=peter@hurleysoftware.com \
--cc=pmladek@suse.cz \
--cc=tj@kernel.org \
--cc=tony.luck@intel.com \
--cc=yangdongdong@xiaomi.com \
/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