Skip to content

Commit 7d9a027

Browse files
Keir FraserMarc Zyngier
authored andcommitted
KVM: Avoid synchronize_srcu() in kvm_io_bus_register_dev()
Device MMIO registration may happen quite frequently during VM boot, and the SRCU synchronization each time has a measurable effect on VM startup time. In our experiments it can account for around 25% of a VM's startup time. Replace the synchronization with a deferred free of the old kvm_io_bus structure. Tested-by: Li RongQing <lirongqing@baidu.com> Signed-off-by: Keir Fraser <keirf@google.com> Signed-off-by: Marc Zyngier <maz@kernel.org>
1 parent 7788255 commit 7d9a027

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

include/linux/kvm_host.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ struct kvm_io_range {
206206
struct kvm_io_bus {
207207
int dev_count;
208208
int ioeventfd_count;
209+
struct rcu_head rcu;
209210
struct kvm_io_range range[];
210211
};
211212

virt/kvm/kvm_main.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1320,6 +1320,7 @@ static void kvm_destroy_vm(struct kvm *kvm)
13201320
kvm_free_memslots(kvm, &kvm->__memslots[i][1]);
13211321
}
13221322
cleanup_srcu_struct(&kvm->irq_srcu);
1323+
srcu_barrier(&kvm->srcu);
13231324
cleanup_srcu_struct(&kvm->srcu);
13241325
#ifdef CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES
13251326
xa_destroy(&kvm->mem_attr_array);
@@ -5952,6 +5953,13 @@ int kvm_io_bus_read(struct kvm_vcpu *vcpu, enum kvm_bus bus_idx, gpa_t addr,
59525953
}
59535954
EXPORT_SYMBOL_GPL(kvm_io_bus_read);
59545955

5956+
static void __free_bus(struct rcu_head *rcu)
5957+
{
5958+
struct kvm_io_bus *bus = container_of(rcu, struct kvm_io_bus, rcu);
5959+
5960+
kfree(bus);
5961+
}
5962+
59555963
int kvm_io_bus_register_dev(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr,
59565964
int len, struct kvm_io_device *dev)
59575965
{
@@ -5990,8 +5998,7 @@ int kvm_io_bus_register_dev(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr,
59905998
memcpy(new_bus->range + i + 1, bus->range + i,
59915999
(bus->dev_count - i) * sizeof(struct kvm_io_range));
59926000
rcu_assign_pointer(kvm->buses[bus_idx], new_bus);
5993-
synchronize_srcu_expedited(&kvm->srcu);
5994-
kfree(bus);
6001+
call_srcu(&kvm->srcu, &bus->rcu, __free_bus);
59956002

59966003
return 0;
59976004
}

0 commit comments

Comments
 (0)