From: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
To: Petr Mladek <pmladek@suse.com>, Steven Rostedt <rostedt@goodmis.org>
Cc: Jan Kara <jack@suse.cz>,
Andrew Morton <akpm@linux-foundation.org>,
Peter Zijlstra <peterz@infradead.org>,
"Rafael J . Wysocki" <rjw@rjwysocki.net>,
Eric Biederman <ebiederm@xmission.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jslaby@suse.com>, Pavel Machek <pavel@ucw.cz>,
Andreas Mohr <andi@lisas.de>,
Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>,
linux-kernel@vger.kernel.org,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Subject: [RFC][PATCHv5 03/13] printk: add sync printk_emergency API
Date: Tue, 15 Aug 2017 11:56:15 +0900 [thread overview]
Message-ID: <20170815025625.1977-4-sergey.senozhatsky@gmail.com> (raw)
In-Reply-To: <20170815025625.1977-1-sergey.senozhatsky@gmail.com>
We already have `async' printk_emergency_begin(), which returns
immediately and does not guarantee that `printk_kthread' will
stop by the time it returns. Add `sync' version, which waits for
`printk_kthread' to stop.
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
---
include/linux/console.h | 2 ++
kernel/printk/printk.c | 38 ++++++++++++++++++++++++++++++++++++--
2 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/include/linux/console.h b/include/linux/console.h
index 07005db4c788..8ce29b2381d2 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -189,6 +189,8 @@ extern void resume_console(void);
extern void printk_emergency_begin(void);
extern void printk_emergency_end(void);
+extern int printk_emergency_begin_sync(void);
+extern int printk_emergency_end_sync(void);
int mda_console_init(void);
void prom_con_init(void);
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index a86767d4d619..5d4b4beeebf5 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -485,8 +485,8 @@ static inline bool printk_kthread_should_stop(void)
{
if (current != printk_kthread)
return false;
- /* An emergency mode */
- return (atomic_read(&printk_emergency) != 0);
+ /* An emergency mode or a pending printk_emergency_begin_sync() */
+ return (atomic_read(&printk_emergency) != 0 || kthread_should_park());
}
/*
@@ -509,6 +509,34 @@ void printk_emergency_end(void)
}
EXPORT_SYMBOL_GPL(printk_emergency_end);
+/*
+ * This disables printing offloading and instead attempts
+ * to do the usual console_trylock()->console_unlock().
+ *
+ * Note, this does wait for printk_kthread to stop.
+ */
+int printk_emergency_begin_sync(void)
+{
+ atomic_inc(&printk_emergency);
+ if (!printk_kthread)
+ return -EINVAL;
+
+ return kthread_park(printk_kthread);
+}
+EXPORT_SYMBOL_GPL(printk_emergency_begin_sync);
+
+/* This re-enables printk_kthread offloading. */
+int printk_emergency_end_sync(void)
+{
+ atomic_dec(&printk_emergency);
+ if (!printk_kthread)
+ return -EINVAL;
+
+ kthread_unpark(printk_kthread);
+ return 0;
+}
+EXPORT_SYMBOL_GPL(printk_emergency_end_sync);
+
/*
* Under heavy printing load or with a slow serial console (or both)
* console_unlock() can stall CPUs, which can result in soft/hard-lockups,
@@ -2018,6 +2046,12 @@ EXPORT_SYMBOL_GPL(printk_emergency_begin);
void printk_emergency_end(void) {}
EXPORT_SYMBOL_GPL(printk_emergency_end);
+int printk_emergency_begin_sync(void) {}
+EXPORT_SYMBOL_GPL(printk_emergency_begin_sync);
+
+int printk_emergency_end_sync(void) {}
+EXPORT_SYMBOL_GPL(printk_emergency_end_sync);
+
static inline bool console_offload_printing(void) { return false; }
#endif /* CONFIG_PRINTK */
--
2.14.1
next prev parent reply other threads:[~2017-08-15 3:00 UTC|newest]
Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-15 2:56 [RFC][PATCHv5 00/13] printk: introduce printing kernel thread Sergey Senozhatsky
2017-08-15 2:56 ` [RFC][PATCHv5 01/13] printk: move printk_pending out of per-cpu Sergey Senozhatsky
2017-08-15 2:56 ` [RFC][PATCHv5 02/13] printk: introduce printing kernel thread Sergey Senozhatsky
2017-08-15 2:56 ` Sergey Senozhatsky [this message]
2017-08-15 2:56 ` [RFC][PATCHv5 04/13] printk: add enforce_emergency parameter Sergey Senozhatsky
2017-08-15 2:56 ` [RFC][PATCHv5 05/13] printk: enable printk offloading Sergey Senozhatsky
2017-08-15 2:56 ` [RFC][PATCHv5 06/13] printk: register PM notifier Sergey Senozhatsky
2017-08-15 11:51 ` Rafael J. Wysocki
2017-08-16 7:31 ` Sergey Senozhatsky
2017-08-16 12:58 ` Rafael J. Wysocki
2017-08-17 5:55 ` Sergey Senozhatsky
2017-08-17 15:43 ` Rafael J. Wysocki
2017-08-17 23:19 ` Sergey Senozhatsky
2017-08-15 2:56 ` [RFC][PATCHv5 07/13] printk: register syscore notifier Sergey Senozhatsky
2017-08-15 11:56 ` Rafael J. Wysocki
2017-08-16 6:55 ` Sergey Senozhatsky
2017-08-16 12:59 ` Rafael J. Wysocki
2017-08-15 2:56 ` [RFC][PATCHv5 08/13] printk: set watchdog_thresh as maximum value for atomic_print_limit Sergey Senozhatsky
2017-08-15 2:56 ` [RFC][PATCHv5 09/13] printk: add auto-emergency enforcement mechanism Sergey Senozhatsky
2017-08-15 2:56 ` [RFC][PATCHv5 10/13] printk: force printk_kthread to offload printing Sergey Senozhatsky
2017-08-15 2:56 ` [RFC][PATCHv5 11/13] printk: always offload printing from user-space processes Sergey Senozhatsky
2017-08-15 2:56 ` [RFC][PATCHv5 12/13] printk: do not cond_resched() when we can offload Sergey Senozhatsky
2017-08-15 2:56 ` [RFC][PATCHv5 13/13] printk: move offloading logic to per-cpu Sergey Senozhatsky
2017-08-23 8:33 ` [RFC][PATCHv5 00/13] printk: introduce printing kernel thread Sergey Senozhatsky
2017-08-28 9:05 ` printk: what is going on with additional newlines? Pavel Machek
2017-08-28 10:28 ` Sergey Senozhatsky
2017-08-28 12:21 ` Sergey Senozhatsky
2017-08-28 12:38 ` Sergey Senozhatsky
2017-08-28 12:46 ` Pavel Machek
2017-08-29 13:40 ` Sergey Senozhatsky
2017-08-29 16:37 ` Joe Perches
2017-08-29 17:00 ` Linus Torvalds
2017-08-29 17:12 ` Linus Torvalds
2017-08-29 20:41 ` Tetsuo Handa
2017-08-29 20:51 ` Linus Torvalds
2017-09-02 6:12 ` Tetsuo Handa
2017-09-02 17:06 ` Linus Torvalds
2017-08-29 23:50 ` Steven Rostedt
2017-08-29 23:59 ` Linus Torvalds
2017-08-30 1:03 ` Sergey Senozhatsky
2017-08-30 1:10 ` Steven Rostedt
2017-08-30 1:51 ` Sergey Senozhatsky
2017-08-30 1:52 ` Joe Perches
2017-08-30 2:25 ` Sergey Senozhatsky
2017-08-30 2:31 ` Joe Perches
2017-08-30 2:47 ` Sergey Senozhatsky
2017-08-30 2:58 ` Joe Perches
2017-08-30 5:37 ` Sergey Senozhatsky
2017-09-08 10:18 ` Pavel Machek
2017-09-05 9:44 ` Petr Mladek
2017-09-05 9:59 ` Sergey Senozhatsky
2017-09-05 12:21 ` Petr Mladek
2017-09-05 12:35 ` Tetsuo Handa
2017-09-05 14:18 ` Sergey Senozhatsky
2017-09-05 13:42 ` Sergey Senozhatsky
2017-09-06 7:55 ` Petr Mladek
2017-09-17 6:26 ` Sergey Senozhatsky
2017-09-17 9:27 ` Sergey Senozhatsky
2017-09-17 15:35 ` Linus Torvalds
2017-09-18 0:46 ` Sergey Senozhatsky
2017-09-18 2:22 ` Joe Perches
2017-09-18 2:41 ` Sergey Senozhatsky
2017-09-18 2:45 ` Joe Perches
2017-09-18 2:55 ` Sergey Senozhatsky
2017-09-18 3:07 ` Joe Perches
2017-09-18 4:42 ` Sergey Senozhatsky
2017-09-01 13:19 ` Sergey Senozhatsky
2017-09-01 17:32 ` Joe Perches
2017-09-01 20:21 ` Linus Torvalds
2017-09-04 5:22 ` Sergey Senozhatsky
2017-09-04 5:41 ` Joe Perches
2017-09-05 14:54 ` Steven Rostedt
2017-09-06 2:14 ` Sergey Senozhatsky
2017-09-06 2:36 ` Linus Torvalds
2017-09-04 4:30 ` Sergey Senozhatsky
2017-09-04 5:24 ` Sergey Senozhatsky
2017-08-29 17:33 ` Sergey Senozhatsky
2017-08-29 17:52 ` Linus Torvalds
2017-08-29 18:09 ` Joe Perches
2017-08-30 1:07 ` Sergey Senozhatsky
2017-08-30 0:58 ` Sergey Senozhatsky
2017-08-29 16:48 ` Linus Torvalds
2017-08-29 17:10 ` Joe Perches
2017-08-29 17:20 ` Linus Torvalds
2017-08-29 17:33 ` Joe Perches
2017-08-29 17:36 ` Linus Torvalds
2017-08-29 17:48 ` Joe Perches
2017-08-29 20:24 ` Pavel Machek
2017-09-01 1:40 ` Sergey Senozhatsky
2017-09-01 2:04 ` Joe Perches
2017-09-01 6:59 ` Pavel Machek
2017-09-01 7:23 ` Joe Perches
2017-09-01 7:29 ` Pavel Machek
2017-09-01 11:13 ` Steven Rostedt
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=20170815025625.1977-4-sergey.senozhatsky@gmail.com \
--to=sergey.senozhatsky@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=andi@lisas.de \
--cc=ebiederm@xmission.com \
--cc=gregkh@linuxfoundation.org \
--cc=jack@suse.cz \
--cc=jslaby@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=penguin-kernel@I-love.SAKURA.ne.jp \
--cc=peterz@infradead.org \
--cc=pmladek@suse.com \
--cc=rjw@rjwysocki.net \
--cc=rostedt@goodmis.org \
--cc=sergey.senozhatsky.work@gmail.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;
as well as URLs for NNTP newsgroup(s).