Skip to content

Commit e3c89f5

Browse files
up2wingsean-jc
authored andcommitted
KVM: x86: Don't re-setup empty IRQ routing when KVM_CAP_SPLIT_IRQCHIP
Now that KVM sets up empty IRQ routing during VM creation, don't recreate empty routing during KVM_CAP_SPLIT_IRQCHIP. Setting IRQ routes during KVM_CAP_SPLIT_IRQCHIP can result in 20+ milliseconds of delay due to the synchronize_srcu_expedited() call in kvm_set_irq_routing(). Note, the empty routing is guaranteed to be intact as KVM x86 only allows changing the IRQ routing after an in-kernel IRQCHIP has been created, and KVM_CAP_SPLIT_IRQCHIP is disallowed after creating an IRQCHIP. Signed-off-by: Yi Wang <foxywang@tencent.com> Link: https://lore.kernel.org/r/20240506101751.3145407-3-foxywang@tencent.com [sean: massage changelog, remove unused empty_routing array] Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent fbe4a7e commit e3c89f5

3 files changed

Lines changed: 0 additions & 11 deletions

File tree

arch/x86/kvm/irq.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ void __kvm_migrate_timers(struct kvm_vcpu *vcpu);
106106
int apic_has_pending_timer(struct kvm_vcpu *vcpu);
107107

108108
int kvm_setup_default_irq_routing(struct kvm *kvm);
109-
int kvm_setup_empty_irq_routing(struct kvm *kvm);
110109
int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src,
111110
struct kvm_lapic_irq *irq,
112111
struct dest_map *dest_map);

arch/x86/kvm/irq_comm.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -395,13 +395,6 @@ int kvm_setup_default_irq_routing(struct kvm *kvm)
395395
ARRAY_SIZE(default_routing), 0);
396396
}
397397

398-
static const struct kvm_irq_routing_entry empty_routing[] = {};
399-
400-
int kvm_setup_empty_irq_routing(struct kvm *kvm)
401-
{
402-
return kvm_set_irq_routing(kvm, empty_routing, 0, 0);
403-
}
404-
405398
void kvm_arch_post_irq_routing_update(struct kvm *kvm)
406399
{
407400
if (!irqchip_split(kvm))

arch/x86/kvm/x86.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6552,9 +6552,6 @@ int kvm_vm_ioctl_enable_cap(struct kvm *kvm,
65526552
goto split_irqchip_unlock;
65536553
if (kvm->created_vcpus)
65546554
goto split_irqchip_unlock;
6555-
r = kvm_setup_empty_irq_routing(kvm);
6556-
if (r)
6557-
goto split_irqchip_unlock;
65586555
/* Pairs with irqchip_in_kernel. */
65596556
smp_wmb();
65606557
kvm->arch.irqchip_mode = KVM_IRQCHIP_SPLIT;

0 commit comments

Comments
 (0)