From: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Petr Mladek <pmladek@suse.com>,
Steven Rostedt <rostedt@goodmis.org>,
Daniel Wang <wonderfly@google.com>,
Peter Zijlstra <peterz@infradead.org>,
Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Alan Cox <gnomes@lxorguk.ukuu.org.uk>,
Jiri Slaby <jslaby@suse.com>, Peter Feiner <pfeiner@google.com>,
linux-serial@vger.kernel.org,
Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Subject: [RFC][PATCHv2 2/4] printk: move printk_safe macros to printk header
Date: Tue, 16 Oct 2018 14:04:26 +0900 [thread overview]
Message-ID: <20181016050428.17966-3-sergey.senozhatsky@gmail.com> (raw)
In-Reply-To: <20181016050428.17966-1-sergey.senozhatsky@gmail.com>
Make printk_safe_enter_irqsave()/etc macros available to the
rest of the kernel.
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
---
include/linux/printk.h | 40 +++++++++++++++++++++++++++++++++++++
kernel/printk/internal.h | 37 ----------------------------------
kernel/printk/printk_safe.c | 6 ++++--
3 files changed, 44 insertions(+), 39 deletions(-)
diff --git a/include/linux/printk.h b/include/linux/printk.h
index cf3eccfe1543..75f99441fd54 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -157,6 +157,46 @@ static inline void printk_nmi_direct_enter(void) { }
static inline void printk_nmi_direct_exit(void) { }
#endif /* PRINTK_NMI */
+#ifdef CONFIG_PRINTK
+extern void printk_safe_enter(void);
+extern void printk_safe_exit(void);
+
+#define printk_safe_enter_irqsave(flags) \
+ do { \
+ local_irq_save(flags); \
+ printk_safe_enter(); \
+ } while (0)
+
+#define printk_safe_exit_irqrestore(flags) \
+ do { \
+ printk_safe_exit(); \
+ local_irq_restore(flags); \
+ } while (0)
+
+#define printk_safe_enter_irq() \
+ do { \
+ local_irq_disable(); \
+ printk_safe_enter(); \
+ } while (0)
+
+#define printk_safe_exit_irq() \
+ do { \
+ printk_safe_exit(); \
+ local_irq_enable(); \
+ } while (0)
+#else
+/*
+ * On !PRINTK builds we still export console output related locks
+ * and some functions (console_unlock()/tty/etc.), so printk-safe
+ * must preserve the existing local IRQ guarantees.
+ */
+#define printk_safe_enter_irqsave(flags) local_irq_save(flags)
+#define printk_safe_exit_irqrestore(flags) local_irq_restore(flags)
+
+#define printk_safe_enter_irq() local_irq_disable()
+#define printk_safe_exit_irq() local_irq_enable()
+#endif
+
#ifdef CONFIG_PRINTK
asmlinkage __printf(5, 0)
int vprintk_emit(int facility, int level,
diff --git a/kernel/printk/internal.h b/kernel/printk/internal.h
index 0f1898820cba..03c10f361a15 100644
--- a/kernel/printk/internal.h
+++ b/kernel/printk/internal.h
@@ -32,32 +32,6 @@ int vprintk_store(int facility, int level,
__printf(1, 0) int vprintk_default(const char *fmt, va_list args);
__printf(1, 0) int vprintk_deferred(const char *fmt, va_list args);
__printf(1, 0) int vprintk_func(const char *fmt, va_list args);
-void __printk_safe_enter(void);
-void __printk_safe_exit(void);
-
-#define printk_safe_enter_irqsave(flags) \
- do { \
- local_irq_save(flags); \
- __printk_safe_enter(); \
- } while (0)
-
-#define printk_safe_exit_irqrestore(flags) \
- do { \
- __printk_safe_exit(); \
- local_irq_restore(flags); \
- } while (0)
-
-#define printk_safe_enter_irq() \
- do { \
- local_irq_disable(); \
- __printk_safe_enter(); \
- } while (0)
-
-#define printk_safe_exit_irq() \
- do { \
- __printk_safe_exit(); \
- local_irq_enable(); \
- } while (0)
void defer_console_output(void);
@@ -65,15 +39,4 @@ void defer_console_output(void);
__printf(1, 0) int vprintk_func(const char *fmt, va_list args) { return 0; }
-/*
- * In !PRINTK builds we still export logbuf_lock spin_lock, console_sem
- * semaphore and some of console functions (console_unlock()/etc.), so
- * printk-safe must preserve the existing local IRQ guarantees.
- */
-#define printk_safe_enter_irqsave(flags) local_irq_save(flags)
-#define printk_safe_exit_irqrestore(flags) local_irq_restore(flags)
-
-#define printk_safe_enter_irq() local_irq_disable()
-#define printk_safe_exit_irq() local_irq_enable()
-
#endif /* CONFIG_PRINTK */
diff --git a/kernel/printk/printk_safe.c b/kernel/printk/printk_safe.c
index 0913b4d385de..367fcb2c39f0 100644
--- a/kernel/printk/printk_safe.c
+++ b/kernel/printk/printk_safe.c
@@ -359,16 +359,18 @@ static __printf(1, 0) int vprintk_safe(const char *fmt, va_list args)
}
/* Can be preempted by NMI. */
-void __printk_safe_enter(void)
+void printk_safe_enter(void)
{
this_cpu_inc(printk_context);
}
+EXPORT_SYMBOL_GPL(printk_safe_enter);
/* Can be preempted by NMI. */
-void __printk_safe_exit(void)
+void printk_safe_exit(void)
{
this_cpu_dec(printk_context);
}
+EXPORT_SYMBOL_GPL(printk_safe_exit);
__printf(1, 0) int vprintk_func(const char *fmt, va_list args)
{
--
2.19.1
next prev parent reply other threads:[~2018-10-16 5:05 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-16 5:04 [RFC][PATCHv2 0/4] less deadlock prone serial consoles Sergey Senozhatsky
2018-10-16 5:04 ` [RFC][PATCHv2 1/4] panic: avoid deadlocks in re-entrant console drivers Sergey Senozhatsky
2018-10-17 4:48 ` Sergey Senozhatsky
2018-10-23 11:07 ` Petr Mladek
2018-10-23 11:54 ` Sergey Senozhatsky
2018-10-23 12:04 ` Sergey Senozhatsky
2018-10-23 12:12 ` Sergey Senozhatsky
2018-10-25 9:06 ` Petr Mladek
2018-10-25 9:31 ` Sergey Senozhatsky
2018-10-25 8:29 ` Petr Mladek
2018-10-25 9:05 ` Sergey Senozhatsky
2018-10-25 10:10 ` [PATCHv3] " Sergey Senozhatsky
2018-10-25 10:51 ` kbuild test robot
2018-10-25 11:56 ` Sergey Senozhatsky
2018-10-31 12:27 ` Petr Mladek
2018-11-01 1:48 ` Sergey Senozhatsky
2018-11-01 8:08 ` Petr Mladek
2018-11-22 13:12 ` Petr Mladek
2018-12-12 0:53 ` Daniel Wang
2018-12-12 5:23 ` Sergey Senozhatsky
2018-12-12 5:59 ` Daniel Wang
2018-12-12 6:06 ` Sergey Senozhatsky
2018-12-12 6:09 ` Daniel Wang
2018-10-16 5:04 ` Sergey Senozhatsky [this message]
2018-10-16 7:27 ` [RFC][PATCHv2 2/4] printk: move printk_safe macros to printk header Peter Zijlstra
2018-10-16 11:40 ` Petr Mladek
2018-10-16 12:17 ` Peter Zijlstra
2018-10-17 10:50 ` Petr Mladek
2018-10-17 14:00 ` Peter Zijlstra
2018-10-22 14:30 ` Petr Mladek
2018-10-16 12:27 ` Sergey Senozhatsky
2018-10-16 12:38 ` Peter Zijlstra
2018-10-16 12:54 ` Peter Zijlstra
2018-10-16 14:21 ` Peter Zijlstra
2018-10-17 4:32 ` Sergey Senozhatsky
2018-10-17 7:57 ` Peter Zijlstra
2018-10-17 13:36 ` Sergey Senozhatsky
2018-10-23 6:25 ` Sergey Senozhatsky
2018-10-16 5:04 ` [RFC][PATCHv2 3/4] serial: introduce uart_port locking helpers Sergey Senozhatsky
2018-12-08 3:12 ` Sergey Senozhatsky
2018-12-12 11:08 ` Greg Kroah-Hartman
2018-10-16 5:04 ` [RFC][PATCHv2 4/4] tty: 8250: switch to " Sergey Senozhatsky
2018-10-16 7:23 ` [RFC][PATCHv2 0/4] less deadlock prone serial consoles Peter Zijlstra
2018-10-16 8:12 ` Sergey Senozhatsky
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=20181016050428.17966-3-sergey.senozhatsky@gmail.com \
--to=sergey.senozhatsky.work@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=gnomes@lxorguk.ukuu.org.uk \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=pfeiner@google.com \
--cc=pmladek@suse.com \
--cc=rostedt@goodmis.org \
--cc=sergey.senozhatsky@gmail.com \
--cc=torvalds@linux-foundation.org \
--cc=wonderfly@google.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).