qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Flush console log from kernel_power_off() 

JIRA: https://issues.redhat.com/browse/RHEL-89346

Upstream Status: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

commit 6ea9a1781c70a8be1fcdc49134fc1bf4baba8bca
Author: Paul E. McKenney <paulmck@kernel.org>
Date:   Tue Feb 25 10:33:28 2025 -0800

    Flush console log from kernel_power_off()

    Kernels built with CONFIG_PREEMPT_RT=y can lose significant console output
    and shutdown time, which hides shutdown-time RCU issues from rcutorture.
    Therefore, make pr_flush() public and invoke it after then last print
    in kernel_power_off().

    [ paulmck: Apply John Ogness feedback. ]
    [ paulmck: Appy Sebastian Andrzej Siewior feedback. ]
    [ paulmck: Apply kernel test robot feedback. ]

    Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
    Reviewed-by: John Ogness <john.ogness@linutronix.de>
    Reviewed-by: Petr Mladek <pmladek@suse.com>
    Cc: Steven Rostedt <rostedt@goodmis.org>
    Cc: Sergey Senozhatsky <senozhatsky@chromium.org>
    Link: https://lore.kernel.org/r/5f743488-dc2a-4f19-bdda-cf50b9314832@paulmck-laptop
    Signed-off-by: Boqun Feng <boqun.feng@gmail.com>

Signed-off-by: Derek Barbosa <debarbos@redhat.com>
This commit is contained in:
Derek Barbosa 2025-05-01 21:15:36 -04:00
parent dec505faf5
commit 765a4ba24e
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/printk.h
View File

@ -201,6 +201,7 @@ void printk_legacy_allow_panic_sync(void);
extern void nbcon_acquire(struct uart_port *up);
extern void nbcon_release(struct uart_port *up);
void nbcon_atomic_flush_unsafe(void);
bool pr_flush(int timeout_ms, bool reset_on_progress);
#else
static inline __printf(1, 0)
int vprintk(const char *s, va_list args)
@ -297,6 +298,11 @@ static inline void nbcon_atomic_flush_unsafe(void)
{
}
static inline bool pr_flush(int timeout_ms, bool reset_on_progress)
{
return true;
}
#endif
#ifdef CONFIG_SMP

4
kernel/printk/printk.c
View File

@ -2480,7 +2480,6 @@ asmlinkage __visible int _printk(const char *fmt, ...)
}
EXPORT_SYMBOL(_printk);
static bool pr_flush(int timeout_ms, bool reset_on_progress);
static bool __pr_flush(struct console *con, int timeout_ms, bool reset_on_progress);
static struct task_struct *nbcon_legacy_kthread;
@ -2501,7 +2500,6 @@ static inline void wake_up_legacy_kthread(void)
static u64 syslog_seq;
static bool pr_flush(int timeout_ms, bool reset_on_progress) { return true; }
static bool __pr_flush(struct console *con, int timeout_ms, bool reset_on_progress) { return true; }
static inline void nbcon_legacy_kthread_create(void) { }
@ -4198,7 +4196,7 @@ static bool __pr_flush(struct console *con, int timeout_ms, bool reset_on_progre
* Context: Process context. May sleep while acquiring console lock.
* Return: true if all usable printers are caught up.
*/
static bool pr_flush(int timeout_ms, bool reset_on_progress)
bool pr_flush(int timeout_ms, bool reset_on_progress)
{
return __pr_flush(NULL, timeout_ms, reset_on_progress);
}

1
kernel/reboot.c
View File

@ -557,6 +557,7 @@ void kernel_power_off(void)
migrate_to_reboot_cpu();
syscore_shutdown();
pr_emerg("Power down\n");
pr_flush(1000, true);
kmsg_dump(KMSG_DUMP_SHUTDOWN);
machine_power_off();
}