diff options
| author | David Hildenbrand <david@redhat.com> | 2017-04-07 10:50:21 +0200 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2017-04-12 20:17:13 +0200 |
| commit | 19d25a0e474b0c69272e17cb6a9106c25eb27c82 (patch) | |
| tree | 9e8ada3b2c63229ea40a3a274fac5c56c97a926f | |
| parent | 8bf463f3ba0eefd2c808fc22c005fc95f1ad48fe (diff) | |
KVM: x86: check against irqchip_mode in pic_in_kernel()
Let's avoid checking against kvm->arch.vpic. We have kvm->arch.irqchip_mode
for that now.
KVM_IRQCHIP_KERNEL implies a fully inititalized pic, while kvm->arch.vpic
might temporarily be set but invalidated again if e.g. kvm_ioapic_init()
fails when setting KVM_CREATE_IRQCHIP. Although current users seem to be
fine, this avoids future bugs.
Signed-off-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
| -rw-r--r-- | arch/x86/kvm/irq.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h index 59e05febc8fb..26d8dd4a4323 100644 --- a/arch/x86/kvm/irq.h +++ b/arch/x86/kvm/irq.h @@ -85,10 +85,11 @@ static inline struct kvm_pic *pic_irqchip(struct kvm *kvm) static inline int pic_in_kernel(struct kvm *kvm) { - int ret; + int mode = kvm->arch.irqchip_mode; - ret = (pic_irqchip(kvm) != NULL); - return ret; + /* Matches smp_wmb() when setting irqchip_mode */ + smp_rmb(); + return mode == KVM_IRQCHIP_KERNEL; } static inline int irqchip_split(struct kvm *kvm) |