Commit e273e6e1 authored by Gabriele Paoloni's avatar Gabriele Paoloni Committed by Borislav Petkov
Browse files

x86/mce: Move the mce_panic() call and 'kill_it' assignments to the right places 



Right now, for local MCEs the machine calls panic(), if needed, right
after lmce is set. For MCE broadcasting, mce_reign() takes care of
calling mce_panic().

Hence:
- improve readability by moving the conditional evaluation of
tolerant up to when kill_it is set first;
- move the mce_panic() call up into the statement where mce_end()
fails.

 [ bp: Massage, remove comment in the mce_end() failure case because it
   is superfluous; use local ptr 'cfg' in both tests. ]

Signed-off-by: default avatarGabriele Paoloni <gabriele.paoloni@intel.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarTony Luck <tony.luck@intel.com>
Link: https://lkml.kernel.org/r/20201127161819.3106432-3-gabriele.paoloni@intel.com
parent 15936ca1

arch/x86/kernel/cpu/mce/core.c

+4 −11
Original line number Diff line number Diff line
@@ -1351,8 +1351,7 @@ noinstr void do_machine_check(struct pt_regs *regs) 
	 * severity is MCE_AR_SEVERITY we have other options.

	 */

	if (!(m.mcgstatus & MCG_STATUS_RIPV))

		kill_it = 1;



		kill_it = (cfg->tolerant == 3) ? 0 : 1;

	/*

	 * Check if this MCE is signaled to only this logical processor,

	 * on Intel, Zhaoxin only.
@@ -1388,6 +1387,9 @@ noinstr void do_machine_check(struct pt_regs *regs) 
		if (mce_end(order) < 0) {

			if (!no_way_out)

				no_way_out = worst >= MCE_PANIC_SEVERITY;



			if (no_way_out && cfg->tolerant < 3)

				mce_panic("Fatal machine check on current CPU", &m, msg);

		}

	} else {

		/*
@@ -1404,15 +1406,6 @@ noinstr void do_machine_check(struct pt_regs *regs) 
		}

	}



	/*

	 * If tolerant is at an insane level we drop requests to kill

	 * processes and continue even when there is no way out.

	 */

	if (cfg->tolerant == 3)

		kill_it = 0;

	else if (no_way_out)

		mce_panic("Fatal machine check on current CPU", &m, msg);



	if (worst > 0)

		irq_work_queue(&mce_irq_work);