|
@@ -353,7 +353,7 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,
|
|
|
int kvm_arch_vcpu_runnable(struct kvm_vcpu *v)
|
|
|
{
|
|
|
return ((!!v->arch.irq_lines || kvm_vgic_vcpu_pending_irq(v))
|
|
|
- && !v->arch.power_off);
|
|
|
+ && !v->arch.power_off && !v->arch.pause);
|
|
|
}
|
|
|
|
|
|
/* Just ensure a guest exit from a particular CPU */
|
|
@@ -479,11 +479,38 @@ bool kvm_arch_intc_initialized(struct kvm *kvm)
|
|
|
return vgic_initialized(kvm);
|
|
|
}
|
|
|
|
|
|
+static void kvm_arm_halt_guest(struct kvm *kvm) __maybe_unused;
|
|
|
+static void kvm_arm_resume_guest(struct kvm *kvm) __maybe_unused;
|
|
|
+
|
|
|
+static void kvm_arm_halt_guest(struct kvm *kvm)
|
|
|
+{
|
|
|
+ int i;
|
|
|
+ struct kvm_vcpu *vcpu;
|
|
|
+
|
|
|
+ kvm_for_each_vcpu(i, vcpu, kvm)
|
|
|
+ vcpu->arch.pause = true;
|
|
|
+ force_vm_exit(cpu_all_mask);
|
|
|
+}
|
|
|
+
|
|
|
+static void kvm_arm_resume_guest(struct kvm *kvm)
|
|
|
+{
|
|
|
+ int i;
|
|
|
+ struct kvm_vcpu *vcpu;
|
|
|
+
|
|
|
+ kvm_for_each_vcpu(i, vcpu, kvm) {
|
|
|
+ wait_queue_head_t *wq = kvm_arch_vcpu_wq(vcpu);
|
|
|
+
|
|
|
+ vcpu->arch.pause = false;
|
|
|
+ wake_up_interruptible(wq);
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
static void vcpu_sleep(struct kvm_vcpu *vcpu)
|
|
|
{
|
|
|
wait_queue_head_t *wq = kvm_arch_vcpu_wq(vcpu);
|
|
|
|
|
|
- wait_event_interruptible(*wq, !vcpu->arch.power_off);
|
|
|
+ wait_event_interruptible(*wq, ((!vcpu->arch.power_off) &&
|
|
|
+ (!vcpu->arch.pause)));
|
|
|
}
|
|
|
|
|
|
static int kvm_vcpu_initialized(struct kvm_vcpu *vcpu)
|
|
@@ -533,7 +560,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
|
|
|
|
|
|
update_vttbr(vcpu->kvm);
|
|
|
|
|
|
- if (vcpu->arch.power_off)
|
|
|
+ if (vcpu->arch.power_off || vcpu->arch.pause)
|
|
|
vcpu_sleep(vcpu);
|
|
|
|
|
|
/*
|
|
@@ -561,7 +588,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
|
|
|
}
|
|
|
|
|
|
if (ret <= 0 || need_new_vmid_gen(vcpu->kvm) ||
|
|
|
- vcpu->arch.power_off) {
|
|
|
+ vcpu->arch.power_off || vcpu->arch.pause) {
|
|
|
local_irq_enable();
|
|
|
kvm_timer_sync_hwstate(vcpu);
|
|
|
kvm_vgic_sync_hwstate(vcpu);
|