We only want to do things like invalidating TLBs or load timer state onto the physical CPU if we really intend to run the VCPU, not if we are simply retrieving some in-kernel value from userspace, for example. Signed-off-by: Christoffer Dall <christoffer.dall@xxxxxxxxxx> --- virt/kvm/arm/arm.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c index 6e9513e..d495453 100644 --- a/virt/kvm/arm/arm.c +++ b/virt/kvm/arm/arm.c @@ -338,6 +338,9 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) { int *last_ran; + if (vcpu->ioctl != KVM_RUN) + return; + last_ran = this_cpu_ptr(vcpu->kvm->arch.last_vcpu_ran); /* @@ -359,6 +362,9 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu) { + if (vcpu->ioctl != KVM_RUN) + return; + kvm_timer_vcpu_put(vcpu); kvm_vgic_put(vcpu); -- 2.9.0