diff options
author | Avi Kivity <avi@redhat.com> | 2012-03-05 14:23:29 +0200 |
---|---|---|
committer | Willy Tarreau <w@1wt.eu> | 2012-10-07 23:37:24 +0200 |
commit | ac802e6ad84584366c71aa925d580383b1578409 (patch) | |
tree | 7ff601e7c538854539530f2c61b06ac0bc78e29a /include | |
parent | 49ef5906f1fff5dfc01561e8355561a512ac9b85 (diff) |
KVM: Ensure all vcpus are consistent with in-kernel irqchip settings
commit 3e515705a1f46beb1c942bb8043c16f8ac7b1e9e upstream
If some vcpus are created before KVM_CREATE_IRQCHIP, then
irqchip_in_kernel() and vcpu->arch.apic will be inconsistent, leading
to potential NULL pointer dereferences.
Fix by:
- ensuring that no vcpus are installed when KVM_CREATE_IRQCHIP is called
- ensuring that a vcpu has an apic if it is installed after KVM_CREATE_IRQCHIP
This is somewhat long winded because vcpu->arch.apic is created without
kvm->lock held.
Based on earlier patch by Michael Ellerman.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Avi Kivity <avi@redhat.com>
[dannf: backported to Debian's 2.6.32]
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/kvm_host.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index c728a50f8dab..8bfed5769697 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -556,5 +556,12 @@ static inline bool kvm_vcpu_is_bsp(struct kvm_vcpu *vcpu) { return vcpu->kvm->bsp_vcpu_id == vcpu->vcpu_id; } + +bool kvm_vcpu_compatible(struct kvm_vcpu *vcpu); + +#else + +static inline bool kvm_vcpu_compatible(struct kvm_vcpu *vcpu) { return true; } + #endif #endif |