Skip to content

Commit 704fc60

Browse files
iorlov-devsean-jc
authored andcommitted
KVM: x86: Try to unprotect and retry on unhandleable emulation failure
If emulation is "rejected" by check_emulate_instruction(), try to unprotect and retry instruction execution before reporting the error to userspace. Currently, check_emulate_instruction() never signals failure when "unprotect and retry" is possible, but that will change in the future as both VMX and SVM will reject emulation due to coincident exception vectoring. E.g. if there is a write to a shadowed page table when vectoring an event, then unprotecting the gfn and retrying the instruction will allow the guest to make forward progress in most cases, i.e. will allow the vCPU to keep running instead of returning an error to userspace. This ensures that the subsequent patches won't make KVM exit to userspace when handling an intercepted #PF during vectoring without checking whether unprotect and retry is possible. Suggested-by: Sean Christopherson <seanjc@google.com> Signed-off-by: Ivan Orlov <iorlov@amazon.com> Link: https://lore.kernel.org/r/20241217181458.68690-4-iorlov@amazon.com [sean: massage changelog to clarify this is a nop for the current code] Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent 5c9cfc4 commit 704fc60

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

arch/x86/kvm/x86.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9098,6 +9098,10 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa,
90989098
if (r == X86EMUL_RETRY_INSTR || r == X86EMUL_PROPAGATE_FAULT)
90999099
return 1;
91009100

9101+
if (kvm_unprotect_and_retry_on_failure(vcpu, cr2_or_gpa,
9102+
emulation_type))
9103+
return 1;
9104+
91019105
if (r == X86EMUL_UNHANDLEABLE_VECTORING) {
91029106
kvm_prepare_event_vectoring_exit(vcpu, cr2_or_gpa);
91039107
return 0;

0 commit comments

Comments
 (0)