Commit dad7106f authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/entry: Convert Spurious interrupt bug exception to IDTENTRY 



Convert #SPURIOUS to IDTENTRY_ERRORCODE:
  - Implement the C entry point with DEFINE_IDTENTRY
  - Emit the ASM stub with DECLARE_IDTENTRY
  - Remove the ASM idtentry in 64bit
  - Remove the open coded ASM entry code in 32bit
  - Fixup the XEN/PV code
  - Remove the old prototypes

No functional change.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarAlexandre Chartre <alexandre.chartre@oracle.com>
Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
Acked-by: default avatarAndy Lutomirski <luto@kernel.org>
Link: https://lkml.kernel.org/r/20200505134905.728077036@linutronix.de
parent be4c11af

arch/x86/entry/entry_32.S

+0 −7
Original line number Diff line number Diff line
@@ -1333,13 +1333,6 @@ SYM_CODE_START(machine_check) 
SYM_CODE_END(machine_check)

#endif



SYM_CODE_START(spurious_interrupt_bug)

	ASM_CLAC

	pushl	$0

	pushl	$do_spurious_interrupt_bug

	jmp	common_exception

SYM_CODE_END(spurious_interrupt_bug)



#ifdef CONFIG_XEN_PV

SYM_FUNC_START(xen_hypervisor_callback)

	/*

arch/x86/entry/entry_64.S

+0 −1
Original line number Diff line number Diff line
@@ -1073,7 +1073,6 @@ apicinterrupt IRQ_WORK_VECTOR irq_work_interrupt smp_irq_work_interrupt 
 */



idtentry	X86_TRAP_BP		int3			do_int3				has_error_code=0

idtentry	X86_TRAP_SPURIOUS	spurious_interrupt_bug	do_spurious_interrupt_bug	has_error_code=0

idtentry	X86_TRAP_MF		coprocessor_error	do_coprocessor_error		has_error_code=0

idtentry	X86_TRAP_AC		alignment_check		do_alignment_check		has_error_code=1

idtentry	X86_TRAP_XF		simd_coprocessor_error	do_simd_coprocessor_error	has_error_code=0

arch/x86/include/asm/idtentry.h

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ DECLARE_IDTENTRY(X86_TRAP_BR, exc_bounds); 
DECLARE_IDTENTRY(X86_TRAP_UD,		exc_invalid_op);

DECLARE_IDTENTRY(X86_TRAP_NM,		exc_device_not_available);

DECLARE_IDTENTRY(X86_TRAP_OLD_MF,	exc_coproc_segment_overrun);

DECLARE_IDTENTRY(X86_TRAP_SPURIOUS,	exc_spurious_interrupt_bug);



/* Simple exception entries with error code pushed by hardware */

DECLARE_IDTENTRY_ERRORCODE(X86_TRAP_TS,	exc_invalid_tss);

arch/x86/include/asm/traps.h

+0 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ asmlinkage void double_fault(void); 
#endif

asmlinkage void page_fault(void);

asmlinkage void async_page_fault(void);

asmlinkage void spurious_interrupt_bug(void);

asmlinkage void coprocessor_error(void);

asmlinkage void alignment_check(void);

#ifdef CONFIG_X86_MCE
@@ -33,7 +32,6 @@ asmlinkage void xen_xendebug(void); 
asmlinkage void xen_int3(void);

asmlinkage void xen_double_fault(void);

asmlinkage void xen_page_fault(void);

asmlinkage void xen_spurious_interrupt_bug(void);

asmlinkage void xen_coprocessor_error(void);

asmlinkage void xen_alignment_check(void);

#ifdef CONFIG_X86_MCE
@@ -47,7 +45,6 @@ dotraplinkage void do_nmi(struct pt_regs *regs, long error_code); 
dotraplinkage void do_int3(struct pt_regs *regs, long error_code);

dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code, unsigned long cr2);

dotraplinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);

dotraplinkage void do_spurious_interrupt_bug(struct pt_regs *regs, long error_code);

dotraplinkage void do_coprocessor_error(struct pt_regs *regs, long error_code);

dotraplinkage void do_alignment_check(struct pt_regs *regs, long error_code);

dotraplinkage void do_simd_coprocessor_error(struct pt_regs *regs, long error_code);

arch/x86/kernel/idt.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static const __initconst struct idt_data def_idts[] = { 
	INTG(X86_TRAP_NP,		asm_exc_segment_not_present),

	INTG(X86_TRAP_SS,		asm_exc_stack_segment),

	INTG(X86_TRAP_GP,		asm_exc_general_protection),

	INTG(X86_TRAP_SPURIOUS,		spurious_interrupt_bug),

	INTG(X86_TRAP_SPURIOUS,		asm_exc_spurious_interrupt_bug),

	INTG(X86_TRAP_MF,		coprocessor_error),

	INTG(X86_TRAP_AC,		alignment_check),

	INTG(X86_TRAP_XF,		simd_coprocessor_error),

CRA Git | Maintained and supported by SUSTech CRA and CCSE