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

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
...@@ -1318,12 +1318,6 @@ SYM_CODE_START(native_iret) ...@@ -1318,12 +1318,6 @@ SYM_CODE_START(native_iret)
SYM_CODE_END(native_iret) SYM_CODE_END(native_iret)
#endif #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) SYM_CODE_START(segment_not_present)
ASM_CLAC ASM_CLAC
pushl $do_segment_not_present pushl $do_segment_not_present
......
...@@ -1073,7 +1073,6 @@ apicinterrupt IRQ_WORK_VECTOR irq_work_interrupt smp_irq_work_interrupt ...@@ -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_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_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_SS stack_segment do_stack_segment has_error_code=1
idtentry X86_TRAP_GP general_protection do_general_protection has_error_code=1 idtentry X86_TRAP_GP general_protection do_general_protection has_error_code=1
......
...@@ -130,4 +130,7 @@ DECLARE_IDTENTRY(X86_TRAP_UD, exc_invalid_op); ...@@ -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_NM, exc_device_not_available);
DECLARE_IDTENTRY(X86_TRAP_OLD_MF, exc_coproc_segment_overrun); 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 #endif
...@@ -17,7 +17,6 @@ asmlinkage void int3(void); ...@@ -17,7 +17,6 @@ asmlinkage void int3(void);
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
asmlinkage void double_fault(void); asmlinkage void double_fault(void);
#endif #endif
asmlinkage void invalid_TSS(void);
asmlinkage void segment_not_present(void); asmlinkage void segment_not_present(void);
asmlinkage void stack_segment(void); asmlinkage void stack_segment(void);
asmlinkage void general_protection(void); asmlinkage void general_protection(void);
...@@ -36,7 +35,6 @@ asmlinkage void xen_xennmi(void); ...@@ -36,7 +35,6 @@ asmlinkage void xen_xennmi(void);
asmlinkage void xen_xendebug(void); asmlinkage void xen_xendebug(void);
asmlinkage void xen_int3(void); asmlinkage void xen_int3(void);
asmlinkage void xen_double_fault(void); asmlinkage void xen_double_fault(void);
asmlinkage void xen_invalid_TSS(void);
asmlinkage void xen_segment_not_present(void); asmlinkage void xen_segment_not_present(void);
asmlinkage void xen_stack_segment(void); asmlinkage void xen_stack_segment(void);
asmlinkage void xen_general_protection(void); asmlinkage void xen_general_protection(void);
...@@ -54,7 +52,6 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code); ...@@ -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_nmi(struct pt_regs *regs, long error_code);
dotraplinkage void do_int3(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_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_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_stack_segment(struct pt_regs *regs, long error_code);
dotraplinkage void do_general_protection(struct pt_regs *regs, long error_code); dotraplinkage void do_general_protection(struct pt_regs *regs, long error_code);
......
...@@ -79,7 +79,7 @@ static const __initconst struct idt_data def_idts[] = { ...@@ -79,7 +79,7 @@ static const __initconst struct idt_data def_idts[] = {
INTG(X86_TRAP_UD, asm_exc_invalid_op), INTG(X86_TRAP_UD, asm_exc_invalid_op),
INTG(X86_TRAP_NM, asm_exc_device_not_available), INTG(X86_TRAP_NM, asm_exc_device_not_available),
INTG(X86_TRAP_OLD_MF, asm_exc_coproc_segment_overrun), 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_NP, segment_not_present),
INTG(X86_TRAP_SS, stack_segment), INTG(X86_TRAP_SS, stack_segment),
INTG(X86_TRAP_GP, general_protection), INTG(X86_TRAP_GP, general_protection),
......
...@@ -252,6 +252,12 @@ DEFINE_IDTENTRY(exc_coproc_segment_overrun) ...@@ -252,6 +252,12 @@ DEFINE_IDTENTRY(exc_coproc_segment_overrun)
X86_TRAP_OLD_MF, SIGFPE, 0, NULL); X86_TRAP_OLD_MF, SIGFPE, 0, NULL);
} }
DEFINE_IDTENTRY_ERRORCODE(exc_invalid_tss)
{
do_error_trap(regs, error_code, "invalid TSS", X86_TRAP_TS, SIGSEGV,
0, NULL);
}
#define IP ((void __user *)uprobe_get_trap_addr(regs)) #define IP ((void __user *)uprobe_get_trap_addr(regs))
#define DO_ERROR(trapnr, signr, sicode, addr, str, name) \ #define DO_ERROR(trapnr, signr, sicode, addr, str, name) \
dotraplinkage void do_##name(struct pt_regs *regs, long error_code) \ dotraplinkage void do_##name(struct pt_regs *regs, long error_code) \
...@@ -259,7 +265,6 @@ dotraplinkage void do_##name(struct pt_regs *regs, long error_code) \ ...@@ -259,7 +265,6 @@ dotraplinkage void do_##name(struct pt_regs *regs, long error_code) \
do_error_trap(regs, error_code, str, trapnr, signr, sicode, addr); \ do_error_trap(regs, error_code, str, trapnr, signr, sicode, addr); \
} }
DO_ERROR(X86_TRAP_TS, SIGSEGV, 0, NULL, "invalid TSS", invalid_TSS)
DO_ERROR(X86_TRAP_NP, SIGBUS, 0, NULL, "segment not present", segment_not_present) DO_ERROR(X86_TRAP_NP, SIGBUS, 0, NULL, "segment not present", segment_not_present)
DO_ERROR(X86_TRAP_SS, SIGBUS, 0, NULL, "stack segment", stack_segment) DO_ERROR(X86_TRAP_SS, SIGBUS, 0, NULL, "stack segment", stack_segment)
#undef IP #undef IP
......
...@@ -627,7 +627,7 @@ static struct trap_array_entry trap_array[] = { ...@@ -627,7 +627,7 @@ static struct trap_array_entry trap_array[] = {
TRAP_ENTRY(exc_invalid_op, false ), TRAP_ENTRY(exc_invalid_op, false ),
TRAP_ENTRY(exc_device_not_available, false ), TRAP_ENTRY(exc_device_not_available, false ),
TRAP_ENTRY(exc_coproc_segment_overrun, false ), TRAP_ENTRY(exc_coproc_segment_overrun, false ),
{ invalid_TSS, xen_invalid_TSS, false }, TRAP_ENTRY(exc_invalid_tss, false ),
{ segment_not_present, xen_segment_not_present, false }, { segment_not_present, xen_segment_not_present, false },
{ stack_segment, xen_stack_segment, false }, { stack_segment, xen_stack_segment, false },
{ general_protection, xen_general_protection, false }, { general_protection, xen_general_protection, false },
......
...@@ -39,7 +39,7 @@ xen_pv_trap asm_exc_invalid_op ...@@ -39,7 +39,7 @@ xen_pv_trap asm_exc_invalid_op
xen_pv_trap asm_exc_device_not_available xen_pv_trap asm_exc_device_not_available
xen_pv_trap double_fault xen_pv_trap double_fault
xen_pv_trap asm_exc_coproc_segment_overrun xen_pv_trap asm_exc_coproc_segment_overrun
xen_pv_trap invalid_TSS xen_pv_trap asm_exc_invalid_tss
xen_pv_trap segment_not_present xen_pv_trap segment_not_present
xen_pv_trap stack_segment xen_pv_trap stack_segment
xen_pv_trap general_protection xen_pv_trap general_protection
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment