Commit cf9b1106 authored by Petr Mladek's avatar Petr Mladek Committed by Linus Torvalds
Browse files

printk/nmi: flush NMI messages on the system panic 



In NMI context, printk() messages are stored into per-CPU buffers to
avoid a possible deadlock.  They are normally flushed to the main ring
buffer via an IRQ work.  But the work is never called when the system
calls panic() in the very same NMI handler.

This patch tries to flush NMI buffers before the crash dump is
generated.  In this case it does not risk a double release and bails out
when the logbuf_lock is already taken.  The aim is to get the messages
into the main ring buffer when possible.  It makes them better
accessible in the vmcore.

Then the patch tries to flush the buffers second time when other CPUs
are down.  It might be more aggressive and reset logbuf_lock.  The aim
is to get the messages available for the consequent kmsg_dump() and
console_flush_on_panic() calls.

The patch causes vprintk_emit() to be called even in NMI context again.
But it is done via printk_deferred() so that the console handling is
skipped.  Consoles use internal locks and we could not prevent a
deadlock easily.  They are explicitly called later when the crash dump
is not generated, see console_flush_on_panic().

Signed-off-by: default avatarPetr Mladek <pmladek@suse.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Daniel Thompson <daniel.thompson@linaro.org>
Cc: David Miller <davem@davemloft.net>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Jiri Kosina <jkosina@suse.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 427934b8

include/linux/printk.h

+2 −0
Original line number Diff line number Diff line
@@ -127,11 +127,13 @@ extern void printk_nmi_init(void); 
extern void printk_nmi_enter(void);

extern void printk_nmi_exit(void);

extern void printk_nmi_flush(void);

extern void printk_nmi_flush_on_panic(void);

#else

static inline void printk_nmi_init(void) { }

static inline void printk_nmi_enter(void) { }

static inline void printk_nmi_exit(void) { }

static inline void printk_nmi_flush(void) { }

static inline void printk_nmi_flush_on_panic(void) { }

#endif /* PRINTK_NMI */



#ifdef CONFIG_PRINTK

kernel/kexec_core.c

+1 −0
Original line number Diff line number Diff line
@@ -893,6 +893,7 @@ void crash_kexec(struct pt_regs *regs) 
	old_cpu = atomic_cmpxchg(&panic_cpu, PANIC_CPU_INVALID, this_cpu);

	if (old_cpu == PANIC_CPU_INVALID) {

		/* This is the 1st CPU which comes here, so go ahead. */

		printk_nmi_flush_on_panic();

		__crash_kexec(regs);



		/*

kernel/panic.c

+5 −1
Original line number Diff line number Diff line
@@ -160,8 +160,10 @@ void panic(const char *fmt, ...) 
	 *

	 * Bypass the panic_cpu check and call __crash_kexec directly.

	 */

	if (!crash_kexec_post_notifiers)

	if (!crash_kexec_post_notifiers) {

		printk_nmi_flush_on_panic();

		__crash_kexec(NULL);

	}



	/*

	 * Note smp_send_stop is the usual smp shutdown function, which
@@ -176,6 +178,8 @@ void panic(const char *fmt, ...) 
	 */

	atomic_notifier_call_chain(&panic_notifier_list, 0, buf);



	/* Call flush even twice. It tries harder with a single online CPU */

	printk_nmi_flush_on_panic();

	kmsg_dump(KMSG_DUMP_PANIC);



	/*

kernel/printk/internal.h

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ int __printf(1, 0) vprintk_default(const char *fmt, va_list args); 


#ifdef CONFIG_PRINTK_NMI



extern raw_spinlock_t logbuf_lock;



/*

 * printk() could not take logbuf_lock in NMI context. Instead,

 * it temporary stores the strings into a per-CPU buffer.

kernel/printk/nmi.c

+38 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


#include <linux/preempt.h>

#include <linux/spinlock.h>

#include <linux/debug_locks.h>

#include <linux/smp.h>

#include <linux/cpumask.h>

#include <linux/irq_work.h>
@@ -106,7 +107,16 @@ static void print_nmi_seq_line(struct nmi_seq_buf *s, int start, int end) 
{

	const char *buf = s->buffer + start;



	/*

	 * The buffers are flushed in NMI only on panic.  The messages must

	 * go only into the ring buffer at this stage.  Consoles will get

	 * explicitly called later when a crashdump is not generated.

	 */

	if (in_nmi())

		printk_deferred("%.*s", (end - start) + 1, buf);

	else

		printk("%.*s", (end - start) + 1, buf);



}



/*
@@ -194,6 +204,33 @@ void printk_nmi_flush(void) 
		__printk_nmi_flush(&per_cpu(nmi_print_seq, cpu).work);

}



/**

 * printk_nmi_flush_on_panic - flush all per-cpu nmi buffers when the system

 *	goes down.

 *

 * Similar to printk_nmi_flush() but it can be called even in NMI context when

 * the system goes down. It does the best effort to get NMI messages into

 * the main ring buffer.

 *

 * Note that it could try harder when there is only one CPU online.

 */

void printk_nmi_flush_on_panic(void)

{

	/*

	 * Make sure that we could access the main ring buffer.

	 * Do not risk a double release when more CPUs are up.

	 */

	if (in_nmi() && raw_spin_is_locked(&logbuf_lock)) {

		if (num_online_cpus() > 1)

			return;



		debug_locks_off();

		raw_spin_lock_init(&logbuf_lock);

	}



	printk_nmi_flush();

}



void __init printk_nmi_init(void)

{

	int cpu;

CRA Git | Maintained and supported by SUSTech CRA and CCSE