Skip to content

KVM: x86: Remove emulation_result enums

Sean Christopherson kvm lkml 2 versions – Applied

Status from this message: Queued, thanks (a couple conflicts had to be sorted out, but nothing

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest14 patches 7 repliesApplied
  2. v113 patches 19 repliesSuperseded

Changes in v2 from the cover letter

- Collect reviews. [Vitaly and Liran]
- Squash VMware emultype changes into a single patch. [Liran]
- Add comments in VMX/SVM for VMware #GP handling. [Vitaly]
- Tack on the EPT misconfig bug fix.
- Add a patch to comment/document the emultypes. [Liran]

Patches in v2 Applied

#Subject and filesSizeRepliesApplied
1/14KVM: x86: Relocate MMIO exit stats countingarch/x86/kvm/mmu.c arch/x86/kvm/vmx/vmx.c arch/x86/kvm/x86.c+2 -30 replies
2/14KVM: x86: Clean up handle_emulation_failure()arch/x86/kvm/x86.c+4 -60 replies
3/14KVM: x86: Refactor kvm_vcpu_do_singlestep() to remove out paramarch/x86/kvm/x86.c+6 -61 reply
4/14KVM: x86: Don't attempt VMWare emulation on #GP with non-zero error codearch/x86/kvm/svm.c arch/x86/kvm/vmx/vmx.c+20 -20 replies
5/14KVM: x86: Move #GP injection for VMware into x86_emulate_instruction()arch/x86/include/asm/kvm_host.h arch/x86/kvm/svm.c arch/x86/kvm/vmx/vmx.c +1 more+14 -231 reply
6/14KVM: x86: Add explicit flag for forced emulation on #UDarch/x86/include/asm/kvm_host.h arch/x86/kvm/x86.c+4 -20 replies
7/14KVM: x86: Move #UD injection for failed emulation into emulation codearch/x86/kvm/x86.c+5 -90 replies
8/14KVM: x86: Exit to userspace on emulation skip failurearch/x86/kvm/svm.c arch/x86/kvm/x86.c+9 -40 replies
9/14KVM: x86: Handle emulation failure directly in kvm_task_switch()arch/x86/kvm/svm.c arch/x86/kvm/vmx/vmx.c arch/x86/kvm/x86.c+11 -230 replies
10/14KVM: x86: Move triple fault request into RM int injectionarch/x86/kvm/vmx/vmx.c arch/x86/kvm/x86.c arch/x86/kvm/x86.h+12 -160 replies
11/14KVM: VMX: Remove EMULATE_FAIL handling in handle_invalid_guest_state()arch/x86/kvm/vmx/vmx.c+19 -200 replies
12/14KVM: x86: Remove emulation_result enums, EMULATE_{DONE,FAIL,USER_EXIT}arch/x86/include/asm/kvm_host.h arch/x86/kvm/mmu.c arch/x86/kvm/svm.c +2 more+49 -780 replies
13/14KVM: VMX: Handle single-step #DB for EMULTYPE_SKIP on EPT misconfigarch/x86/kvm/svm.c arch/x86/kvm/vmx/vmx.c arch/x86/kvm/x86.c+36 -390 replies
14/14KVM: x86: Add comments to document various emulation typesarch/x86/include/asm/kvm_host.h+30 -00 replies

Reviews trailers per patch

5 of 14 patches have a Reviewed-by or Acked-by.

PatchVitaly KuznetsovLiran Alon
1/14R-b
2/14R-b R-b
3/14R-b R-b
4/14Reviewed-and-tested-by R-b
5/14R-b
6/14
7/14
8/14
9/14
10/14
11/14
12/14
13/14
14/14

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

Read the v2 thread

Cover letter [PATCH v2 00/14] KVM: x86: Remove emulation_result enums

Rework the emulator and its users to handle failure scenarios entirely within the emulator.

{x86,kvm}_emulate_instruction() currently returns a tri-state value to indicate success/continue, userspace exit needed, and failure. The intent of returning EMULATE_FAIL is to let the caller handle failure in a manner that is appropriate for the current context. In practice, the emulator has ended up with a mixture of failure handling, i.e. whether or not the emulator takes action on failure is dependent on the specific flavor of emulation.

The mixed handling has proven to be rather fragile, e.g. many flows incorrectly assume their specific flavor of emulation cannot fail or that the emulator sets state to report the failure back to userspace.

Move everything inside the emulator, piece by piece, so that the emulation routines can return '0' for exit to userspace and '1' for resume the guest, just like every other VM-Exit handler.

Patch 13/14 is a tangentially related bug fix that conflicts heavily with this series, so I tacked it on here.

Patch 14/14 documents the emulation types. I added it as a separate patch at the very end so that the comments could reference the final state of the code base, e.g. incorporate the rule change for using EMULTYPE_SKIP that is introduced in patch 13/14.

v1:
- https://patchwork.kernel.org/cover/11110331/

v2:
- Collect reviews. [Vitaly and Liran]
- Squash VMware emultype changes into a single patch. [Liran]
- Add comments in VMX/SVM for VMware #GP handling. [Vitaly]
- Tack on the EPT misconfig bug fix.
- Add a patch to comment/document the emultypes. [Liran]

Sean Christopherson (14):
KVM: x86: Relocate MMIO exit stats counting
KVM: x86: Clean up handle_emulation_failure()
KVM: x86: Refactor kvm_vcpu_do_singlestep() to remove out param
KVM: x86: Don't attempt VMWare emulation on #GP with non-zero error
code
KVM: x86: Move #GP injection for VMware into x86_emulate_instruction()
KVM: x86: Add explicit flag for forced emulation on #UD
KVM: x86: Move #UD injection for failed emulation into emulation code
KVM: x86: Exit to userspace on emulation skip failure
KVM: x86: Handle emulation failure directly in kvm_task_switch()
KVM: x86: Move triple fault request into RM int injection
KVM: VMX: Remove EMULATE_FAIL handling in handle_invalid_guest_state()
KVM: x86: Remove emulation_result enums, EMULATE_{DONE,FAIL,USER_EXIT}
KVM: VMX: Handle single-step #DB for EMULTYPE_SKIP on EPT misconfig
KVM: x86: Add comments to document various emulation types

 arch/x86/include/asm/kvm_host.h |  40 +++++++--
 arch/x86/kvm/mmu.c              |  16 +---
 arch/x86/kvm/svm.c              |  62 ++++++--------
 arch/x86/kvm/vmx/vmx.c          | 147 +++++++++++++-------------------
 arch/x86/kvm/x86.c              | 133 ++++++++++++++++-------------
 arch/x86/kvm/x86.h              |   2 +-
 6 files changed, 195 insertions(+), 205 deletions(-)
Signature · 1 line
2.22.0