Commit 4388c9b3 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

powerpc: Do not send system reset request through the oops path 



A system reset is a request to crash / debug the system rather than
necessarily caused by encountering a BUG. So there is no need to
serialize all CPUs behind the die lock, adding taints to all
subsequent traces beyond the first, breaking console locks, etc.

The system reset is NMI context which has its own printk buffers to
prevent output being interleaved. Then it's better to have all
secondaries print out their debug as quickly as possible and the
primary will flush out all printk buffers during panic().

So remove the 0x100 path from die, and move it into system_reset. Name
the crash/dump reasons "System Reset".

This gives "not tained" traces when crashing an untainted kernel. It
also gives the panic reason as "System Reset" as opposed to "Fatal
exception in interrupt" (or "die oops" for fadump).

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent bded0706

arch/powerpc/kernel/traps.c

+31 −16
Original line number Original line Diff line number Diff line
@@ -162,21 +162,9 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, 




	crash_fadump(regs, "die oops");

	crash_fadump(regs, "die oops");





	/*

	if (kexec_should_crash(current))

	 * A system reset (0x100) is a request to dump, so we always send

	 * it through the crashdump code.

	 */

	if (kexec_should_crash(current) || (TRAP(regs) == 0x100)) {

		crash_kexec(regs);

		crash_kexec(regs);





		/*

		 * We aren't the primary crash CPU. We need to send it

		 * to a holding pattern to avoid it ending up in the panic

		 * code.

		 */

		crash_kexec_secondary(regs);

	}



	if (!signr)

	if (!signr)

		return;

		return;
@@ -303,17 +291,44 @@ void system_reset_exception(struct pt_regs *regs) 
			goto out;

			goto out;

	}

	}





	die("System Reset", regs, SIGABRT);

	if (debugger(regs))

		goto out;



	/*

	 * A system reset is a request to dump, so we always send

	 * it through the crashdump code (if fadump or kdump are

	 * registered).

	 */

	crash_fadump(regs, "System Reset");



	crash_kexec(regs);



	/*

	 * We aren't the primary crash CPU. We need to send it

	 * to a holding pattern to avoid it ending up in the panic

	 * code.

	 */

	crash_kexec_secondary(regs);



	/*

	 * No debugger or crash dump registered, print logs then

	 * panic.

	 */

	__die("System Reset", regs, SIGABRT);



	mdelay(2*MSEC_PER_SEC); /* Wait a little while for others to print */

	add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);

	nmi_panic(regs, "System Reset");





out:

out:

#ifdef CONFIG_PPC_BOOK3S_64

#ifdef CONFIG_PPC_BOOK3S_64

	BUG_ON(get_paca()->in_nmi == 0);

	BUG_ON(get_paca()->in_nmi == 0);

	if (get_paca()->in_nmi > 1)

	if (get_paca()->in_nmi > 1)

		panic("Unrecoverable nested System Reset");

		nmi_panic(regs, "Unrecoverable nested System Reset");

#endif

#endif

	/* Must die if the interrupt is not recoverable */

	/* Must die if the interrupt is not recoverable */

	if (!(regs->msr & MSR_RI))

	if (!(regs->msr & MSR_RI))

		panic("Unrecoverable System Reset");

		nmi_panic(regs, "Unrecoverable System Reset");





	if (!nested)

	if (!nested)

		nmi_exit();

		nmi_exit();

CRA Git | Maintained and supported by SUSTech CRA and CCSE