Skip to content

Commit

Permalink
KVM: nVMX: Skip PF interception check when queuing during nested run
Browse files Browse the repository at this point in the history
While a nested run is pending, vmx_queue_exception is only called to
requeue exceptions that were previously picked up via
vmx_cancel_injection. Therefore, we must not check for PF interception
by L1, possibly causing a bogus nested vmexit.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
  • Loading branch information
Jan Kiszka authored and Gleb Natapov committed Apr 28, 2013
1 parent cbf6435 commit 5a2892c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/x86/kvm/vmx.c
Original file line number Diff line number Diff line change
Expand Up @@ -1917,7 +1917,7 @@ static void vmx_queue_exception(struct kvm_vcpu *vcpu, unsigned nr,
u32 intr_info = nr | INTR_INFO_VALID_MASK;

if (nr == PF_VECTOR && is_guest_mode(vcpu) &&
nested_pf_handled(vcpu))
!vmx->nested.nested_run_pending && nested_pf_handled(vcpu))
return;

if (has_error_code) {
Expand Down

0 comments on commit 5a2892c

Please sign in to comment.