Commit c120ec12 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86-urgent-2020-10-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Ingo Molnar:
 "Two fixes:

   - Fix a (hopefully final) IRQ state tracking bug vs MCE handling

   - Fix a documentation link"

* tag 'x86-urgent-2020-10-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  Documentation/x86: Fix incorrect references to zero-page.txt
  x86/mce: Use idtentry_nmi_enter/exit()
parents aa5c3a29 0c768983

Documentation/x86/boot.rst

+3 −3
Original line number Diff line number Diff line
@@ -1342,8 +1342,8 @@ follow:: 


In addition to read/modify/write the setup header of the struct

boot_params as that of 16-bit boot protocol, the boot loader should

also fill the additional fields of the struct boot_params as that

described in zero-page.txt.

also fill the additional fields of the struct boot_params as

described in chapter :doc:`zero-page`.



After setting up the struct boot_params, the boot loader can load the

32/64-bit kernel in the same way as that of 16-bit boot protocol.
@@ -1379,7 +1379,7 @@ can be calculated as follows:: 
In addition to read/modify/write the setup header of the struct

boot_params as that of 16-bit boot protocol, the boot loader should

also fill the additional fields of the struct boot_params as described

in zero-page.txt.

in chapter :doc:`zero-page`.



After setting up the struct boot_params, the boot loader can load

64-bit kernel in the same way as that of 16-bit boot protocol, but

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

+4 −2
Original line number Diff line number Diff line
@@ -1904,6 +1904,8 @@ void (*machine_check_vector)(struct pt_regs *) = unexpected_machine_check; 


static __always_inline void exc_machine_check_kernel(struct pt_regs *regs)

{

	bool irq_state;



	WARN_ON_ONCE(user_mode(regs));



	/*
@@ -1914,7 +1916,7 @@ static __always_inline void exc_machine_check_kernel(struct pt_regs *regs) 
	    mce_check_crashing_cpu())

		return;



	nmi_enter();

	irq_state = idtentry_enter_nmi(regs);

	/*

	 * The call targets are marked noinstr, but objtool can't figure

	 * that out because it's an indirect call. Annotate it.
@@ -1925,7 +1927,7 @@ static __always_inline void exc_machine_check_kernel(struct pt_regs *regs) 
	if (regs->flags & X86_EFLAGS_IF)

		trace_hardirqs_on_prepare();

	instrumentation_end();

	nmi_exit();

	idtentry_exit_nmi(regs, irq_state);

}



static __always_inline void exc_machine_check_user(struct pt_regs *regs)

CRA Git | Maintained and supported by SUSTech CRA and CCSE