From: Christoffer Dall Date: Wed, 29 Nov 2017 16:05:16 +0000 (+0100) Subject: KVM: arm/arm64: Avoid attempting to load timer vgic state without a vgic X-Git-Tag: v4.15~225^2~6^2~4 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=22601127c0faa5db70ab88f23af11cb23c8f6cdf;p=mirror_ubuntu-bionic-kernel.git KVM: arm/arm64: Avoid attempting to load timer vgic state without a vgic The timer optimization patches inadvertendly changed the logic to always load the timer state as if we have a vgic, even if we don't have a vgic. Fix this by doing the usual irqchip_in_kernel() check and call the appropriate load function. Signed-off-by: Christoffer Dall --- diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c index 190c99ed1b73..f9555b1e7f15 100644 --- a/virt/kvm/arm/arch_timer.c +++ b/virt/kvm/arm/arch_timer.c @@ -835,7 +835,10 @@ int kvm_timer_enable(struct kvm_vcpu *vcpu) no_vgic: preempt_disable(); timer->enabled = 1; - kvm_timer_vcpu_load_vgic(vcpu); + if (!irqchip_in_kernel(vcpu->kvm)) + kvm_timer_vcpu_load_user(vcpu); + else + kvm_timer_vcpu_load_vgic(vcpu); preempt_enable(); return 0;