Commit 8f645b42 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ras_core_for_v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull RAS update from Borislav Petkov:
 "A single RAS change for 5.15:

   - Do not start processing MCEs logged early because the decoding
     chain is not up yet - delay that processing until everything is
     ready"

* tag 'ras_core_for_v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mce: Defer processing of early errors
parents 05b5fdb2 3bff147b

arch/x86/include/asm/mce.h

+1 −0
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ enum mcp_flags { 
	MCP_TIMESTAMP	= BIT(0),	/* log time stamp */

	MCP_UC		= BIT(1),	/* log uncorrected errors */

	MCP_DONTLOG	= BIT(2),	/* only clear, don't log */

	MCP_QUEUE_LOG	= BIT(3),	/* only queue to genpool */

};

bool machine_check_poll(enum mcp_flags flags, mce_banks_t *b);

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

+8 −3
Original line number Diff line number Diff line
@@ -817,6 +817,9 @@ bool machine_check_poll(enum mcp_flags flags, mce_banks_t *b) 
		if (mca_cfg.dont_log_ce && !mce_usable_address(&m))

			goto clear_it;



		if (flags & MCP_QUEUE_LOG)

			mce_gen_pool_add(&m);

		else

			mce_log(&m);



clear_it:
@@ -1639,10 +1642,12 @@ static void __mcheck_cpu_init_generic(void) 
		m_fl = MCP_DONTLOG;



	/*

	 * Log the machine checks left over from the previous reset.

	 * Log the machine checks left over from the previous reset. Log them

	 * only, do not start processing them. That will happen in mcheck_late_init()

	 * when all consumers have been registered on the notifier chain.

	 */

	bitmap_fill(all_banks, MAX_NR_BANKS);

	machine_check_poll(MCP_UC | m_fl, &all_banks);

	machine_check_poll(MCP_UC | MCP_QUEUE_LOG | m_fl, &all_banks);



	cr4_set_bits(X86_CR4_MCE);