KVM: nVMX: Skip PF interception check when queuing during nested run

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>

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 74c525e2c6085716202a5b1c3625b96b490baf31..e10217e99d2c1f395fe1eef98b32c282ac81be69 100644 (file)
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -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) {