aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Ogness <[email protected]>2024-02-26 13:07:24 +0106
committerPetr Mladek <[email protected]>2024-03-15 17:03:32 +0100
commit8076972468584d4a21dab9aa50e388b3ea9ad8c7 (patch)
tree1ff0b6d32afa86c09b4821056b9f43bfd5911ccc
parentb0546776ad3f332e215cebc0b063ba4351971cca (diff)
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 <[email protected]> Closes: https://lore.kernel.org/lkml/[email protected] Fixes: dbdda842fe96 ("printk: Add console owner and waiter logic to load balance console writes") Signed-off-by: John Ogness <[email protected]> Reviewed-by: Mukesh Ojha <[email protected]> Reviewed-by: Petr Mladek <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Petr Mladek <[email protected]>
-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;
}