70 lines
2.5 KiB
Diff
70 lines
2.5 KiB
Diff
|
From: John Ogness <john.ogness@linutronix.de>
|
||
|
|
Date: Tue, 20 Aug 2024 08:35:44 +0206
|
||
|
|
Subject: [PATCH 18/54] printk: Add @flags argument for console_is_usable()
|
||
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.11/older/patches-6.11-rt7.tar.xz
|
||
|
|
|
||
|
|
The caller of console_is_usable() usually needs @console->flags
|
||
|
|
for its own checks. Rather than having console_is_usable() read
|
||
|
|
its own copy, make the caller pass in the @flags. This also
|
||
|
|
ensures that the caller saw the same @flags value.
|
||
|
|
|
||
|
|
Signed-off-by: John Ogness <john.ogness@linutronix.de>
|
||
|
|
Reviewed-by: Petr Mladek <pmladek@suse.com>
|
||
|
|
Link: https://lore.kernel.org/r/20240820063001.36405-19-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 | 8 ++------
|
||
|
|
kernel/printk/printk.c | 5 +++--
|
||
|
|
2 files changed, 5 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
--- a/kernel/printk/internal.h
|
||
|
|
+++ b/kernel/printk/internal.h
|
||
|
|
@@ -89,13 +89,9 @@ void nbcon_free(struct console *con);
|
||
|
|
* records. Note that this function does not consider the current context,
|
||
|
|
* which can also play a role in deciding if @con can be used to print
|
||
|
|
* records.
|
||
|
|
- *
|
||
|
|
- * Requires the console_srcu_read_lock.
|
||
|
|
*/
|
||
|
|
-static inline bool console_is_usable(struct console *con)
|
||
|
|
+static inline bool console_is_usable(struct console *con, short flags)
|
||
|
|
{
|
||
|
|
- short flags = console_srcu_read_flags(con);
|
||
|
|
-
|
||
|
|
if (!(flags & CON_ENABLED))
|
||
|
|
return false;
|
||
|
|
|
||
|
|
@@ -141,7 +137,7 @@ 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; }
|
||
|
|
+static inline bool console_is_usable(struct console *con, short flags) { return false; }
|
||
|
|
|
||
|
|
#endif /* CONFIG_PRINTK */
|
||
|
|
|
||
|
|
--- a/kernel/printk/printk.c
|
||
|
|
+++ b/kernel/printk/printk.c
|
||
|
|
@@ -3013,9 +3013,10 @@ static bool console_flush_all(bool do_co
|
||
|
|
|
||
|
|
cookie = console_srcu_read_lock();
|
||
|
|
for_each_console_srcu(con) {
|
||
|
|
+ short flags = console_srcu_read_flags(con);
|
||
|
|
bool progress;
|
||
|
|
|
||
|
|
- if (!console_is_usable(con))
|
||
|
|
+ if (!console_is_usable(con, flags))
|
||
|
|
continue;
|
||
|
|
any_usable = true;
|
||
|
|
|
||
|
|
@@ -3926,7 +3927,7 @@ static bool __pr_flush(struct console *c
|
||
|
|
* that they make forward progress, so only increment
|
||
|
|
* @diff for usable consoles.
|
||
|
|
*/
|
||
|
|
- if (!console_is_usable(c))
|
||
|
|
+ if (!console_is_usable(c, flags))
|
||
|
|
continue;
|
||
|
|
|
||
|
|
if (flags & CON_NBCON) {
|