Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 636a7598 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

x86/idt: Move APIC gate initialization to tables 



Replace the APIC/SMP vector gate initialization with the table based
mechanism.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/20170828064959.260177013@linutronix.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent b70543a0

arch/x86/include/asm/desc.h

+1 −0
Original line number Diff line number Diff line
@@ -507,6 +507,7 @@ static inline void load_current_idt(void) 
extern void idt_setup_early_handler(void);

extern void idt_setup_early_traps(void);

extern void idt_setup_traps(void);

extern void idt_setup_apic_and_irq_gates(void);



#ifdef CONFIG_X86_64

extern void idt_setup_early_pf(void);

arch/x86/kernel/idt.c

+48 −0
Original line number Diff line number Diff line
@@ -103,6 +103,46 @@ static const __initdata struct idt_data def_idts[] = { 
#endif

};



/*

 * The APIC and SMP idt entries

 */

static const __initdata struct idt_data apic_idts[] = {

#ifdef CONFIG_SMP

	INTG(RESCHEDULE_VECTOR,		reschedule_interrupt),

	INTG(CALL_FUNCTION_VECTOR,	call_function_interrupt),

	INTG(CALL_FUNCTION_SINGLE_VECTOR, call_function_single_interrupt),

	INTG(IRQ_MOVE_CLEANUP_VECTOR,	irq_move_cleanup_interrupt),

	INTG(REBOOT_VECTOR,		reboot_interrupt),

#endif



#ifdef CONFIG_X86_THERMAL_VECTOR

	INTG(THERMAL_APIC_VECTOR,	thermal_interrupt),

#endif



#ifdef CONFIG_X86_MCE_THRESHOLD

	INTG(THRESHOLD_APIC_VECTOR,	threshold_interrupt),

#endif



#ifdef CONFIG_X86_MCE_AMD

	INTG(DEFERRED_ERROR_VECTOR,	deferred_error_interrupt),

#endif



#ifdef CONFIG_X86_LOCAL_APIC

	INTG(LOCAL_TIMER_VECTOR,	apic_timer_interrupt),

	INTG(X86_PLATFORM_IPI_VECTOR,	x86_platform_ipi),

# ifdef CONFIG_HAVE_KVM

	INTG(POSTED_INTR_VECTOR,	kvm_posted_intr_ipi),

	INTG(POSTED_INTR_WAKEUP_VECTOR, kvm_posted_intr_wakeup_ipi),

	INTG(POSTED_INTR_NESTED_VECTOR, kvm_posted_intr_nested_ipi),

# endif

# ifdef CONFIG_IRQ_WORK

	INTG(IRQ_WORK_VECTOR,		irq_work_interrupt),

# endif

	INTG(SPURIOUS_APIC_VECTOR,	spurious_interrupt),

	INTG(ERROR_APIC_VECTOR,		error_interrupt),

#endif

};



#ifdef CONFIG_X86_64

/*

 * Early traps running on the DEFAULT_STACK because the other interrupt
@@ -241,6 +281,14 @@ void __init idt_setup_debugidt_traps(void) 
}

#endif



/**

 * idt_setup_apic_and_irq_gates - Setup APIC/SMP and normal interrupt gates

 */

void __init idt_setup_apic_and_irq_gates(void)

{

	idt_setup_from_table(idt_table, apic_idts, ARRAY_SIZE(apic_idts));

}



/**

 * idt_setup_early_handler - Initializes the idt table with early handlers

 */

arch/x86/kernel/irqinit.c

+1 −68
Original line number Diff line number Diff line
@@ -87,73 +87,6 @@ void __init init_IRQ(void) 
	x86_init.irqs.intr_init();

}



static void __init smp_intr_init(void)

{

#ifdef CONFIG_SMP

	/*

	 * The reschedule interrupt is a CPU-to-CPU reschedule-helper

	 * IPI, driven by wakeup.

	 */

	alloc_intr_gate(RESCHEDULE_VECTOR, reschedule_interrupt);



	/* IPI for generic function call */

	alloc_intr_gate(CALL_FUNCTION_VECTOR, call_function_interrupt);



	/* IPI for generic single function call */

	alloc_intr_gate(CALL_FUNCTION_SINGLE_VECTOR,

			call_function_single_interrupt);



	/* Low priority IPI to cleanup after moving an irq */

	set_intr_gate(IRQ_MOVE_CLEANUP_VECTOR, irq_move_cleanup_interrupt);

	set_bit(IRQ_MOVE_CLEANUP_VECTOR, used_vectors);



	/* IPI used for rebooting/stopping */

	alloc_intr_gate(REBOOT_VECTOR, reboot_interrupt);

#endif /* CONFIG_SMP */

}



static void __init apic_intr_init(void)

{

	smp_intr_init();



#ifdef CONFIG_X86_THERMAL_VECTOR

	alloc_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt);

#endif

#ifdef CONFIG_X86_MCE_THRESHOLD

	alloc_intr_gate(THRESHOLD_APIC_VECTOR, threshold_interrupt);

#endif



#ifdef CONFIG_X86_MCE_AMD

	alloc_intr_gate(DEFERRED_ERROR_VECTOR, deferred_error_interrupt);

#endif



#ifdef CONFIG_X86_LOCAL_APIC

	/* self generated IPI for local APIC timer */

	alloc_intr_gate(LOCAL_TIMER_VECTOR, apic_timer_interrupt);



	/* IPI for X86 platform specific use */

	alloc_intr_gate(X86_PLATFORM_IPI_VECTOR, x86_platform_ipi);

#ifdef CONFIG_HAVE_KVM

	/* IPI for KVM to deliver posted interrupt */

	alloc_intr_gate(POSTED_INTR_VECTOR, kvm_posted_intr_ipi);

	/* IPI for KVM to deliver interrupt to wake up tasks */

	alloc_intr_gate(POSTED_INTR_WAKEUP_VECTOR, kvm_posted_intr_wakeup_ipi);

	/* IPI for KVM to deliver nested posted interrupt */

	alloc_intr_gate(POSTED_INTR_NESTED_VECTOR, kvm_posted_intr_nested_ipi);

#endif



	/* IPI vectors for APIC spurious and error interrupts */

	alloc_intr_gate(SPURIOUS_APIC_VECTOR, spurious_interrupt);

	alloc_intr_gate(ERROR_APIC_VECTOR, error_interrupt);



	/* IRQ work interrupts: */

# ifdef CONFIG_IRQ_WORK

	alloc_intr_gate(IRQ_WORK_VECTOR, irq_work_interrupt);

# endif



#endif

}



void __init native_init_IRQ(void)

{

	int i;
@@ -161,7 +94,7 @@ void __init native_init_IRQ(void) 
	/* Execute any quirks before the call gates are initialised: */

	x86_init.irqs.pre_vector_init();



	apic_intr_init();

	idt_setup_apic_and_irq_gates();



	/*

	 * Cover the whole vector space, no vector can escape