mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 03:36:19 +00:00
KVM: Fix unlikely kvm_create vs decache_vcpus_on_cpu race
We add the kvm to the vm_list before initializing the vcpu mutexes, which can be mutex_trylock()'ed by decache_vcpus_on_cpu(). Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Avi Kivity <avi@qumranet.com>
This commit is contained in:
parent
b0fcd903e6
commit
5e58cfe41c
1 changed files with 3 additions and 3 deletions
|
@ -297,9 +297,6 @@ static struct kvm *kvm_create_vm(void)
|
|||
kvm_io_bus_init(&kvm->pio_bus);
|
||||
spin_lock_init(&kvm->lock);
|
||||
INIT_LIST_HEAD(&kvm->active_mmu_pages);
|
||||
spin_lock(&kvm_lock);
|
||||
list_add(&kvm->vm_list, &vm_list);
|
||||
spin_unlock(&kvm_lock);
|
||||
kvm_io_bus_init(&kvm->mmio_bus);
|
||||
for (i = 0; i < KVM_MAX_VCPUS; ++i) {
|
||||
struct kvm_vcpu *vcpu = &kvm->vcpus[i];
|
||||
|
@ -309,6 +306,9 @@ static struct kvm *kvm_create_vm(void)
|
|||
vcpu->kvm = kvm;
|
||||
vcpu->mmu.root_hpa = INVALID_PAGE;
|
||||
}
|
||||
spin_lock(&kvm_lock);
|
||||
list_add(&kvm->vm_list, &vm_list);
|
||||
spin_unlock(&kvm_lock);
|
||||
return kvm;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue