[11/21] KVM: VMX: Inject #PF on ENCLS as "emulated" #PF

Message ID	20220311032801.3467418-12-seanjc@google.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <kvm-owner@kernel.org> Reply-To: Sean Christopherson <seanjc@google.com> Date: Fri, 11 Mar 2022 03:27:51 +0000 In-Reply-To: <20220311032801.3467418-1-seanjc@google.com> Message-Id: <20220311032801.3467418-12-seanjc@google.com> Mime-Version: 1.0 References: <20220311032801.3467418-1-seanjc@google.com> Subject: [PATCH 11/21] KVM: VMX: Inject #PF on ENCLS as "emulated" #PF From: Sean Christopherson <seanjc@google.com> To: Paolo Bonzini <pbonzini@redhat.com> Cc: Sean Christopherson <seanjc@google.com>, Vitaly Kuznetsov <vkuznets@redhat.com>, Wanpeng Li <wanpengli@tencent.com>, Jim Mattson <jmattson@google.com>, Joerg Roedel <joro@8bytes.org>, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Oliver Upton <oupton@google.com>, Peter Shier <pshier@google.com> Content-Type: text/plain; charset="UTF-8" Precedence: bulk
Series	KVM: x86: Event/exception fixes and cleanups \| expand [00/21] KVM: x86: Event/exception fixes and cleanups [01/21] KVM: x86: Return immediately from x86_emulate_instruction() on code #DB [02/21] KVM: nVMX: Unconditionally purge queued/injected events on nested "exit" [03/21] KVM: VMX: Drop bits 31:16 when shoving exception error code into VMCS [04/21] KVM: x86: Don't check for code breakpoints when emulating on exception [05/21] KVM: nVMX: Treat General Detect #DB (DR7.GD=1) as fault-like [06/21] KVM: nVMX: Prioritize TSS T-flag #DBs over Monitor Trap Flag [07/21] KVM: x86: Treat #DBs from the emulator as fault-like (code and DR7.GD=1) [08/21] KVM: x86: Use DR7_GD macro instead of open coding check in emulator [09/21] KVM: nVMX: Ignore SIPI that arrives in L2 when vCPU is not in WFS [10/21] KVM: nVMX: Unconditionally clear mtf_pending on nested VM-Exit [11/21] KVM: VMX: Inject #PF on ENCLS as "emulated" #PF [12/21] KVM: x86: Rename kvm_x86_ops.queue_exception to inject_exception [13/21] KVM: x86: Make kvm_queued_exception a properly named, visible struct [14/21] KVM: x86: Formalize blocking of nested pending exceptions [15/21] KVM: x86: Use kvm_queue_exception_e() to queue #DF [16/21] KVM: x86: Hoist nested event checks above event injection logic [17/21] KVM: x86: Evaluate ability to inject SMI/NMI/IRQ after potential VM-Exit [18/21] KVM: x86: Morph pending exceptions to pending VM-Exits at queue time [19/21] KVM: VMX: Update MTF and ICEBP comments to document KVM's subtle behavior [20/21] KVM: selftests: Use uapi header to get VMX and SVM exit reasons/codes [21/21] KVM: selftests: Add an x86-only test to verify nested exception queueing

Message ID

20220311032801.3467418-12-seanjc@google.com (mailing list archive)

State

New, archived

Headers

Reply-To: Sean Christopherson <seanjc@google.com>
Date: Fri, 11 Mar 2022 03:27:51 +0000
In-Reply-To: <20220311032801.3467418-1-seanjc@google.com>
Message-Id: <20220311032801.3467418-12-seanjc@google.com>
Mime-Version: 1.0
References: <20220311032801.3467418-1-seanjc@google.com>
Subject: [PATCH 11/21] KVM: VMX: Inject #PF on ENCLS as "emulated" #PF
From: Sean Christopherson <seanjc@google.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: Sean Christopherson <seanjc@google.com>,
        Vitaly Kuznetsov <vkuznets@redhat.com>,
        Wanpeng Li <wanpengli@tencent.com>,
        Jim Mattson <jmattson@google.com>,
        Joerg Roedel <joro@8bytes.org>, kvm@vger.kernel.org,
        linux-kernel@vger.kernel.org, Oliver Upton <oupton@google.com>,
        Peter Shier <pshier@google.com>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

Series

KVM: x86: Event/exception fixes and cleanups | expand

Commit Message

Sean Christopherson March 11, 2022, 3:27 a.m. UTC

Treat #PFs that occur during emulation of ENCLS as, wait for it, emulated
page faults.  Practically speaking, this is a glorified nop as the
exception is never of the nested flavor, and it's extremely unlikely the
guest is relying on the side effect of an implicit INVLPG on the faulting
address.

Fixes: 70210c044b4e ("KVM: VMX: Add SGX ENCLS[ECREATE] handler to enforce CPUID restrictions")
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
 arch/x86/kvm/vmx/sgx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kvm/vmx/sgx.c b/arch/x86/kvm/vmx/sgx.c
index 35e7ec91ae86..966cfa228f2a 100644
--- a/arch/x86/kvm/vmx/sgx.c
+++ b/arch/x86/kvm/vmx/sgx.c
@@ -129,7 +129,7 @@  static int sgx_inject_fault(struct kvm_vcpu *vcpu, gva_t gva, int trapnr)
 		ex.address = gva;
 		ex.error_code_valid = true;
 		ex.nested_page_fault = false;
-		kvm_inject_page_fault(vcpu, &ex);
+		kvm_inject_emulated_page_fault(vcpu, &ex);
 	} else {
 		kvm_inject_gp(vcpu, 0);
 	}

[11/21] KVM: VMX: Inject #PF on ENCLS as "emulated" #PF

Commit Message

Patch