Skip to content

Commit

Permalink
printk: Rename abandon_console_lock_in_panic() to other_cpu_in_panic()
Browse files Browse the repository at this point in the history
[ Upstream commit 132a90d ]

Currently abandon_console_lock_in_panic() is only used to determine if
the current CPU should immediately release the console lock because
another CPU is in panic. However, later this function will be used by
the CPU to immediately release other resources in this situation.

Rename the function to other_cpu_in_panic(), which is a better
description and does not assume it is related to the console lock.

Signed-off-by: John Ogness <john.ogness@linutronix.de>
Reviewed-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Signed-off-by: Petr Mladek <pmladek@suse.com>
Link: https://lore.kernel.org/r/20230717194607.145135-8-john.ogness@linutronix.de
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
jogness authored and gregkh committed Sep 23, 2023
1 parent 1fa74b1 commit bd57b05
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
2 changes: 2 additions & 0 deletions kernel/printk/internal.h
Expand Up @@ -103,3 +103,5 @@ struct printk_message {
u64 seq;
unsigned long dropped;
};

bool other_cpu_in_panic(void);
15 changes: 8 additions & 7 deletions kernel/printk/printk.c
Expand Up @@ -2590,11 +2590,12 @@ static int console_cpu_notify(unsigned int cpu)
}

/*
* Return true when this CPU should unlock console_sem without pushing all
* messages to the console. This reduces the chance that the console is
* locked when the panic CPU tries to use it.
* Return true if a panic is in progress on a remote CPU.
*
* On true, the local CPU should immediately release any printing resources
* that may be needed by the panic CPU.
*/
static bool abandon_console_lock_in_panic(void)
bool other_cpu_in_panic(void)
{
if (!panic_in_progress())
return false;
Expand All @@ -2621,7 +2622,7 @@ void console_lock(void)
might_sleep();

/* On panic, the console_lock must be left to the panic cpu. */
while (abandon_console_lock_in_panic())
while (other_cpu_in_panic())
msleep(1000);

down_console_sem();
Expand All @@ -2643,7 +2644,7 @@ EXPORT_SYMBOL(console_lock);
int console_trylock(void)
{
/* On panic, the console_lock must be left to the panic cpu. */
if (abandon_console_lock_in_panic())
if (other_cpu_in_panic())
return 0;
if (down_trylock_console_sem())
return 0;
Expand Down Expand Up @@ -2959,7 +2960,7 @@ static bool console_flush_all(bool do_cond_resched, u64 *next_seq, bool *handove
any_progress = true;

/* Allow panic_cpu to take over the consoles safely. */
if (abandon_console_lock_in_panic())
if (other_cpu_in_panic())
goto abandon;

if (do_cond_resched)
Expand Down

0 comments on commit bd57b05

Please sign in to comment.