Skip to content

KVM: SVM: Fix unexpected #UD on INT3 in SEV guests

Sean Christopherson kvm lkml 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest4 patches 5 repliesIn review
  2. v12 patches 7 repliesSuperseded

Changes in v2 from the cover letter

- Actually fix the bug. [Tom]
- Do the bigger cleanup I avoided in v1.

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/4KVM: SVM: Don't inject #UD if KVM attempts to skip SEV guest insnarch/x86/kvm/svm/svm.c+27 -80 replies
2/4KVM: SVM: Require nrips support for SEV guests (and beyond)arch/x86/kvm/svm/sev.c arch/x86/kvm/svm/svm.c arch/x86/kvm/svm/svm.h+6 -80 replies
3/4KVM: x86: Refactor can_emulate_instruction() return to be more expressivearch/x86/include/asm/kvm-x86-ops.h arch/x86/include/asm/kvm_host.h arch/x86/kvm/svm/svm.c +2 more+35 -290 replies
4/4KVM: SVM: Treat all "skip" emulation for SEV guests as outright failuresarch/x86/kvm/svm/svm.c arch/x86/kvm/x86.c+8 -132 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 0/4] KVM: SVM: Fix unexpected #UD on INT3 in SEV guests

Fix a bug where KVM injects a bogus #UD for SEV guests when trying to skip an INT3 as part of re-injecting the associated #BP that got kinda sorta intercepted due to a #NPF occuring while vectoring/delivering the #BP.

Patch 1 is the main fix. It's a little ugly, but suitable for backporting.

Patch 2 is a tangentially related cleanup to make NRIPS a requirement for enabling SEV, e.g. so that we don't ever get "bug" reports of SEV guests not working when NRIPS is disabled.

Patches 3 and 4 clean up the hack from patch 1, but are most definitely not stable material (hence the slightly ugly fix).

Verified the original bug by toggling the NX hugepage mitigation to force a #NPF when devliering #BP in the guest.

v2:
- Actually fix the bug. [Tom]
- Do the bigger cleanup I avoided in v1.

v1: https://lore.kernel.org/all/[email protected]

Sean Christopherson (4):
KVM: SVM: Don't inject #UD if KVM attempts to skip SEV guest insn
KVM: SVM: Require nrips support for SEV guests (and beyond)
KVM: x86: Refactor can_emulate_instruction() return to be more
expressive
KVM: SVM: Treat all "skip" emulation for SEV guests as outright
failures

 arch/x86/include/asm/kvm-x86-ops.h |  2 +-
 arch/x86/include/asm/kvm_host.h    |  4 +--
 arch/x86/kvm/svm/sev.c             |  2 +-
 arch/x86/kvm/svm/svm.c             | 55 +++++++++++++++++-------------
 arch/x86/kvm/svm/svm.h             |  1 +
 arch/x86/kvm/vmx/vmx.c             | 12 +++----
 arch/x86/kvm/x86.c                 | 22 ++++++++----
 7 files changed, 58 insertions(+), 40 deletions(-)

base-commit: fff2e47e6c3b8050ca26656693caa857e3a8b740

Signature · 1 line
2.42.0.rc2.253.gd59a3bf2b4-goog