sparc64: Normalize NMI watchdog logging and behavior. (16ce8a30) · Commits · 戴 / test

Bring this code in line with the perf based generic NMI watchdog in kernel/watchdog.c (which we should convert over to at some point). In particular, don't do anything super fancy when the watchdog triggers, and specifically don't do a do_exit() which only makes things worse. Either panic(), or WARN(). The latter of which will do all of the actions such as give us a stack backtrace. Signed-off-by:

David S. Miller <davem@davemloft.net>

arch/sparc/kernel/nmi.c

+5 −16

Original line number	Diff line number	Diff line
		@@ -68,27 +68,16 @@ EXPORT_SYMBOL(touch_nmi_watchdog);

		static void die_nmi(const char str, struct pt_regs regs, int do_panic)
		{
		int this_cpu = smp_processor_id();

		if (notify_die(DIE_NMIWATCHDOG, str, regs, 0,
		pt_regs_trap_type(regs), SIGINT) == NOTIFY_STOP)
		return;

		console_verbose();
		bust_spinlocks(1);

		printk(KERN_EMERG "%s", str);
		printk(" on CPU%d, ip %08lx, registers:\n",
		smp_processor_id(), regs->tpc);
		show_regs(regs);
		dump_stack();

		bust_spinlocks(0);

		if (do_panic \|\| panic_on_oops)
		panic("Non maskable interrupt");

		nmi_exit();
		local_irq_enable();
		do_exit(SIGBUS);
		panic("Watchdog detected hard LOCKUP on cpu %d", this_cpu);
		else
		WARN(1, "Watchdog detected hard LOCKUP on cpu %d", this_cpu);
		}

		notrace __kprobes void perfctr_irq(int irq, struct pt_regs *regs)

Admin message