x86/entry: Convert Spurious interrupt bug exception to IDTENTRY

Convert #SPURIOUS 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: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Alexandre Chartre <alexandre.chartre@oracle.com>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Acked-by: Andy Lutomirski <luto@kernel.org>
Link: https://lkml.kernel.org/r/20200505134905.728077036@linutronix.de

diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S
index 9d94a036bf355b8ac31927fdae0959de81b5e4f8..f7610e1608d342086f06abb730f886f6fa38ef53 100644 (file)
--- a/arch/x86/entry/entry_32.S
+++ b/arch/x86/entry/entry_32.S
@@ -1333,13 +1333,6 @@ SYM_CODE_START(machine_check)
 SYM_CODE_END(machine_check)
 #endif
 
-SYM_CODE_START(spurious_interrupt_bug)
-       ASM_CLAC
-       pushl   $0
-       pushl   $do_spurious_interrupt_bug
-       jmp     common_exception
-SYM_CODE_END(spurious_interrupt_bug)
-
 #ifdef CONFIG_XEN_PV
 SYM_FUNC_START(xen_hypervisor_callback)
        /*

diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
index 5cecdd18f5485789c45ddbcdc272f02d969cd8bb..1a677eec4d6d1978b49d244cb63df49b9dedc10d 100644 (file)
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -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_SPURIOUS       spurious_interrupt_bug  do_spurious_interrupt_bug       has_error_code=0
 idtentry       X86_TRAP_MF             coprocessor_error       do_coprocessor_error            has_error_code=0
 idtentry       X86_TRAP_AC             alignment_check         do_alignment_check              has_error_code=1
 idtentry       X86_TRAP_XF             simd_coprocessor_error  do_simd_coprocessor_error       has_error_code=0

diff --git a/arch/x86/include/asm/idtentry.h b/arch/x86/include/asm/idtentry.h
index 986fc655d2abf25af9da354a2c277cc8fbfeae79..d309b060422bfb9c81eed852752442d380bd2627 100644 (file)
--- a/arch/x86/include/asm/idtentry.h
+++ b/arch/x86/include/asm/idtentry.h
@@ -129,6 +129,7 @@ DECLARE_IDTENTRY(X86_TRAP_BR,               exc_bounds);
 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);
+DECLARE_IDTENTRY(X86_TRAP_SPURIOUS,    exc_spurious_interrupt_bug);
 
 /* Simple exception entries with error code pushed by hardware */
 DECLARE_IDTENTRY_ERRORCODE(X86_TRAP_TS,        exc_invalid_tss);

diff --git a/arch/x86/include/asm/traps.h b/arch/x86/include/asm/traps.h
index 3a096a49b3431ca10231e4cb89beb68cf1ba3b8c..4450f3b43f9713ad760594f24e39d9a71afdda7e 100644 (file)
--- a/arch/x86/include/asm/traps.h
+++ b/arch/x86/include/asm/traps.h
@@ -19,7 +19,6 @@ asmlinkage void double_fault(void);
 #endif
 asmlinkage void page_fault(void);
 asmlinkage void async_page_fault(void);
-asmlinkage void spurious_interrupt_bug(void);
 asmlinkage void coprocessor_error(void);
 asmlinkage void alignment_check(void);
 #ifdef CONFIG_X86_MCE
@@ -33,7 +32,6 @@ asmlinkage void xen_xendebug(void);
 asmlinkage void xen_int3(void);
 asmlinkage void xen_double_fault(void);
 asmlinkage void xen_page_fault(void);
-asmlinkage void xen_spurious_interrupt_bug(void);
 asmlinkage void xen_coprocessor_error(void);
 asmlinkage void xen_alignment_check(void);
 #ifdef CONFIG_X86_MCE
@@ -47,7 +45,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_spurious_interrupt_bug(struct pt_regs *regs, long error_code);
 dotraplinkage void do_coprocessor_error(struct pt_regs *regs, long error_code);
 dotraplinkage void do_alignment_check(struct pt_regs *regs, long error_code);
 dotraplinkage void do_simd_coprocessor_error(struct pt_regs *regs, long error_code);

diff --git a/arch/x86/kernel/idt.c b/arch/x86/kernel/idt.c
index 6f0af12f08c869336d2c03f679c32f497b9ccbd4..8e8936dcf6e46dbcdff83b1aeec9ba8fafaec6db 100644 (file)
--- a/arch/x86/kernel/idt.c
+++ b/arch/x86/kernel/idt.c
@@ -83,7 +83,7 @@ static const __initconst struct idt_data def_idts[] = {
        INTG(X86_TRAP_NP,               asm_exc_segment_not_present),
        INTG(X86_TRAP_SS,               asm_exc_stack_segment),
        INTG(X86_TRAP_GP,               asm_exc_general_protection),
-       INTG(X86_TRAP_SPURIOUS,         spurious_interrupt_bug),
+       INTG(X86_TRAP_SPURIOUS,         asm_exc_spurious_interrupt_bug),
        INTG(X86_TRAP_MF,               coprocessor_error),
        INTG(X86_TRAP_AC,               alignment_check),
        INTG(X86_TRAP_XF,               simd_coprocessor_error),

diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index e65c7612ecf3244dca2ab7815ac1792156fa9470..2c638b9bc82725d48dcf3b2533f6da87cea28e6f 100644 (file)
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -867,8 +867,7 @@ do_simd_coprocessor_error(struct pt_regs *regs, long error_code)
        math_error(regs, error_code, X86_TRAP_XF);
 }
 
-dotraplinkage void
-do_spurious_interrupt_bug(struct pt_regs *regs, long error_code)
+DEFINE_IDTENTRY(exc_spurious_interrupt_bug)
 {
        /*
         * This addresses a Pentium Pro Erratum:

diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c
index ca441c7c3222b683c7a96c1dffa386969b6a8386..5b2dfb027fe26715a3dc22f878c0b7adf48e318d 100644 (file)
--- a/arch/x86/xen/enlighten_pv.c
+++ b/arch/x86/xen/enlighten_pv.c
@@ -631,7 +631,7 @@ static struct trap_array_entry trap_array[] = {
        TRAP_ENTRY(exc_segment_not_present,             false ),
        TRAP_ENTRY(exc_stack_segment,                   false ),
        TRAP_ENTRY(exc_general_protection,              false ),
-       { spurious_interrupt_bug,      xen_spurious_interrupt_bug,      false },
+       TRAP_ENTRY(exc_spurious_interrupt_bug,          false ),
        { coprocessor_error,           xen_coprocessor_error,           false },
        { alignment_check,             xen_alignment_check,             false },
        { simd_coprocessor_error,      xen_simd_coprocessor_error,      false },

diff --git a/arch/x86/xen/xen-asm_64.S b/arch/x86/xen/xen-asm_64.S
index 802ec00b2f9cd2098f5302df00a1b35d3a4ff9ea..698a9c50d8771dc56883b0f86a6b37d666121a91 100644 (file)
--- a/arch/x86/xen/xen-asm_64.S
+++ b/arch/x86/xen/xen-asm_64.S
@@ -44,7 +44,7 @@ xen_pv_trap asm_exc_segment_not_present
 xen_pv_trap asm_exc_stack_segment
 xen_pv_trap asm_exc_general_protection
 xen_pv_trap page_fault
-xen_pv_trap spurious_interrupt_bug
+xen_pv_trap asm_exc_spurious_interrupt_bug
 xen_pv_trap coprocessor_error
 xen_pv_trap alignment_check
 #ifdef CONFIG_X86_MCE