Commit 48227e21 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/entry: Convert SIMD coprocessor error exception to IDTENTRY 



Convert #XF to IDTENTRY_ERRORCODE:
  - Implement the C entry point with DEFINE_IDTENTRY
  - Emit the ASM stub with DECLARE_IDTENTRY
  - Handle INVD_BUG in C
  - Remove the ASM idtentry in 64bit
  - Remove the open coded ASM entry code in 32bit
  - Fixup the XEN/PV code
  - Remove the old prototypes
  - Remove the RCU warning as the new entry macro ensures correctness

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/20200505134906.021552202@linutronix.de
parent 436608bb

arch/x86/entry/entry_32.S

+0 −14
Original line number Diff line number Diff line
@@ -1290,20 +1290,6 @@ SYM_FUNC_END(name) 
/* The include is where all of the SMP etc. interrupts come from */

#include <asm/entry_arch.h>



SYM_CODE_START(simd_coprocessor_error)

	ASM_CLAC

	pushl	$0

#ifdef CONFIG_X86_INVD_BUG

	/* AMD 486 bug: invd from userspace calls exception 19 instead of #GP */

	ALTERNATIVE "pushl	$exc_general_protection",	\

		    "pushl	$do_simd_coprocessor_error",	\

		    X86_FEATURE_XMM

#else

	pushl	$do_simd_coprocessor_error

#endif

	jmp	common_exception

SYM_CODE_END(simd_coprocessor_error)



#ifdef CONFIG_PARAVIRT

SYM_CODE_START(native_iret)

	iret

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_XF		simd_coprocessor_error	do_simd_coprocessor_error	has_error_code=0



idtentry	X86_TRAP_PF		page_fault		do_page_fault			has_error_code=1

arch/x86/include/asm/idtentry.h

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ 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);

DECLARE_IDTENTRY(X86_TRAP_MF,		exc_coprocessor_error);

DECLARE_IDTENTRY(X86_TRAP_XF,		exc_simd_coprocessor_error);



/* 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
@@ -22,7 +22,6 @@ asmlinkage void async_page_fault(void); 
#ifdef CONFIG_X86_MCE

asmlinkage void machine_check(void);

#endif /* CONFIG_X86_MCE */

asmlinkage void simd_coprocessor_error(void);



#if defined(CONFIG_X86_64) && defined(CONFIG_XEN_PV)

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

asmlinkage void xen_machine_check(void);

#endif /* CONFIG_X86_MCE */

asmlinkage void xen_simd_coprocessor_error(void);

#endif



dotraplinkage void do_debug(struct pt_regs *regs, long error_code);
@@ -41,7 +39,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_simd_coprocessor_error(struct pt_regs *regs, long error_code);

#ifdef CONFIG_X86_32

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

#endif

arch/x86/kernel/idt.c

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

	INTG(X86_TRAP_MF,		asm_exc_coprocessor_error),

	INTG(X86_TRAP_AC,		asm_exc_alignment_check),

	INTG(X86_TRAP_XF,		simd_coprocessor_error),

	INTG(X86_TRAP_XF,		asm_exc_simd_coprocessor_error),



#ifdef CONFIG_X86_32

	TSKG(X86_TRAP_DF,		GDT_ENTRY_DOUBLEFAULT_TSS),

CRA Git | Maintained and supported by SUSTech CRA and CCSE