[PATCH] printk: Update @console_may_schedule in console_trylock_spinning()

From: John Ogness
Date: Mon Feb 26 2024 - 07:02:01 EST


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@xxxxxxxxxxx>
Link: https://lore.kernel.org/lkml/20240222090538.23017-1-quic_mojha@xxxxxxxxxxx
Fixes: dbdda842fe96 ("printk: Add console owner and waiter logic to load balance console writes")
Signed-off-by: John Ogness <john.ogness@xxxxxxxxxxxxx>
---
kernel/printk/printk.c | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 1685a71f3f71..1612b50b2374 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2020,6 +2020,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;
}


base-commit: e7081d5a9d976b84f61f497316d7c940a4a2e67a
--
2.30.2