My attempt to further cleanup pic/ioapic checks using irqchip_mode + other cleanups in that area. The goal is to only check against irqchip_mode and not to rely on vpic/vioapic variables anymore to test for existence of pic/ioapic. This will avoid any possible races when creating the kernel irqchip fails. RFC -> v1: - renamed KVM_IRQCHIP_KERNEL_INIT to KVM_IRQCHIP_INIT_IN_PROGRESS - set KVM_IRQCHIP_INIT_IN_PROGRESS also during KVM_CAP_SPLIT_IRQCHIP - don't intoduce another helper to check against KVM_IRQCHIP_NONE, but perform the check in kvm_set_routing_entry() explicitly - changed irqchip_in_kernel() to only perform one check - added "KVM: x86: use irqchip_kernel() to check for pic+ioapic" David Hildenbrand (22): KVM: x86: race between KVM_SET_GSI_ROUTING and KVM_CREATE_IRQCHIP KVM: x86: check against irqchip_mode in kvm_set_routing_entry() KVM: x86: check against irqchip_mode in pic_in_kernel() KVM: x86: check against irqchip_mode in ioapic_in_kernel() KVM: x86: get rid of pic_irqchip() KVM: x86: get rid of ioapic_irqchip() KVM: x86: use ioapic_in_kernel() to check for ioapic existence KVM: x86: remove duplicate checks for ioapic KVM: x86: convert kvm_(set|get)_ioapic() into void KVM: x86: don't take kvm->irq_lock when creating IRQCHIP KVM: x86: push usage of slots_lock down KVM: x86: KVM_IRQCHIP_PIC_MASTER only has 8 pins KVM: x86: remove all-vcpu request from kvm_ioapic_init() KVM: x86: directly call kvm_make_scan_ioapic_request() in ioapic.c KVM: x86: rename kvm_vcpu_request_scan_ioapic() KVM: x86: drop goto label in kvm_set_routing_entry() KVM: x86: simplify pic_unlock() KVM: x86: make kvm_pic_reset() static KVM: x86: drop picdev_in_range() KVM: x86: set data directly in picdev_read() KVM: x86: simplify pic_ioport_read() KVM: x86: use irqchip_kernel() to check for pic+ioapic arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/i8259.c | 70 +++++++++++++++-------------------------- arch/x86/kvm/ioapic.c | 28 ++++++----------- arch/x86/kvm/ioapic.h | 14 ++------- arch/x86/kvm/irq.c | 2 +- arch/x86/kvm/irq.h | 14 ++------- arch/x86/kvm/irq_comm.c | 43 +++++++++++-------------- arch/x86/kvm/x86.c | 41 +++++++++++------------- include/linux/kvm_host.h | 4 +-- virt/kvm/eventfd.c | 4 +-- virt/kvm/kvm_main.c | 3 ++ 11 files changed, 87 insertions(+), 137 deletions(-) -- 2.9.3
