Commit 9d06c402 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/entry: Convert Divide Error to IDTENTRY 



Convert #DE 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

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/20200505134904.663914713@linutronix.de
parent 218e31b6

arch/x86/entry/entry_32.S

+0 −7
Original line number Diff line number Diff line
@@ -1377,13 +1377,6 @@ SYM_CODE_START(alignment_check) 
	jmp	common_exception

SYM_CODE_END(alignment_check)



SYM_CODE_START(divide_error)

	ASM_CLAC

	pushl	$0				# no error code

	pushl	$do_divide_error

	jmp	common_exception

SYM_CODE_END(divide_error)



#ifdef CONFIG_X86_MCE

SYM_CODE_START(machine_check)

	ASM_CLAC

arch/x86/entry/entry_64.S

+0 −1
Original line number Diff line number Diff line
@@ -1072,7 +1072,6 @@ apicinterrupt IRQ_WORK_VECTOR irq_work_interrupt smp_irq_work_interrupt 
 * Exception entry points.

 */



idtentry	X86_TRAP_DE		divide_error		do_divide_error			has_error_code=0

idtentry	X86_TRAP_OF		overflow		do_overflow			has_error_code=0

idtentry	X86_TRAP_BP		int3			do_int3				has_error_code=0

idtentry	X86_TRAP_BR		bounds			do_bounds			has_error_code=0

arch/x86/include/asm/idtentry.h

+12 −0
Original line number Diff line number Diff line
@@ -67,4 +67,16 @@ static __always_inline void __##func(struct pt_regs *regs) 


#endif /* __ASSEMBLY__ */



/*

 * The actual entry points. Note that DECLARE_IDTENTRY*() serves two

 * purposes:

 *  - provide the function declarations when included from C-Code

 *  - emit the ASM stubs when included from entry_32/64.S

 *

 * This avoids duplicate defines and ensures that everything is consistent.

 */



/* Simple exception entry points. No hardware error code */

DECLARE_IDTENTRY(X86_TRAP_DE,		exc_divide_error);



#endif

arch/x86/include/asm/traps.h

+0 −3
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 


#define dotraplinkage __visible



asmlinkage void divide_error(void);

asmlinkage void debug(void);

asmlinkage void nmi(void);

asmlinkage void int3(void);
@@ -38,7 +37,6 @@ asmlinkage void machine_check(void); 
asmlinkage void simd_coprocessor_error(void);



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

asmlinkage void xen_divide_error(void);

asmlinkage void xen_xennmi(void);

asmlinkage void xen_xendebug(void);

asmlinkage void xen_int3(void);
@@ -62,7 +60,6 @@ asmlinkage void xen_machine_check(void); 
asmlinkage void xen_simd_coprocessor_error(void);

#endif



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

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);

arch/x86/kernel/idt.c

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static const __initconst struct idt_data early_idts[] = { 
 * set up TSS.

 */

static const __initconst struct idt_data def_idts[] = {

	INTG(X86_TRAP_DE,		divide_error),

	INTG(X86_TRAP_DE,		asm_exc_divide_error),

	INTG(X86_TRAP_NMI,		nmi),

	INTG(X86_TRAP_BR,		bounds),

	INTG(X86_TRAP_UD,		invalid_op),

CRA Git | Maintained and supported by SUSTech CRA and CCSE