Skip to content

KVM: SVM: Fix and clean up "can emulate" mess

Sean Christopherson kvm lkml 1 version Applied

Status from this message: Queued, thanks.

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest9 patches 15 repliesApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/9KVM: SVM: Never reject emulation due to SMAP errata for !SEV guestsarch/x86/kvm/svm/svm.c+6 -41 reply
2/9Revert "KVM: SVM: avoid infinite loop on NPF from bad address"arch/x86/kvm/svm/svm.c virt/kvm/kvm_main.c+0 -81 reply
3/9KVM: SVM: Don't intercept #GP for SEV guestsarch/x86/kvm/svm/svm.c+8 -32 replies
4/9KVM: SVM: Explicitly require DECODEASSISTS to enable SEV supportarch/x86/kvm/svm/sev.c+7 -21 reply
5/9KVM: x86: Pass emulation type to can_emulate_instruction()arch/x86/include/asm/kvm_host.h arch/x86/kvm/svm/svm.c arch/x86/kvm/vmx/vmx.c +1 more+17 -71 reply
6/9KVM: SVM: WARN if KVM attempts emulation on #UD or #GP for SEV guestsarch/x86/kvm/svm/svm.c+3 -03 replies
7/9KVM: SVM: Inject #UD on attempted emulation for SEV guest w/o insn bufferarch/x86/kvm/svm/svm.c+55 -341 reply
8/9KVM: SVM: Don't apply SEV+SMAP workaround on code fetch or PT accessarch/x86/kvm/svm/svm.c+34 -91 reply
9/9KVM: SVM: Don't kill SEV guest if SMAP erratum triggers in usermodearch/x86/kvm/svm/svm.c+15 -11 reply

Reviews trailers per patch

All 9 patches have a Reviewed-by or Acked-by.

PatchLiam Merwick
SeriesT-b
1/9R-b
2/9R-b
3/9R-b
4/9R-b
5/9R-b
6/9R-b
7/9R-b
8/9R-b
9/9R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 0/9] KVM: SVM: Fix and clean up "can emulate" mess

Revert an amusing/embarassing goof reported by Liam Merwick, where KVM attempts to determine if RIP is backed by a valid memslot without first translating RIP to its associated GPA/GFN. Fix the underlying bug that was "fixed" by the misguided memslots check by (a) never rejecting emulation for !SEV guests and (b) using the #NPF error code to determine if the fault happened on the code fetch or on guest page tables, which is effectively what the memslots check attempted to do.

Further clean up, harden, and document SVM's "can emulate" helper, and fix a #GP interception SEV bug found in the process of doing so.

Sean Christopherson (9):
KVM: SVM: Never reject emulation due to SMAP errata for !SEV guests Revert "KVM: SVM: avoid infinite loop on NPF from bad address"
KVM: SVM: Don't intercept #GP for SEV guests
KVM: SVM: Explicitly require DECODEASSISTS to enable SEV support
KVM: x86: Pass emulation type to can_emulate_instruction()
KVM: SVM: WARN if KVM attempts emulation on #UD or #GP for SEV guests
KVM: SVM: Inject #UD on attempted emulation for SEV guest w/o insn
buffer
KVM: SVM: Don't apply SEV+SMAP workaround on code fetch or PT access
KVM: SVM: Don't kill SEV guest if SMAP erratum triggers in usermode

 arch/x86/include/asm/kvm_host.h |   3 +-
 arch/x86/kvm/svm/sev.c          |   9 +-
 arch/x86/kvm/svm/svm.c          | 162 ++++++++++++++++++++++----------
 arch/x86/kvm/vmx/vmx.c          |   7 +-
 arch/x86/kvm/x86.c              |  11 ++-
 virt/kvm/kvm_main.c             |   1 -
 6 files changed, 135 insertions(+), 58 deletions(-)

base-commit: edb9e50dbe18394d0fc9d0494f5b6046fc912d33

Signature · 1 line
2.34.1.703.g22d0c6ccf7-goog