diff options
| author | Sean Christopherson <seanjc@google.com> | 2023-08-24 18:36:21 -0700 |
|---|---|---|
| committer | Sean Christopherson <seanjc@google.com> | 2023-10-04 15:08:53 -0700 |
| commit | 00682995409696866fe43984c74c8688bdf8f0a5 (patch) | |
| tree | 54dbef023bf5d0f70c4ec214e386d3eae85f583d /arch/x86/kvm/x86.c | |
| parent | aeb904f6b9f1de588cf3130dc8a2c458b236704e (diff) | |
| download | linux-00682995409696866fe43984c74c8688bdf8f0a5.tar.gz linux-00682995409696866fe43984c74c8688bdf8f0a5.tar.bz2 linux-00682995409696866fe43984c74c8688bdf8f0a5.zip | |
KVM: SVM: Treat all "skip" emulation for SEV guests as outright failures
Treat EMULTYPE_SKIP failures on SEV guests as unhandleable emulation
instead of simply resuming the guest, and drop the hack-a-fix which
effects that behavior for the INT3/INTO injection path. If KVM can't
skip an instruction for which KVM has already done partial emulation,
resuming the guest is undesirable as doing so may corrupt guest state.
Link: https://lore.kernel.org/r/20230825013621.2845700-5-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 104e6b4520a9..cc7d29e9104b 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -8874,8 +8874,13 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, bool writeback = true; r = kvm_check_emulate_insn(vcpu, emulation_type, insn, insn_len); - if (r != X86EMUL_CONTINUE) - return 1; + if (r != X86EMUL_CONTINUE) { + if (r == X86EMUL_RETRY_INSTR || r == X86EMUL_PROPAGATE_FAULT) + return 1; + + WARN_ON_ONCE(r != X86EMUL_UNHANDLEABLE); + return handle_emulation_failure(vcpu, emulation_type); + } vcpu->arch.l1tf_flush_l1d = true; |