GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

arm/arm64: KVM: vgic: Fix error code in kvm_vgic_create()

Browse source 
If we detect another vCPU is running we just exit and return 0 as if we
succesfully created the VGIC, but the VGIC wouldn't actual be created.

This shouldn't break in-kernel behavior because the kernel will not
observe the failed the attempt to create the VGIC, but userspace could
be rightfully confused.

Cc: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Christoffer Dall 2014-11-06 11:47:39 +00:00 • committed by Paolo Bonzini
parent db7dedd0de
commit 6b50f54064
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
virt/kvm/arm/vgic.c
View file

@ -1933,7 +1933,7 @@ out:
int kvm_vgic_create(struct kvm *kvm) int kvm_vgic_create(struct kvm *kvm)
{ {
int i, vcpu_lock_idx = -1, ret = 0; int i, vcpu_lock_idx = -1, ret;
struct kvm_vcpu *vcpu; struct kvm_vcpu *vcpu;
mutex_lock(&kvm->lock); mutex_lock(&kvm->lock);
@ -1948,6 +1948,7 @@ int kvm_vgic_create(struct kvm *kvm)
* vcpu->mutex. By grabbing the vcpu->mutex of all VCPUs we ensure * vcpu->mutex. By grabbing the vcpu->mutex of all VCPUs we ensure
* that no other VCPUs are run while we create the vgic. * that no other VCPUs are run while we create the vgic.
*/ */
ret = -EBUSY;
kvm_for_each_vcpu(i, vcpu, kvm) { kvm_for_each_vcpu(i, vcpu, kvm) {
if (!mutex_trylock(&vcpu->mutex)) if (!mutex_trylock(&vcpu->mutex))
goto out_unlock; goto out_unlock;
@ -1955,11 +1956,10 @@ int kvm_vgic_create(struct kvm *kvm)
} }
kvm_for_each_vcpu(i, vcpu, kvm) { kvm_for_each_vcpu(i, vcpu, kvm) {
if (vcpu->arch.has_run_once) { if (vcpu->arch.has_run_once)
ret = -EBUSY;
goto out_unlock; goto out_unlock;
} }
} ret = 0;
spin_lock_init(&kvm->arch.vgic.lock); spin_lock_init(&kvm->arch.vgic.lock);
kvm->arch.vgic.in_kernel = true; kvm->arch.vgic.in_kernel = true;