diff mbox series

[v4,10/24] KVM: VMX: Inject #PF on ENCLS as "emulated" #PF

Message ID	20220723005137.1649592-11-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: Sat, 23 Jul 2022 00:51:23 +0000 In-Reply-To: <20220723005137.1649592-1-seanjc@google.com> Message-Id: <20220723005137.1649592-11-seanjc@google.com> Mime-Version: 1.0 References: <20220723005137.1649592-1-seanjc@google.com> Subject: [PATCH v4 10/24] KVM: VMX: Inject #PF on ENCLS as "emulated" #PF From: Sean Christopherson <seanjc@google.com> To: Sean Christopherson <seanjc@google.com>, Paolo Bonzini <pbonzini@redhat.com> Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Jim Mattson <jmattson@google.com>, Maxim Levitsky <mlevitsk@redhat.com>, 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 [v4,00/24] KVM: x86: Event/exception fixes and cleanups [v4,01/24] KVM: nVMX: Unconditionally purge queued/injected events on nested "exit" [v4,02/24] KVM: VMX: Drop bits 31:16 when shoving exception error code into VMCS [v4,03/24] KVM: x86: Don't check for code breakpoints when emulating on exception [v4,04/24] KVM: nVMX: Treat General Detect #DB (DR7.GD=1) as fault-like [v4,05/24] KVM: nVMX: Prioritize TSS T-flag #DBs over Monitor Trap Flag [v4,06/24] KVM: x86: Treat #DBs from the emulator as fault-like (code and DR7.GD=1) [v4,07/24] KVM: x86: Use DR7_GD macro instead of open coding check in emulator [v4,08/24] KVM: nVMX: Ignore SIPI that arrives in L2 when vCPU is not in WFS [v4,09/24] KVM: nVMX: Unconditionally clear mtf_pending on nested VM-Exit [v4,10/24] KVM: VMX: Inject #PF on ENCLS as "emulated" #PF [v4,11/24] KVM: x86: Rename kvm_x86_ops.queue_exception to inject_exception [v4,12/24] KVM: x86: Make kvm_queued_exception a properly named, visible struct [v4,13/24] KVM: x86: Formalize blocking of nested pending exceptions [v4,14/24] KVM: x86: Use kvm_queue_exception_e() to queue #DF [v4,15/24] KVM: x86: Hoist nested event checks above event injection logic [v4,16/24] KVM: x86: Evaluate ability to inject SMI/NMI/IRQ after potential VM-Exit [v4,17/24] KVM: nVMX: Add a helper to identify low-priority #DB traps [v4,18/24] KVM: nVMX: Document priority of all known events on Intel CPUs [v4,19/24] KVM: x86: Morph pending exceptions to pending VM-Exits at queue time [v4,20/24] KVM: x86: Treat pending TRIPLE_FAULT requests as pending exceptions [v4,21/24] KVM: VMX: Update MTF and ICEBP comments to document KVM's subtle behavior [v4,22/24] KVM: x86: Rename inject_pending_events() to kvm_check_and_inject_events() [v4,23/24] KVM: selftests: Use uapi header to get VMX and SVM exit reasons/codes [v4,24/24] KVM: selftests: Add an x86-only test to verify nested exception queueing

Commit Message

Sean Christopherson July 23, 2022, 12:51 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>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
---
 arch/x86/kvm/vmx/sgx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/arch/x86/kvm/vmx/sgx.c b/arch/x86/kvm/vmx/sgx.c
index aba8cebdc587..8f95c7c01433 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);
 	}