From: John Ogness <john.ogness@linutronix.de>
To: Nicholas Piggin <npiggin@gmail.com>, Petr Mladek <pmladek@suse.com>
Cc: Nicholas Piggin <npiggin@gmail.com>, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] printk: restore flushing of NMI buffers on remote CPUs after NMI backtraces
Date: Mon, 08 Nov 2021 11:46:13 +0106 [thread overview]
Message-ID: <87cznbx75e.fsf@jogness.linutronix.de> (raw)
In-Reply-To: <20211107045116.1754411-1-npiggin@gmail.com>
On 2021-11-07, Nicholas Piggin <npiggin@gmail.com> wrote:
> printk from NMI context relies on irq work being raised on the local CPU
> to print to console. This can be a problem if the NMI was raised by a
> lockup detector to print lockup stack and regs, because the CPU may not
> enable irqs (because it is locked up).
>
> Introduce printk_trigger_flush() that can be called another CPU to try
> to get those messages to the console, call that where printk_safe_flush
> was previously called.
>
> Fixes: 93d102f094be ("printk: remove safe buffers")
> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Reviewed-by: John Ogness <john.ogness@linutronix.de>
> ---
> arch/powerpc/kernel/watchdog.c | 6 ++++++
> include/linux/printk.h | 4 ++++
> kernel/printk/printk.c | 5 +++++
> lib/nmi_backtrace.c | 6 ++++++
> 4 files changed, 21 insertions(+)
>
> diff --git a/arch/powerpc/kernel/watchdog.c b/arch/powerpc/kernel/watchdog.c
> index 5f69ba4de1f3..c8017bc23b00 100644
> --- a/arch/powerpc/kernel/watchdog.c
> +++ b/arch/powerpc/kernel/watchdog.c
> @@ -227,6 +227,12 @@ static void watchdog_smp_panic(int cpu)
> cpumask_clear(&wd_smp_cpus_ipi);
> }
>
> + /*
> + * Force flush any remote buffers that might be stuck in IRQ context
> + * and therefore could not run their irq_work.
> + */
> + printk_trigger_flush();
> +
> if (hardlockup_panic)
> nmi_panic(NULL, "Hard LOCKUP");
>
> diff --git a/include/linux/printk.h b/include/linux/printk.h
> index 85b656f82d75..9497f6b98339 100644
> --- a/include/linux/printk.h
> +++ b/include/linux/printk.h
> @@ -198,6 +198,7 @@ void dump_stack_print_info(const char *log_lvl);
> void show_regs_print_info(const char *log_lvl);
> extern asmlinkage void dump_stack_lvl(const char *log_lvl) __cold;
> extern asmlinkage void dump_stack(void) __cold;
> +void printk_trigger_flush(void);
> #else
> static inline __printf(1, 0)
> int vprintk(const char *s, va_list args)
> @@ -274,6 +275,9 @@ static inline void dump_stack_lvl(const char *log_lvl)
> static inline void dump_stack(void)
> {
> }
> +static inline void printk_trigger_flush(void)
> +{
> +}
> #endif
>
> #ifdef CONFIG_SMP
> diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
> index a8d0a58deebc..99221b016c68 100644
> --- a/kernel/printk/printk.c
> +++ b/kernel/printk/printk.c
> @@ -3252,6 +3252,11 @@ void defer_console_output(void)
> preempt_enable();
> }
>
> +void printk_trigger_flush(void)
> +{
> + defer_console_output();
> +}
> +
> int vprintk_deferred(const char *fmt, va_list args)
> {
> int r;
> diff --git a/lib/nmi_backtrace.c b/lib/nmi_backtrace.c
> index f9e89001b52e..199ab201d501 100644
> --- a/lib/nmi_backtrace.c
> +++ b/lib/nmi_backtrace.c
> @@ -75,6 +75,12 @@ void nmi_trigger_cpumask_backtrace(const cpumask_t *mask,
> touch_softlockup_watchdog();
> }
>
> + /*
> + * Force flush any remote buffers that might be stuck in IRQ context
> + * and therefore could not run their irq_work.
> + */
> + printk_trigger_flush();
> +
> clear_bit_unlock(0, &backtrace_flag);
> put_cpu();
> }
> --
> 2.23.0
next prev parent reply other threads:[~2021-11-08 10:40 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-07 4:51 [PATCH] printk: restore flushing of NMI buffers on remote CPUs after NMI backtraces Nicholas Piggin
2021-11-08 8:34 ` Petr Mladek
2021-11-08 13:43 ` Nicholas Piggin
2021-11-08 10:40 ` John Ogness [this message]
2021-11-10 15:25 ` Petr Mladek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87cznbx75e.fsf@jogness.linutronix.de \
--to=john.ogness@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=npiggin@gmail.com \
--cc=pmladek@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).