summaryrefslogtreecommitdiffstats
path: root/kernel/printk
diff options
context:
space:
mode:
authorJohn Ogness <john.ogness@linutronix.de>2024-02-26 13:07:24 +0106
committerPetr Mladek <pmladek@suse.com>2024-03-15 17:03:32 +0100
commit8076972468584d4a21dab9aa50e388b3ea9ad8c7 (patch)
tree1ff0b6d32afa86c09b4821056b9f43bfd5911ccc /kernel/printk
parentb0546776ad3f332e215cebc0b063ba4351971cca (diff)
downloadlinux-stable-8076972468584d4a21dab9aa50e388b3ea9ad8c7.tar.gz
linux-stable-8076972468584d4a21dab9aa50e388b3ea9ad8c7.tar.bz2
linux-stable-8076972468584d4a21dab9aa50e388b3ea9ad8c7.zip
printk: Update @console_may_schedule in console_trylock_spinning()
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>
Diffstat (limited to 'kernel/printk')
-rw-r--r--kernel/printk/printk.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index b06f63e276c1..612c73333848 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -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;
}