Commit 97b3d290 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/entry: Convert Invalid TSS exception to IDTENTRY 



Convert #TS 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 avatarAndy Lutomirski <luto@kernel.org>
Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20200505134905.350676449@linutronix.de
parent aabfe538

arch/x86/entry/entry_32.S

+0 −6
Original line number Diff line number Diff line
@@ -1318,12 +1318,6 @@ SYM_CODE_START(native_iret) 
SYM_CODE_END(native_iret)

#endif



SYM_CODE_START(invalid_TSS)

	ASM_CLAC

	pushl	$do_invalid_TSS

	jmp	common_exception

SYM_CODE_END(invalid_TSS)



SYM_CODE_START(segment_not_present)

	ASM_CLAC

	pushl	$do_segment_not_present

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_TS		invalid_TSS		do_invalid_TSS			has_error_code=1

idtentry	X86_TRAP_NP		segment_not_present	do_segment_not_present		has_error_code=1

idtentry	X86_TRAP_SS		stack_segment		do_stack_segment		has_error_code=1

idtentry	X86_TRAP_GP		general_protection	do_general_protection		has_error_code=1

arch/x86/include/asm/idtentry.h

+3 −0
Original line number Diff line number Diff line
@@ -130,4 +130,7 @@ 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);



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

DECLARE_IDTENTRY_ERRORCODE(X86_TRAP_TS,	exc_invalid_tss);



#endif

arch/x86/include/asm/traps.h

+0 −3
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ asmlinkage void int3(void); 
#ifdef CONFIG_X86_64

asmlinkage void double_fault(void);

#endif

asmlinkage void invalid_TSS(void);

asmlinkage void segment_not_present(void);

asmlinkage void stack_segment(void);

asmlinkage void general_protection(void);
@@ -36,7 +35,6 @@ asmlinkage void xen_xennmi(void); 
asmlinkage void xen_xendebug(void);

asmlinkage void xen_int3(void);

asmlinkage void xen_double_fault(void);

asmlinkage void xen_invalid_TSS(void);

asmlinkage void xen_segment_not_present(void);

asmlinkage void xen_stack_segment(void);

asmlinkage void xen_general_protection(void);
@@ -54,7 +52,6 @@ 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_double_fault(struct pt_regs *regs, long error_code, unsigned long cr2);

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

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

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

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

arch/x86/kernel/idt.c

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

	INTG(X86_TRAP_NM,		asm_exc_device_not_available),

	INTG(X86_TRAP_OLD_MF,		asm_exc_coproc_segment_overrun),

	INTG(X86_TRAP_TS,		invalid_TSS),

	INTG(X86_TRAP_TS,		asm_exc_invalid_tss),

	INTG(X86_TRAP_NP,		segment_not_present),

	INTG(X86_TRAP_SS,		stack_segment),

	INTG(X86_TRAP_GP,		general_protection),

CRA Git | Maintained and supported by SUSTech CRA and CCSE