Commit 101d3da0 authored Sep 25, 2015 by Eric Auger Committed by Christoffer Dall Oct 22, 2015

KVM: arm/arm64: check power_off in critical section before VCPU run



In case a vcpu off PSCI call is called just after we executed the
vcpu_sleep check, we can enter the guest although power_off
is set. Let's check the power_off state in the critical section,
just before entering the guest.

Signed-off-by: Eric Auger <eric.auger@linaro.org>
Reported-by: Christoffer Dall <christoffer.dall@linaro.org>
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>

parent 4f5f1dc0

arch/arm/kvm/arm.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -560,7 +560,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu vcpu, struct kvm_run run)
		run->exit_reason = KVM_EXIT_INTR;
		}

		if (ret <= 0 \|\| need_new_vmid_gen(vcpu->kvm)) {
		if (ret <= 0 \|\| need_new_vmid_gen(vcpu->kvm) \|\|
		vcpu->arch.power_off) {
		local_irq_enable();
		kvm_timer_sync_hwstate(vcpu);
		kvm_vgic_sync_hwstate(vcpu);

Admin message