Currently threaded console printers synchronize against each
other using console_lock(). However, different console drivers
are unrelated and do not require any synchronization between
each other. Removing the synchronization between the threaded
console printers will allow each console to print at its own
speed.
But the threaded consoles printers do still need to synchronize
against console_lock() callers. Introduce a per-console mutex
and a new console flag CON_THD_BLOCKED to provide this
synchronization.
console_lock() is modified so that it must acquire the mutex
of each console in order to set the CON_THD_BLOCKED flag.
Console printing threads will acquire their mutex while
printing a record. If CON_THD_BLOCKED was set, the thread will
go back to sleep instead of printing.
The reason for the CON_THD_BLOCKED flag is so that
console_lock() callers do not need to acquire multiple console
mutexes simultaneously, which would introduce unnecessary
complexity due to nested mutex locking.
The per-console mutex is also used to synchronize setting and
checking the CON_ENABLED flag. A new console_lock() variant is
introduced, console_lock_single_hold(), that allows acquiring
@console_sem but only locking (and holding) the mutex of a
single console. This allows safely enabling and disabling
consoles without disturbing the other kthread printers. The
mutex and @console_sem are released with
console_unlock_single_release().
Console unregistering now uses console_lock_single_hold() to
stop the kthread. Thus con->thread is now synchronized by
the per-console mutex. This allows consoles to be unregistered
without disturbing the other kthread printers.
Threaded console printers also need to synchronize against
console_trylock() callers. Since console_trylock() may be
called from any context, the per-console mutex cannot be used
for this synchronization. (mutex_trylock() cannot be called
from atomic contexts.) Introduce a global atomic counter to
identify if any threaded printers are active. The threaded
printers will also check the atomic counter to identify if the
console has been locked by another task via console_trylock().
Note that @console_sem is still used to provide synchronization
between console_lock() and console_trylock() callers.
A locking overview for console_lock(), console_trylock(), and the
threaded printers is as follows (pseudo code):
console_lock()
{
down(&console_sem);
for_each_console(con) {
mutex_lock(&con->lock);
con->flags |= CON_THD_BLOCKED;
mutex_unlock(&con->lock);
}
/* console_lock acquired */
}
console_trylock()
{
if (down_trylock(&console_sem) == 0) {
if (atomic_cmpxchg(&console_kthreads_active, 0, -1) == 0) {
/* console_lock acquired */
}
}
}
threaded_printer()
{
mutex_lock(&con->lock);
if (!(con->flags & CON_THD_BLOCKED)) {
/* console_lock() callers blocked */
if (atomic_inc_unless_negative(&console_kthreads_active)) {
/* console_trylock() callers blocked */
con->write();
atomic_dec(&console_lock_count);
}
}
mutex_unlock(&con->lock);
}
The console owner and waiter logic now only applies between contexts
that have taken the console_lock via console_trylock(). Threaded
printers never take the console_lock, so they do not have a
console_lock to handover. Tasks that have used console_lock() will
block the threaded printers using a mutex and if the console_lock
is handed over to an atomic context, it would be unable to unblock
the threaded printers. However, the console_trylock() case is
really the only scenario that is interesting for handovers anyway.
@panic_console_dropped must change to atomic_t since it is no longer
protected exclusively by the console_lock.
Since threaded printers remain asleep if they see that the console
is locked, they now must be explicitly woken in __console_unlock().
This means wake_up_klogd() calls following a console_unlock() are
no longer necessary and are removed.
Also note that threaded printers no longer need to check
@console_suspended. The check for the CON_THD_BLOCKED flag
implicitly covers the suspended console case.
Signed-off-by: John Ogness <[email protected]>
---
include/linux/console.h | 15 ++
kernel/printk/printk.c | 295 +++++++++++++++++++++++++++++++---------
2 files changed, 242 insertions(+), 68 deletions(-)
diff --git a/include/linux/console.h b/include/linux/console.h
index 9a251e70c090..c1fd4f41c547 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -16,6 +16,7 @@
#include <linux/atomic.h>
#include <linux/types.h>
+#include <linux/mutex.h>
struct vc_data;
struct console_font_op;
@@ -136,6 +137,7 @@ static inline int con_debug_leave(void)
#define CON_ANYTIME (16) /* Safe to call when cpu is offline */
#define CON_BRL (32) /* Used for a braille device */
#define CON_EXTENDED (64) /* Use the extended output format a la /dev/kmsg */
+#define CON_THD_BLOCKED (128) /* Thread blocked because console is locked */
struct console {
char name[16];
@@ -155,6 +157,19 @@ struct console {
unsigned long dropped;
struct task_struct *thread;
+ /*
+ * The per-console lock is used by printing kthreads to synchronize
+ * this console with callers of console_lock(). This is necessary in
+ * order to allow printing kthreads to run in parallel to each other,
+ * while each safely accessing their own @flags and synchronizing
+ * against direct printing via console_lock/console_unlock.
+ *
+ * Note: For synchronizing against direct printing via
+ * console_trylock/console_unlock, see the static global
+ * variable @console_kthreads_active.
+ */
+ struct mutex lock;
+
void *data;
struct console *next;
};
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 7e6f1f19abe5..6d5f57142cd9 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -223,6 +223,33 @@ int devkmsg_sysctl_set_loglvl(struct ctl_table *table, int write,
/* Number of registered extended console drivers. */
static int nr_ext_console_drivers;
+/*
+ * Used to synchronize printing kthreads against direct printing via
+ * console_trylock/console_unlock.
+ *
+ * Values:
+ * -1 = console kthreads atomically blocked (via global trylock)
+ * 0 = no kthread printing, console not locked (via trylock)
+ * >0 = kthread(s) actively printing
+ *
+ * Note: For synchronizing against direct printing via
+ * console_lock/console_unlock, see the @lock variable in
+ * struct console.
+ */
+static atomic_t console_kthreads_active = ATOMIC_INIT(0);
+
+#define console_kthreads_atomic_tryblock() \
+ (atomic_cmpxchg(&console_kthreads_active, 0, -1) == 0)
+#define console_kthreads_atomic_unblock() \
+ atomic_cmpxchg(&console_kthreads_active, -1, 0)
+#define console_kthreads_atomically_blocked() \
+ (atomic_read(&console_kthreads_active) == -1)
+
+#define console_kthread_printing_tryenter() \
+ atomic_inc_unless_negative(&console_kthreads_active)
+#define console_kthread_printing_exit() \
+ atomic_dec(&console_kthreads_active)
+
/*
* Helper macros to handle lockdep when locking/unlocking console_sem. We use
* macros instead of functions so that _RET_IP_ contains useful information.
@@ -270,6 +297,49 @@ static bool panic_in_progress(void)
return unlikely(atomic_read(&panic_cpu) != PANIC_CPU_INVALID);
}
+/*
+ * Tracks whether kthread printers are all blocked. A value of true implies
+ * that the console is locked via console_lock() or the console is suspended.
+ * Reading and writing to this variable requires holding @console_sem.
+ */
+static bool console_kthreads_blocked;
+
+/*
+ * Block all kthread printers from a schedulable context.
+ *
+ * Requires holding @console_sem.
+ */
+static void console_kthreads_block(void)
+{
+ struct console *con;
+
+ for_each_console(con) {
+ mutex_lock(&con->lock);
+ con->flags |= CON_THD_BLOCKED;
+ mutex_unlock(&con->lock);
+ }
+
+ console_kthreads_blocked = true;
+}
+
+/*
+ * Unblock all kthread printers from a schedulable context.
+ *
+ * Requires holding @console_sem.
+ */
+static void console_kthreads_unblock(void)
+{
+ struct console *con;
+
+ for_each_console(con) {
+ mutex_lock(&con->lock);
+ con->flags &= ~CON_THD_BLOCKED;
+ mutex_unlock(&con->lock);
+ }
+
+ console_kthreads_blocked = false;
+}
+
/*
* This is used for debugging the mess that is the VT code by
* keeping track if we have the console semaphore held. It's
@@ -2578,13 +2648,6 @@ void resume_console(void)
down_console_sem();
console_suspended = 0;
console_unlock();
-
- /*
- * While suspended, new records may have been added to the
- * ringbuffer. Wake up the kthread printers to print them.
- */
- wake_up_klogd();
-
pr_flush(1000, true);
}
@@ -2603,9 +2666,10 @@ static int console_cpu_notify(unsigned int cpu)
/* If trylock fails, someone else is doing the printing */
if (console_trylock())
console_unlock();
-
- /* Wake kthread printers. Some may have become usable. */
- wake_up_klogd();
+ else {
+ /* Some kthread printers may have become usable. */
+ wake_up_klogd();
+ }
}
return 0;
}
@@ -2625,11 +2689,33 @@ void console_lock(void)
down_console_sem();
if (console_suspended)
return;
+ console_kthreads_block();
console_locked = 1;
console_may_schedule = 1;
}
EXPORT_SYMBOL(console_lock);
+/*
+ * Lock the console_lock, but rather than blocking all the kthread printers,
+ * lock a specified kthread printer and hold the lock. This is useful if
+ * console flags for a particular console need to be updated.
+ */
+void console_lock_single_hold(struct console *con)
+{
+ might_sleep();
+ down_console_sem();
+ mutex_lock(&con->lock);
+ console_locked = 1;
+ console_may_schedule = 1;
+}
+
+static void console_unlock_single_release(struct console *con)
+{
+ console_locked = 0;
+ mutex_unlock(&con->lock);
+ up_console_sem();
+}
+
/**
* console_trylock - try to lock the console system for exclusive use.
*
@@ -2646,6 +2732,10 @@ int console_trylock(void)
up_console_sem();
return 0;
}
+ if (!console_kthreads_atomic_tryblock()) {
+ up_console_sem();
+ return 0;
+ }
console_locked = 1;
console_may_schedule = 0;
return 1;
@@ -2654,7 +2744,7 @@ EXPORT_SYMBOL(console_trylock);
int is_console_locked(void)
{
- return console_locked;
+ return (console_locked || atomic_read(&console_kthreads_active));
}
EXPORT_SYMBOL(is_console_locked);
@@ -2698,7 +2788,7 @@ static inline bool __console_is_usable(short flags)
* Check if the given console is currently capable and allowed to print
* records.
*
- * Requires the console_lock.
+ * Requires holding the console_lock or con->lock.
*/
static inline bool console_is_usable(struct console *con)
{
@@ -2711,6 +2801,22 @@ static inline bool console_is_usable(struct console *con)
static void __console_unlock(void)
{
console_locked = 0;
+
+ /*
+ * Depending on whether console_lock() or console_trylock() was used,
+ * appropriately allow the kthread printers to continue.
+ */
+ if (console_kthreads_blocked)
+ console_kthreads_unblock();
+ else
+ console_kthreads_atomic_unblock();
+
+ /*
+ * New records may have arrived while the console was locked.
+ * Wake the kthread printers to print them.
+ */
+ wake_up_klogd();
+
up_console_sem();
}
@@ -2728,17 +2834,18 @@ static void __console_unlock(void)
*
* @handover will be set to true if a printk waiter has taken over the
* console_lock, in which case the caller is no longer holding the
- * console_lock. Otherwise it is set to false.
+ * console_lock. Otherwise it is set to false. A NULL pointer may be provided
+ * to disable allowing the console_lock to be taken over by a printk waiter.
*
* Returns false if the given console has no next record to print, otherwise
* true.
*
- * Requires the console_lock.
+ * Requires the console_lock if @handover is non-NULL.
*/
-static bool console_emit_next_record(struct console *con, char *text, char *ext_text,
- char *dropped_text, bool *handover)
+static bool __console_emit_next_record(struct console *con, char *text, char *ext_text,
+ char *dropped_text, bool *handover)
{
- static int panic_console_dropped;
+ static atomic_t panic_console_dropped = ATOMIC_INIT(0);
struct printk_info info;
struct printk_record r;
unsigned long flags;
@@ -2747,7 +2854,8 @@ static bool console_emit_next_record(struct console *con, char *text, char *ext_
prb_rec_init_rd(&r, &info, text, CONSOLE_LOG_MAX);
- *handover = false;
+ if (handover)
+ *handover = false;
if (!prb_read_valid(prb, con->seq, &r))
return false;
@@ -2755,7 +2863,8 @@ static bool console_emit_next_record(struct console *con, char *text, char *ext_
if (con->seq != r.info->seq) {
con->dropped += r.info->seq - con->seq;
con->seq = r.info->seq;
- if (panic_in_progress() && panic_console_dropped++ > 10) {
+ if (panic_in_progress() &&
+ atomic_fetch_inc_relaxed(&panic_console_dropped) > 10) {
suppress_panic_printk = 1;
pr_warn_once("Too many dropped messages. Suppress messages on non-panic CPUs to prevent livelock.\n");
}
@@ -2777,31 +2886,61 @@ static bool console_emit_next_record(struct console *con, char *text, char *ext_
len = record_print_text(&r, console_msg_format & MSG_FORMAT_SYSLOG, printk_time);
}
- /*
- * While actively printing out messages, if another printk()
- * were to occur on another CPU, it may wait for this one to
- * finish. This task can not be preempted if there is a
- * waiter waiting to take over.
- *
- * Interrupts are disabled because the hand over to a waiter
- * must not be interrupted until the hand over is completed
- * (@console_waiter is cleared).
- */
- printk_safe_enter_irqsave(flags);
- console_lock_spinning_enable();
+ if (handover) {
+ /*
+ * While actively printing out messages, if another printk()
+ * were to occur on another CPU, it may wait for this one to
+ * finish. This task can not be preempted if there is a
+ * waiter waiting to take over.
+ *
+ * Interrupts are disabled because the hand over to a waiter
+ * must not be interrupted until the hand over is completed
+ * (@console_waiter is cleared).
+ */
+ printk_safe_enter_irqsave(flags);
+ console_lock_spinning_enable();
+
+ /* don't trace irqsoff print latency */
+ stop_critical_timings();
+ }
- stop_critical_timings(); /* don't trace print latency */
call_console_driver(con, write_text, len, dropped_text);
- start_critical_timings();
con->seq++;
- *handover = console_lock_spinning_disable_and_check();
- printk_safe_exit_irqrestore(flags);
+ if (handover) {
+ start_critical_timings();
+ *handover = console_lock_spinning_disable_and_check();
+ printk_safe_exit_irqrestore(flags);
+ }
skip:
return true;
}
+/*
+ * Print a record for a given console, but allow another printk() caller to
+ * take over the console_lock and continue printing.
+ *
+ * Requires the console_lock, but depending on @handover after the call, the
+ * caller may no longer have the console_lock.
+ *
+ * See __console_emit_next_record() for argument and return details.
+ */
+static bool console_emit_next_record_transferable(struct console *con, char *text, char *ext_text,
+ char *dropped_text, bool *handover)
+{
+ /*
+ * Handovers are only supported if threaded printers are atomically
+ * blocked. The context taking over the console_lock may be atomic.
+ */
+ if (!console_kthreads_atomically_blocked()) {
+ *handover = false;
+ handover = NULL;
+ }
+
+ return __console_emit_next_record(con, text, ext_text, dropped_text, handover);
+}
+
/*
* Print out all remaining records to all consoles.
*
@@ -2853,13 +2992,11 @@ static bool console_flush_all(bool do_cond_resched, u64 *next_seq, bool *handove
if (con->flags & CON_EXTENDED) {
/* Extended consoles do not print "dropped messages". */
- progress = console_emit_next_record(con, &text[0],
- &ext_text[0], NULL,
- handover);
+ progress = console_emit_next_record_transferable(con, &text[0],
+ &ext_text[0], NULL, handover);
} else {
- progress = console_emit_next_record(con, &text[0],
- NULL, &dropped_text[0],
- handover);
+ progress = console_emit_next_record_transferable(con, &text[0],
+ NULL, &dropped_text[0], handover);
}
if (*handover)
return false;
@@ -2974,6 +3111,10 @@ void console_unblank(void)
if (oops_in_progress) {
if (down_trylock_console_sem() != 0)
return;
+ if (!console_kthreads_atomic_tryblock()) {
+ up_console_sem();
+ return;
+ }
} else
console_lock();
@@ -3045,21 +3186,20 @@ struct tty_driver *console_device(int *index)
void console_stop(struct console *console)
{
__pr_flush(console, 1000, true);
- console_lock();
+ console_lock_single_hold(console);
console->flags &= ~CON_ENABLED;
- console_unlock();
+ console_unlock_single_release(console);
}
EXPORT_SYMBOL(console_stop);
+
void console_start(struct console *console)
{
- console_lock();
+ console_lock_single_hold(console);
console->flags |= CON_ENABLED;
- console_unlock();
-
+ console_unlock_single_release(console);
/* Wake the newly enabled kthread printer. */
wake_up_klogd();
-
__pr_flush(console, 1000, true);
}
EXPORT_SYMBOL(console_start);
@@ -3261,6 +3401,8 @@ void register_console(struct console *newcon)
newcon->dropped = 0;
newcon->thread = NULL;
+ newcon->flags |= CON_THD_BLOCKED;
+ mutex_init(&newcon->lock);
if (newcon->flags & CON_PRINTBUFFER) {
/* Get a consistent copy of @syslog_seq. */
@@ -3314,7 +3456,7 @@ int unregister_console(struct console *console)
return 0;
res = -ENODEV;
- console_lock();
+ console_lock_single_hold(console);
if (console_drivers == console) {
console_drivers=console->next;
res = 0;
@@ -3344,14 +3486,14 @@ int unregister_console(struct console *console)
console->flags &= ~CON_ENABLED;
/*
- * console->thread can only be cleared under the console lock. But
- * stopping the thread must be done without the console lock. The
- * task that clears @thread is the task that stops the kthread.
+ * console->thread can only be cleared while holding con->lock. But
+ * stopping the thread must be done without con->lock. The task that
+ * clears @thread is the task that stops the kthread.
*/
thd = console->thread;
console->thread = NULL;
- console_unlock();
+ console_unlock_single_release(console);
if (thd)
kthread_stop(thd);
@@ -3365,7 +3507,7 @@ int unregister_console(struct console *console)
out_disable_unlock:
console->flags &= ~CON_ENABLED;
- console_unlock();
+ console_unlock_single_release(console);
return res;
}
@@ -3561,6 +3703,19 @@ static void printk_fallback_preferred_direct(void)
console_unlock();
}
+/*
+ * Print a record for a given console, not allowing another printk() caller
+ * to take over. This is appropriate for contexts that do not have the
+ * console_lock.
+ *
+ * See __console_emit_next_record() for argument and return details.
+ */
+static bool console_emit_next_record(struct console *con, char *text, char *ext_text,
+ char *dropped_text)
+{
+ return __console_emit_next_record(con, text, ext_text, dropped_text, NULL);
+}
+
static bool printer_should_wake(struct console *con, u64 seq)
{
short flags;
@@ -3568,9 +3723,6 @@ static bool printer_should_wake(struct console *con, u64 seq)
if (kthread_should_stop() || !printk_kthreads_available)
return true;
- if (console_suspended)
- return false;
-
/*
* This is an unsafe read from con->flags, but a false positive is
* not a problem. Worst case it would allow the printer to wake up
@@ -3582,6 +3734,11 @@ static bool printer_should_wake(struct console *con, u64 seq)
if (!__console_is_usable(flags))
return false;
+ if ((flags & CON_THD_BLOCKED) ||
+ console_kthreads_atomically_blocked()) {
+ return false;
+ }
+
return prb_read_valid(prb, seq, NULL);
}
@@ -3590,7 +3747,6 @@ static int printk_kthread_func(void *data)
struct console *con = data;
char *dropped_text = NULL;
char *ext_text = NULL;
- bool handover;
u64 seq = 0;
char *text;
int error;
@@ -3640,15 +3796,18 @@ static int printk_kthread_func(void *data)
if (error)
continue;
- console_lock();
+ error = mutex_lock_interruptible(&con->lock);
+ if (error)
+ continue;
- if (console_suspended) {
- up_console_sem();
+ if (!console_is_usable(con)) {
+ mutex_unlock(&con->lock);
continue;
}
- if (!console_is_usable(con)) {
- __console_unlock();
+ if ((con->flags & CON_THD_BLOCKED) ||
+ !console_kthread_printing_tryenter()) {
+ mutex_unlock(&con->lock);
continue;
}
@@ -3661,13 +3820,13 @@ static int printk_kthread_func(void *data)
* which can conditionally invoke cond_resched().
*/
console_may_schedule = 0;
- console_emit_next_record(con, text, ext_text, dropped_text, &handover);
- if (handover)
- continue;
+ console_emit_next_record(con, text, ext_text, dropped_text);
seq = con->seq;
- __console_unlock();
+ console_kthread_printing_exit();
+
+ mutex_unlock(&con->lock);
}
con_printk(KERN_INFO, con, "printing thread stopped\n");
@@ -3676,14 +3835,14 @@ static int printk_kthread_func(void *data)
kfree(ext_text);
kfree(text);
- console_lock();
+ mutex_lock(&con->lock);
/*
* If this kthread is being stopped by another task, con->thread will
* already be NULL. That is fine. The important thing is that it is
* NULL after the kthread exits.
*/
con->thread = NULL;
- console_unlock();
+ mutex_unlock(&con->lock);
return 0;
}
--
2.30.2
On 2022-04-25, Petr Mladek <[email protected]> wrote:
>> Honestly, I would prefer this to what v4 is doing. The only reason
>> CON_THD_BLOCKED is a flag is to save space. But we are only talking
>> about a few bytes being saved. There aren't that many consoles.
>>
>> It would be a very simple change. Literally just replacing the 3 lines
>> that set/clear CON_THD_BLOCKED and replacing/reordering the 2 lines that
>> check the flag. Then all the READ_ONCE/WRITE_ONCE to @flags could be
>> removed.
>
> I agree that it sounds like the easiest solution for now. If you
> prepare v5 with this change then I push it into linux-next instead
> of v4.
I will send a v5 only for that patch. I will make it a reply to the same
v4 patch.
> Well, I think that we need to make con->lock safe to use in the long
> term. The above workaround in printk_kthread_func() is good enough
> for now because this is the only location where con->lock is taken without
> console_sem. But I am sure that we/people will want to do more
> console-specific operations without console_sem in the future.
>
> IMHO, the only sane approach is to follow the proposed rules:
>
> + console_lock() will synchronize both global and per-console
> stuff.
>
> + con->lock will synchronize per-console stuff.
>
> + con->lock could not be taken alone when the big console_lock()
> is taken.
>
>
> I currently know only about two solutions:
>
> 1. The nested locking. console_lock() will take console_sem
> and all con->lock's and will keep them locked.
>
> It is rather trivial in principle. The problem is lockdep
> and possible ABBA deadlocks caused by unstable ordering.
>
>
> 2. Create the wrappers around con->lock that will check
> whether console_sem is taken (con->locked flag).
>
> It will require additional per-console waitqueue. But all
> the magic will be hidden in the wrappers.
>
>
> I personally prefer 2nd approach for the long term solution. It might
> look more complicated but it will not break lockdep.
The 2nd approach doesn't break lockdep because it is hiding from it. We
are basically open coding our own blocking lock mechanism that avoids
looking like nested locking.
If using nested locking is the best technical solution, then we should
not let lockdep prevent us from using that solution.
You talk about ABBA deadlocks due to unstable ordering, but I still do
not see how that is possible with the @console_sem protection. Unless
you are talking about some code that is trying to lock multiple consoles
at once without taking the console_lock. That would need to be forbidden
by the API.
My main concern with nested locking (aside from lockdep complexities) is
the console suspension. That is a bizarre state where @console_sem is
released even though the console is in a type of frozen state. It is
tricky/messy, especially since the kthreads need to remain silent in
this state. I suppose the kthreads would also need to be unlocked in
suspend_console() and the kthreads would respect @console_suspended and
go back to sleep (similar to how CON_THD_BLOCKED is now).
John