Skip to content

Commit 26844fe

Browse files
committed
KVM: x86: never write to memory from kvm_vcpu_check_block()
kvm_vcpu_check_block() is called while not in TASK_RUNNING, and therefore it cannot sleep. Writing to guest memory is therefore forbidden, but it can happen on AMD processors if kvm_check_nested_events() causes a vmexit. Fortunately, all events that are caught by kvm_check_nested_events() are also recognized by kvm_vcpu_has_events() through vendor callbacks such as kvm_x86_interrupt_allowed() or kvm_x86_ops.nested_ops->has_events(), so remove the call and postpone the actual processing to vcpu_block(). Opportunistically honor the return of kvm_check_nested_events(). KVM punted on the check in kvm_vcpu_running() because the only error path is if vmx_complete_nested_posted_interrupt() fails, in which case KVM exits to userspace with "internal error" i.e. the VM is likely dead anyways so it wasn't worth overloading the return of kvm_vcpu_running(). Add the check mostly so that KVM is consistent with itself; the return of the call via kvm_apic_accept_events()=>kvm_check_nested_events() that immediately follows _is_ checked. Reported-by: Maxim Levitsky <mlevitsk@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> [sean: check and handle return of kvm_check_nested_events()] Signed-off-by: Sean Christopherson <seanjc@google.com> Message-Id: <20220921003201.1441511-11-seanjc@google.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
1 parent 1e17a6f commit 26844fe

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

arch/x86/kvm/x86.c

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10817,6 +10817,17 @@ static inline int vcpu_block(struct kvm_vcpu *vcpu)
1081710817
return 1;
1081810818
}
1081910819

10820+
/*
10821+
* Evaluate nested events before exiting the halted state. This allows
10822+
* the halt state to be recorded properly in the VMCS12's activity
10823+
* state field (AMD does not have a similar field and a VM-Exit always
10824+
* causes a spurious wakeup from HLT).
10825+
*/
10826+
if (is_guest_mode(vcpu)) {
10827+
if (kvm_check_nested_events(vcpu) < 0)
10828+
return 0;
10829+
}
10830+
1082010831
if (kvm_apic_accept_events(vcpu) < 0)
1082110832
return 0;
1082210833
switch(vcpu->arch.mp_state) {
@@ -10839,9 +10850,6 @@ static inline int vcpu_block(struct kvm_vcpu *vcpu)
1083910850

1084010851
static inline bool kvm_vcpu_running(struct kvm_vcpu *vcpu)
1084110852
{
10842-
if (is_guest_mode(vcpu))
10843-
kvm_check_nested_events(vcpu);
10844-
1084510853
return (vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE &&
1084610854
!vcpu->arch.apf.halted);
1084710855
}

0 commit comments

Comments
 (0)