printk: Update @console_may_schedule in console_trylock_spinning()
authorJohn Ogness <john.ogness@linutronix.de>
Mon, 26 Feb 2024 12:01:24 +0000 (13:07 +0106)
committerPetr Mladek <pmladek@suse.com>
Fri, 15 Mar 2024 16:03:32 +0000 (17:03 +0100)
console_trylock_spinning() may takeover the console lock from a
schedulable context. Update @console_may_schedule to make sure it
reflects a trylock acquire.

Reported-by: Mukesh Ojha <quic_mojha@quicinc.com>
Closes: https://lore.kernel.org/lkml/20240222090538.23017-1-quic_mojha@quicinc.com
Fixes: dbdda842fe96 ("printk: Add console owner and waiter logic to load balance console writes")
Signed-off-by: John Ogness <john.ogness@linutronix.de>
Reviewed-by: Mukesh Ojha <quic_mojha@quicinc.com>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Link: https://lore.kernel.org/r/875xybmo2z.fsf@jogness.linutronix.de
Signed-off-by: Petr Mladek <pmladek@suse.com>
kernel/printk/printk.c

index b06f63e276c1f6680975ba26790f8044704d9543..612c73333848e1cfa1cfdb706754d58ed9ff2004 100644 (file)
@@ -2009,6 +2009,12 @@ static int console_trylock_spinning(void)
         */
        mutex_acquire(&console_lock_dep_map, 0, 1, _THIS_IP_);
 
+       /*
+        * Update @console_may_schedule for trylock because the previous
+        * owner may have been schedulable.
+        */
+       console_may_schedule = 0;
+
        return 1;
 }