github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-12 16:18:45 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

printk/nbcon/panic: Allow printk kthread to sleep when the system is in panic

Browse Source 
The printk kthread might be running when there is a panic in progress.
But it is not able to acquire the console ownership any longer.

Prevent the desperate attempts to acquire the ownership and allow sleeping
in panic. It would make it behave the same as when there is any CPU
in an emergency context.

Reviewed-by: Andrew Murray <amurray@thegoodpenguin.co.uk>
Reviewed-by: John Ogness <john.ogness@linutronix.de>
Link: https://patch.msgid.link/20250926124912.243464-3-pmladek@suse.com
[pmladek@suse.com: Rebased on top of 6.18-rc1 (panic_in_progress() moved to panic.c)]
Signed-off-by: Petr Mladek <pmladek@suse.com>
This commit is contained in:
Petr Mladek 2025-09-26 14:49:11 +02:00
parent c41c0ebfa1
commit 4c3ba0d592
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/printk/nbcon.c
View File

@ -1173,7 +1173,8 @@ static bool nbcon_kthread_should_wakeup(struct console *con, struct nbcon_contex
* where the context with a higher priority takes over the nbcon console
* ownership in the middle of a message.
*/
if (unlikely(atomic_read(&nbcon_cpu_emergency_cnt)))
if (unlikely(atomic_read(&nbcon_cpu_emergency_cnt)) ||
unlikely(panic_in_progress()))
return false;
cookie = console_srcu_read_lock();
@ -1231,7 +1232,8 @@ static int nbcon_kthread_func(void *__console)
* Block the kthread when the system is in an emergency or panic
* mode. See nbcon_kthread_should_wakeup() for more details.
*/
if (unlikely(atomic_read(&nbcon_cpu_emergency_cnt)))
if (unlikely(atomic_read(&nbcon_cpu_emergency_cnt)) ||
unlikely(panic_in_progress()))
goto wait_for_event;
backlog = false;