106 lines
3.0 KiB
Diff
106 lines
3.0 KiB
Diff
|
From: John Ogness <john.ogness@linutronix.de>
|
||
|
|
Date: Tue, 20 Aug 2024 08:35:42 +0206
|
||
|
|
Subject: [PATCH 16/54] printk: Make console_is_usable() available to nbcon.c
|
||
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.11/older/patches-6.11-rt7.tar.xz
|
||
|
|
|
||
|
|
Move console_is_usable() as-is into internal.h so that it can
|
||
|
|
be used by nbcon printing functions as well.
|
||
|
|
|
||
|
|
Signed-off-by: John Ogness <john.ogness@linutronix.de>
|
||
|
|
Reviewed-by: Petr Mladek <pmladek@suse.com>
|
||
|
|
Link: https://lore.kernel.org/r/20240820063001.36405-17-john.ogness@linutronix.de
|
||
|
|
Signed-off-by: Petr Mladek <pmladek@suse.com>
|
||
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||
|
|
---
|
||
|
|
kernel/printk/internal.h | 32 ++++++++++++++++++++++++++++++++
|
||
|
|
kernel/printk/printk.c | 30 ------------------------------
|
||
|
|
2 files changed, 32 insertions(+), 30 deletions(-)
|
||
|
|
|
||
|
|
--- a/kernel/printk/internal.h
|
||
|
|
+++ b/kernel/printk/internal.h
|
||
|
|
@@ -84,6 +84,36 @@ void nbcon_seq_force(struct console *con
|
||
|
|
bool nbcon_alloc(struct console *con);
|
||
|
|
void nbcon_free(struct console *con);
|
||
|
|
|
||
|
|
+/*
|
||
|
|
+ * Check if the given console is currently capable and allowed to print
|
||
|
|
+ * records.
|
||
|
|
+ *
|
||
|
|
+ * Requires the console_srcu_read_lock.
|
||
|
|
+ */
|
||
|
|
+static inline bool console_is_usable(struct console *con)
|
||
|
|
+{
|
||
|
|
+ short flags = console_srcu_read_flags(con);
|
||
|
|
+
|
||
|
|
+ if (!(flags & CON_ENABLED))
|
||
|
|
+ return false;
|
||
|
|
+
|
||
|
|
+ if ((flags & CON_SUSPENDED))
|
||
|
|
+ return false;
|
||
|
|
+
|
||
|
|
+ if (!con->write)
|
||
|
|
+ return false;
|
||
|
|
+
|
||
|
|
+ /*
|
||
|
|
+ * Console drivers may assume that per-cpu resources have been
|
||
|
|
+ * allocated. So unless they're explicitly marked as being able to
|
||
|
|
+ * cope (CON_ANYTIME) don't call them until this CPU is officially up.
|
||
|
|
+ */
|
||
|
|
+ if (!cpu_online(raw_smp_processor_id()) && !(flags & CON_ANYTIME))
|
||
|
|
+ return false;
|
||
|
|
+
|
||
|
|
+ return true;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
#else
|
||
|
|
|
||
|
|
#define PRINTK_PREFIX_MAX 0
|
||
|
|
@@ -104,6 +134,8 @@ static inline void nbcon_seq_force(struc
|
||
|
|
static inline bool nbcon_alloc(struct console *con) { return false; }
|
||
|
|
static inline void nbcon_free(struct console *con) { }
|
||
|
|
|
||
|
|
+static inline bool console_is_usable(struct console *con) { return false; }
|
||
|
|
+
|
||
|
|
#endif /* CONFIG_PRINTK */
|
||
|
|
|
||
|
|
extern struct printk_buffers printk_shared_pbufs;
|
||
|
|
--- a/kernel/printk/printk.c
|
||
|
|
+++ b/kernel/printk/printk.c
|
||
|
|
@@ -2768,36 +2768,6 @@ int is_console_locked(void)
|
||
|
|
}
|
||
|
|
EXPORT_SYMBOL(is_console_locked);
|
||
|
|
|
||
|
|
-/*
|
||
|
|
- * Check if the given console is currently capable and allowed to print
|
||
|
|
- * records.
|
||
|
|
- *
|
||
|
|
- * Requires the console_srcu_read_lock.
|
||
|
|
- */
|
||
|
|
-static inline bool console_is_usable(struct console *con)
|
||
|
|
-{
|
||
|
|
- short flags = console_srcu_read_flags(con);
|
||
|
|
-
|
||
|
|
- if (!(flags & CON_ENABLED))
|
||
|
|
- return false;
|
||
|
|
-
|
||
|
|
- if ((flags & CON_SUSPENDED))
|
||
|
|
- return false;
|
||
|
|
-
|
||
|
|
- if (!con->write)
|
||
|
|
- return false;
|
||
|
|
-
|
||
|
|
- /*
|
||
|
|
- * Console drivers may assume that per-cpu resources have been
|
||
|
|
- * allocated. So unless they're explicitly marked as being able to
|
||
|
|
- * cope (CON_ANYTIME) don't call them until this CPU is officially up.
|
||
|
|
- */
|
||
|
|
- if (!cpu_online(raw_smp_processor_id()) && !(flags & CON_ANYTIME))
|
||
|
|
- return false;
|
||
|
|
-
|
||
|
|
- return true;
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
static void __console_unlock(void)
|
||
|
|
{
|
||
|
|
console_locked = 0;
|