kvm-irqchip: do explicit commit when update irq
In the past, we are doing gsi route commit for each irqchip route update. This is not efficient if we are updating lots of routes in the same time. This patch removes the committing phase in kvm_irqchip_update_msi_route(). Instead, we do explicit commit after all routes updated. Signed-off-by: Peter Xu <peterx@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
e1d4fb2de5
commit
3f1fea0fb5
@ -1015,6 +1015,7 @@ static void assigned_dev_update_msi_msg(PCIDevice *pci_dev)
|
||||
|
||||
kvm_irqchip_update_msi_route(kvm_state, assigned_dev->msi_virq[0],
|
||||
msi_get_message(pci_dev, 0), pci_dev);
|
||||
kvm_irqchip_commit_routes(kvm_state);
|
||||
}
|
||||
|
||||
static bool assigned_dev_msix_masked(MSIXTableEntry *entry)
|
||||
@ -1602,6 +1603,7 @@ static void assigned_dev_msix_mmio_write(void *opaque, hwaddr addr,
|
||||
if (ret) {
|
||||
error_report("Error updating irq routing entry (%d)", ret);
|
||||
}
|
||||
kvm_irqchip_commit_routes(kvm_state);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -322,6 +322,7 @@ static int ivshmem_vector_unmask(PCIDevice *dev, unsigned vector,
|
||||
if (ret < 0) {
|
||||
return ret;
|
||||
}
|
||||
kvm_irqchip_commit_routes(kvm_state);
|
||||
|
||||
return kvm_irqchip_add_irqfd_notifier_gsi(kvm_state, n, NULL, v->virq);
|
||||
}
|
||||
|
@ -458,6 +458,7 @@ static void vfio_update_kvm_msi_virq(VFIOMSIVector *vector, MSIMessage msg,
|
||||
PCIDevice *pdev)
|
||||
{
|
||||
kvm_irqchip_update_msi_route(kvm_state, vector->virq, msg, pdev);
|
||||
kvm_irqchip_commit_routes(kvm_state);
|
||||
}
|
||||
|
||||
static int vfio_msix_vector_do_use(PCIDevice *pdev, unsigned int nr,
|
||||
|
@ -842,6 +842,7 @@ static int virtio_pci_vq_vector_unmask(VirtIOPCIProxy *proxy,
|
||||
if (ret < 0) {
|
||||
return ret;
|
||||
}
|
||||
kvm_irqchip_commit_routes(kvm_state);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -371,7 +371,6 @@ int kvm_set_irq(KVMState *s, int irq, int level);
|
||||
int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg);
|
||||
|
||||
void kvm_irqchip_add_irq_route(KVMState *s, int gsi, int irqchip, int pin);
|
||||
void kvm_irqchip_commit_routes(KVMState *s);
|
||||
|
||||
void kvm_put_apic_state(DeviceState *d, struct kvm_lapic_state *kapic);
|
||||
void kvm_get_apic_state(DeviceState *d, struct kvm_lapic_state *kapic);
|
||||
@ -494,6 +493,7 @@ static inline void cpu_synchronize_post_init(CPUState *cpu)
|
||||
int kvm_irqchip_add_msi_route(KVMState *s, int vector, PCIDevice *dev);
|
||||
int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg,
|
||||
PCIDevice *dev);
|
||||
void kvm_irqchip_commit_routes(KVMState *s);
|
||||
void kvm_irqchip_release_virq(KVMState *s, int virq);
|
||||
|
||||
int kvm_irqchip_add_adapter_route(KVMState *s, AdapterInfo *adapter);
|
||||
|
@ -1094,8 +1094,6 @@ static int kvm_update_routing_entry(KVMState *s,
|
||||
|
||||
*entry = *new_entry;
|
||||
|
||||
kvm_irqchip_commit_routes(s);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -135,6 +135,10 @@ int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg,
|
||||
return -ENOSYS;
|
||||
}
|
||||
|
||||
void kvm_irqchip_commit_routes(KVMState *s)
|
||||
{
|
||||
}
|
||||
|
||||
int kvm_irqchip_add_adapter_route(KVMState *s, AdapterInfo *adapter)
|
||||
{
|
||||
return -ENOSYS;
|
||||
|
@ -3427,6 +3427,7 @@ static void kvm_update_msi_routes_all(void *private, bool global,
|
||||
kvm_irqchip_update_msi_route(kvm_state, entry->virq,
|
||||
msg, entry->dev);
|
||||
}
|
||||
kvm_irqchip_commit_routes(kvm_state);
|
||||
trace_kvm_x86_update_msi_routes(cnt);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user