lkml.org 
[lkml]   [2019]   [Feb]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [RFC PATCH v1 11/25] printk_safe: remove printk safe code
On Tue 2019-02-12 15:29:49, John Ogness wrote:
> vprintk variants are now NMI-safe so there is no longer a need for
> the "safe" calls.
>
> NOTE: This also removes printk flushing functionality.
>
> Signed-off-by: John Ogness <john.ogness@linutronix.de>
> ---
> include/linux/hardirq.h | 2 -
> include/linux/printk.h | 27 ---
> init/main.c | 1 -
> kernel/kexec_core.c | 1 -
> kernel/panic.c | 3 -
> kernel/printk/Makefile | 1 -
> kernel/printk/internal.h | 30 +---
> kernel/printk/printk.c | 13 +-
> kernel/printk/printk_safe.c | 427 --------------------------------------------
> kernel/trace/trace.c | 2 -
> lib/nmi_backtrace.c | 6 -
> 11 files changed, 7 insertions(+), 506 deletions(-)
> delete mode 100644 kernel/printk/printk_safe.c

From my POV, this is the primary selling argument for the new
ring buffer.


> diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
> index b6a6f1002741..073ff9fd6872 100644
> --- a/kernel/printk/printk.c
> +++ b/kernel/printk/printk.c
> @@ -1752,6 +1745,11 @@ asmlinkage int vprintk_emit(int facility, int level,
> }
> EXPORT_SYMBOL(vprintk_emit);
>
> +__printf(1, 0) int vprintk_func(const char *fmt, va_list args)
> +{
> + return vprintk_emit(0, LOGLEVEL_DEFAULT, NULL, 0, fmt, args);
> +}

All vprintk_func() calls should get replaced with vprintk_default().
It includes a crazy hack to reuse some kernel code (that calls
printk() in kdb code.


> asmlinkage int vprintk(const char *fmt, va_list args)
> {
> return vprintk_func(fmt, args);
> diff --git a/lib/nmi_backtrace.c b/lib/nmi_backtrace.c
> index 15ca78e1c7d4..77bf84987cda 100644
> --- a/lib/nmi_backtrace.c
> +++ b/lib/nmi_backtrace.c
> @@ -75,12 +75,6 @@ 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_safe_flush();
> -
> clear_bit_unlock(0, &backtrace_flag);
> put_cpu();
> }

This reminds me that we need to add back the locking that was
removed in the commit 03fc7f9c99c1e7ae2925d45 ("printk/nmi:
Prevent deadlock when accessing the main log buffer in NMI").

Otherwise, backtraces from different CPUs would get mixed.

We need to add this before redirecting printk() to
the new ring buffer.

Best Regards,
Petr

\
 
 \ /
  Last update: 2019-02-22 11:38    [W:0.281 / U:3.116 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site