Commit 720909a7 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/entry: Convert various system vectors 



Convert various system vectors to IDTENTRY_SYSVEC:

  - Implement the C entry point with DEFINE_IDTENTRY_SYSVEC
  - Emit the ASM stub with DECLARE_IDTENTRY_SYSVEC
  - Remove the ASM idtentries in 64-bit
  - Remove the BUILD_INTERRUPT entries in 32-bit
  - Remove the old prototypes

No functional change.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarAndy Lutomirski <luto@kernel.org>
Link: https://lore.kernel.org/r/20200521202119.464812973@linutronix.de
parent 582f9191

arch/x86/entry/entry_64.S

+0 −19
Original line number Diff line number Diff line
@@ -956,9 +956,6 @@ apicinterrupt3 \num \sym \do_sym 
POP_SECTION_IRQENTRY

.endm



#ifdef CONFIG_X86_UV

apicinterrupt3 UV_BAU_MESSAGE			uv_bau_message_intr1		uv_bau_message_interrupt

#endif



#ifdef CONFIG_HAVE_KVM

apicinterrupt3 POSTED_INTR_VECTOR		kvm_posted_intr_ipi		smp_kvm_posted_intr_ipi
@@ -966,26 +963,10 @@ apicinterrupt3 POSTED_INTR_WAKEUP_VECTOR kvm_posted_intr_wakeup_ipi smp_kvm_post 
apicinterrupt3 POSTED_INTR_NESTED_VECTOR	kvm_posted_intr_nested_ipi	smp_kvm_posted_intr_nested_ipi

#endif



#ifdef CONFIG_X86_MCE_THRESHOLD

apicinterrupt THRESHOLD_APIC_VECTOR		threshold_interrupt		smp_threshold_interrupt

#endif



#ifdef CONFIG_X86_MCE_AMD

apicinterrupt DEFERRED_ERROR_VECTOR		deferred_error_interrupt	smp_deferred_error_interrupt

#endif



#ifdef CONFIG_X86_THERMAL_VECTOR

apicinterrupt THERMAL_APIC_VECTOR		thermal_interrupt		smp_thermal_interrupt

#endif



#ifdef CONFIG_SMP

apicinterrupt RESCHEDULE_VECTOR			reschedule_interrupt		smp_reschedule_interrupt

#endif



#ifdef CONFIG_IRQ_WORK

apicinterrupt IRQ_WORK_VECTOR			irq_work_interrupt		smp_irq_work_interrupt

#endif



/*

 * Reload gs selector with exception handling

 * edi:  new selector

arch/x86/include/asm/apic.h

+0 −13
Original line number Diff line number Diff line
@@ -534,24 +534,11 @@ static inline void entering_ack_irq(void) 
	ack_APIC_irq();

}



static inline void ipi_entering_ack_irq(void)

{

	irq_enter();

	ack_APIC_irq();

	kvm_set_cpu_l1tf_flush_l1d();

}



static inline void exiting_irq(void)

{

	irq_exit();

}



static inline void exiting_ack_irq(void)

{

	ack_APIC_irq();

	irq_exit();

}



extern void ioapic_zap_locks(void);



#endif /* _ASM_X86_APIC_H */

arch/x86/include/asm/entry_arch.h

+0 −25
Original line number Diff line number Diff line
@@ -20,28 +20,3 @@ BUILD_INTERRUPT(kvm_posted_intr_wakeup_ipi, POSTED_INTR_WAKEUP_VECTOR) 
BUILD_INTERRUPT(kvm_posted_intr_nested_ipi, POSTED_INTR_NESTED_VECTOR)

#endif

/*

 * every pentium local APIC has two 'local interrupts', with a

 * soft-definable vector attached to both interrupts, one of

 * which is a timer interrupt, the other one is error counter

 * overflow. Linux uses the local APIC timer interrupt to get

 * a much simpler SMP time architecture:

 */

#ifdef CONFIG_X86_LOCAL_APIC



#ifdef CONFIG_IRQ_WORK

BUILD_INTERRUPT(irq_work_interrupt, IRQ_WORK_VECTOR)

#endif



#ifdef CONFIG_X86_THERMAL_VECTOR

BUILD_INTERRUPT(thermal_interrupt,THERMAL_APIC_VECTOR)

#endif



#ifdef CONFIG_X86_MCE_THRESHOLD

BUILD_INTERRUPT(threshold_interrupt,THRESHOLD_APIC_VECTOR)

#endif



#ifdef CONFIG_X86_MCE_AMD

BUILD_INTERRUPT(deferred_error_interrupt, DEFERRED_ERROR_VECTOR)

#endif

#endif

arch/x86/include/asm/hw_irq.h

+0 −6
Original line number Diff line number Diff line
@@ -32,15 +32,9 @@ 
extern asmlinkage void kvm_posted_intr_ipi(void);

extern asmlinkage void kvm_posted_intr_wakeup_ipi(void);

extern asmlinkage void kvm_posted_intr_nested_ipi(void);

extern asmlinkage void irq_work_interrupt(void);

extern asmlinkage void uv_bau_message_intr1(void);



extern asmlinkage void thermal_interrupt(void);

extern asmlinkage void reschedule_interrupt(void);



extern asmlinkage void threshold_interrupt(void);

extern asmlinkage void deferred_error_interrupt(void);



#ifdef	CONFIG_X86_LOCAL_APIC

struct irq_data;

struct pci_dev;

arch/x86/include/asm/idtentry.h

+22 −0
Original line number Diff line number Diff line
@@ -606,6 +606,28 @@ DECLARE_IDTENTRY_SYSVEC(CALL_FUNCTION_SINGLE_VECTOR, sysvec_call_function_single 
DECLARE_IDTENTRY_SYSVEC(CALL_FUNCTION_VECTOR,		sysvec_call_function);

#endif



#ifdef CONFIG_X86_LOCAL_APIC

# ifdef CONFIG_X86_UV

DECLARE_IDTENTRY_SYSVEC(UV_BAU_MESSAGE,			sysvec_uv_bau_message);

# endif



# ifdef CONFIG_X86_MCE_THRESHOLD

DECLARE_IDTENTRY_SYSVEC(THRESHOLD_APIC_VECTOR,		sysvec_threshold);

# endif



# ifdef CONFIG_X86_MCE_AMD

DECLARE_IDTENTRY_SYSVEC(DEFERRED_ERROR_VECTOR,		sysvec_deferred_error);

# endif



# ifdef CONFIG_X86_THERMAL_VECTOR

DECLARE_IDTENTRY_SYSVEC(THERMAL_APIC_VECTOR,		sysvec_thermal);

# endif



# ifdef CONFIG_IRQ_WORK

DECLARE_IDTENTRY_SYSVEC(IRQ_WORK_VECTOR,		sysvec_irq_work);

# endif

#endif



#undef X86_TRAP_OTHER



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE