Commit 49893c5c authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/entry: Convert Invalid Opcode exception to IDTENTRY 



Convert #UD to IDTENTRY:
  - 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
  - Fixup the FOOF bug call in fault.c
  - 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 avatarAndy Lutomirski <luto@kernel.org>
Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20200505134904.955511913@linutronix.de
parent 58d9c81f

arch/x86/entry/entry_32.S

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

#endif



SYM_CODE_START(invalid_op)

	ASM_CLAC

	pushl	$0

	pushl	$do_invalid_op

	jmp	common_exception

SYM_CODE_END(invalid_op)



SYM_CODE_START(coprocessor_segment_overrun)

	ASM_CLAC

	pushl	$0

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_UD		invalid_op		do_invalid_op			has_error_code=0

idtentry	X86_TRAP_NM		device_not_available	do_device_not_available		has_error_code=0

idtentry	X86_TRAP_OLD_MF		coprocessor_segment_overrun	do_coprocessor_segment_overrun	has_error_code=0

idtentry	X86_TRAP_TS		invalid_TSS		do_invalid_TSS			has_error_code=1

arch/x86/include/asm/idtentry.h

+1 −0
Original line number Diff line number Diff line
@@ -80,5 +80,6 @@ static __always_inline void __##func(struct pt_regs *regs) 
DECLARE_IDTENTRY(X86_TRAP_DE,		exc_divide_error);

DECLARE_IDTENTRY(X86_TRAP_OF,		exc_overflow);

DECLARE_IDTENTRY(X86_TRAP_BR,		exc_bounds);

DECLARE_IDTENTRY(X86_TRAP_UD,		exc_invalid_op);



#endif

arch/x86/include/asm/traps.h

+5 −3
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
asmlinkage void debug(void);

asmlinkage void nmi(void);

asmlinkage void int3(void);

asmlinkage void invalid_op(void);

asmlinkage void device_not_available(void);

#ifdef CONFIG_X86_64

asmlinkage void double_fault(void);
@@ -38,7 +37,6 @@ asmlinkage void simd_coprocessor_error(void); 
asmlinkage void xen_xennmi(void);

asmlinkage void xen_xendebug(void);

asmlinkage void xen_int3(void);

asmlinkage void xen_invalid_op(void);

asmlinkage void xen_device_not_available(void);

asmlinkage void xen_double_fault(void);

asmlinkage void xen_coprocessor_segment_overrun(void);
@@ -59,7 +57,6 @@ asmlinkage void xen_simd_coprocessor_error(void); 
dotraplinkage void do_debug(struct pt_regs *regs, long error_code);

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_invalid_op(struct pt_regs *regs, long error_code);

dotraplinkage void do_device_not_available(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_coprocessor_segment_overrun(struct pt_regs *regs, long error_code);
@@ -84,6 +81,11 @@ struct bad_iret_stack *fixup_bad_iret(struct bad_iret_stack *s); 
void __init trap_init(void);

#endif



#ifdef CONFIG_X86_F00F_BUG

/* For handling the FOOF bug */

void handle_invalid_op(struct pt_regs *regs);

#endif



static inline int get_si_code(unsigned long condition)

{

	if (condition & DR_STEP)

arch/x86/kernel/idt.c

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

	INTG(X86_TRAP_NMI,		nmi),

	INTG(X86_TRAP_BR,		asm_exc_bounds),

	INTG(X86_TRAP_UD,		invalid_op),

	INTG(X86_TRAP_UD,		asm_exc_invalid_op),

	INTG(X86_TRAP_NM,		device_not_available),

	INTG(X86_TRAP_OLD_MF,		coprocessor_segment_overrun),

	INTG(X86_TRAP_TS,		invalid_TSS),