Messages in this thread | | | Subject | Re: [patch 09/15] x86/entry: Convert KVM vectors to IDTENTRY_SYSVEC | From | Paolo Bonzini <> | Date | Wed, 26 Feb 2020 11:54:50 +0100 |
| |
On 25/02/20 23:47, Thomas Gleixner wrote: > Convert KVm specific 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 64bit > - Remove the BUILD_INTERRUPT entries in 32bit > - Remove the old prototyoes > > No functional change. > > Signed-off-by: Thomas Gleixner <tglx@linutronix.de> > --- > arch/x86/entry/entry_32.S | 3 --- > arch/x86/entry/entry_64.S | 7 ------- > arch/x86/include/asm/entry_arch.h | 19 ------------------- > arch/x86/include/asm/hw_irq.h | 5 ----- > arch/x86/include/asm/idtentry.h | 6 ++++++ > arch/x86/include/asm/irq.h | 3 --- > arch/x86/kernel/idt.c | 6 +++--- > arch/x86/kernel/irq.c | 6 +++--- > 8 files changed, 12 insertions(+), 43 deletions(-) > > --- a/arch/x86/entry/entry_32.S > +++ b/arch/x86/entry/entry_32.S > @@ -1286,9 +1286,6 @@ SYM_FUNC_END(name) > #define BUILD_INTERRUPT(name, nr) \ > BUILD_INTERRUPT3(name, nr, smp_##name); \ > > -/* The include is where all of the SMP etc. interrupts come from */ > -#include <asm/entry_arch.h> > - > #ifdef CONFIG_PARAVIRT > SYM_CODE_START(native_iret) > iret > --- a/arch/x86/entry/entry_64.S > +++ b/arch/x86/entry/entry_64.S > @@ -994,13 +994,6 @@ apicinterrupt3 \num \sym \do_sym > POP_SECTION_IRQENTRY > .endm > > - > -#ifdef CONFIG_HAVE_KVM > -apicinterrupt3 POSTED_INTR_VECTOR kvm_posted_intr_ipi smp_kvm_posted_intr_ipi > -apicinterrupt3 POSTED_INTR_WAKEUP_VECTOR kvm_posted_intr_wakeup_ipi smp_kvm_posted_intr_wakeup_ipi > -apicinterrupt3 POSTED_INTR_NESTED_VECTOR kvm_posted_intr_nested_ipi smp_kvm_posted_intr_nested_ipi > -#endif > - > /* > * Reload gs selector with exception handling > * edi: new selector > --- a/arch/x86/include/asm/entry_arch.h > +++ /dev/null > @@ -1,19 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > -/* > - * This file is designed to contain the BUILD_INTERRUPT specifications for > - * all of the extra named interrupt vectors used by the architecture. > - * Usually this is the Inter Process Interrupts (IPIs) > - */ > - > -/* > - * The following vectors are part of the Linux architecture, there > - * is no hardware IRQ pin equivalent for them, they are triggered > - * through the ICC by us (IPIs) > - */ > - > -#ifdef CONFIG_HAVE_KVM > -BUILD_INTERRUPT(kvm_posted_intr_ipi, POSTED_INTR_VECTOR) > -BUILD_INTERRUPT(kvm_posted_intr_wakeup_ipi, POSTED_INTR_WAKEUP_VECTOR) > -BUILD_INTERRUPT(kvm_posted_intr_nested_ipi, POSTED_INTR_NESTED_VECTOR) > -#endif > - > --- a/arch/x86/include/asm/hw_irq.h > +++ b/arch/x86/include/asm/hw_irq.h > @@ -28,11 +28,6 @@ > #include <asm/irq.h> > #include <asm/sections.h> > > -/* Interrupt handlers registered during init_IRQ */ > -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); > - > #ifdef CONFIG_X86_LOCAL_APIC > struct irq_data; > struct pci_dev; > --- a/arch/x86/include/asm/idtentry.h > +++ b/arch/x86/include/asm/idtentry.h > @@ -517,6 +517,12 @@ DECLARE_IDTENTRY_SYSVEC(THERMAL_APIC_VEC > DECLARE_IDTENTRY_SYSVEC(IRQ_WORK_VECTOR, sysvec_irq_work); > #endif > > +#ifdef CONFIG_HAVE_KVM > +DECLARE_IDTENTRY_SYSVEC(POSTED_INTR_VECTOR, sysvec_kvm_posted_intr_ipi); > +DECLARE_IDTENTRY_SYSVEC(POSTED_INTR_WAKEUP_VECTOR, sysvec_kvm_posted_intr_wakeup_ipi); > +DECLARE_IDTENTRY_SYSVEC(POSTED_INTR_NESTED_VECTOR, sysvec_kvm_posted_intr_nested_ipi); > +#endif > + > #ifdef CONFIG_X86_MCE > /* Machine check */ > DECLARE_IDTENTRY_MCE(X86_TRAP_MC, exc_machine_check); > --- a/arch/x86/include/asm/irq.h > +++ b/arch/x86/include/asm/irq.h > @@ -26,9 +26,6 @@ extern void fixup_irqs(void); > > #ifdef CONFIG_HAVE_KVM > extern void kvm_set_posted_intr_wakeup_handler(void (*handler)(void)); > -extern __visible void smp_kvm_posted_intr_ipi(struct pt_regs *regs); > -extern __visible void smp_kvm_posted_intr_wakeup_ipi(struct pt_regs *regs); > -extern __visible void smp_kvm_posted_intr_nested_ipi(struct pt_regs *regs); > #endif > > extern void (*x86_platform_ipi_callback)(void); > --- a/arch/x86/kernel/idt.c > +++ b/arch/x86/kernel/idt.c > @@ -132,9 +132,9 @@ static const __initconst struct idt_data > INTG(LOCAL_TIMER_VECTOR, asm_sysvec_apic_timer_interrupt), > INTG(X86_PLATFORM_IPI_VECTOR, asm_sysvec_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), > + INTG(POSTED_INTR_VECTOR, asm_sysvec_kvm_posted_intr_ipi), > + INTG(POSTED_INTR_WAKEUP_VECTOR, asm_sysvec_kvm_posted_intr_wakeup_ipi), > + INTG(POSTED_INTR_NESTED_VECTOR, asm_sysvec_kvm_posted_intr_nested_ipi), > # endif > # ifdef CONFIG_IRQ_WORK > INTG(IRQ_WORK_VECTOR, asm_sysvec_irq_work), > --- a/arch/x86/kernel/irq.c > +++ b/arch/x86/kernel/irq.c > @@ -301,7 +301,7 @@ EXPORT_SYMBOL_GPL(kvm_set_posted_intr_wa > /* > * Handler for POSTED_INTERRUPT_VECTOR. > */ > -__visible void smp_kvm_posted_intr_ipi(struct pt_regs *regs) > +DEFINE_IDTENTRY_SYSVEC(sysvec_kvm_posted_intr_ipi) > { > struct pt_regs *old_regs = set_irq_regs(regs); > > @@ -314,7 +314,7 @@ EXPORT_SYMBOL_GPL(kvm_set_posted_intr_wa > /* > * Handler for POSTED_INTERRUPT_WAKEUP_VECTOR. > */ > -__visible void smp_kvm_posted_intr_wakeup_ipi(struct pt_regs *regs) > +DEFINE_IDTENTRY_SYSVEC(sysvec_kvm_posted_intr_wakeup_ipi) > { > struct pt_regs *old_regs = set_irq_regs(regs); > > @@ -328,7 +328,7 @@ EXPORT_SYMBOL_GPL(kvm_set_posted_intr_wa > /* > * Handler for POSTED_INTERRUPT_NESTED_VECTOR. > */ > -__visible void smp_kvm_posted_intr_nested_ipi(struct pt_regs *regs) > +DEFINE_IDTENTRY_SYSVEC(sysvec_kvm_posted_intr_nested_ipi) > { > struct pt_regs *old_regs = set_irq_regs(regs); > >
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
| |