[RESEND,00/13] KVM: x86: Remove emulation_result enums
mbox series

Message ID 20190823010709.24879-1-sean.j.christopherson@intel.com
Headers show
  • KVM: x86: Remove emulation_result enums
Related show


Sean Christopherson Aug. 23, 2019, 1:06 a.m. UTC
Rework the emulator and its users to handle failure scenarios entirely
within the emulator.

{x86,kvm}_emulate_instruction() currently return 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.

Paolo/Radim/Vitaly, apologies for the resend, forgot to cc kvm, lkml
and reviewers.

Sean Christopherson (13):
  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: Drop EMULTYPE_NO_UD_ON_FAIL as a standalone type
  KVM: x86: Don't attempt VMWare emulation on #GP with non-zero error
  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}

 arch/x86/include/asm/kvm_host.h |  10 +--
 arch/x86/kvm/mmu.c              |  16 +---
 arch/x86/kvm/svm.c              |  41 ++++-------
 arch/x86/kvm/vmx/vmx.c          |  92 +++++++++--------------
 arch/x86/kvm/x86.c              | 127 +++++++++++++++++---------------
 arch/x86/kvm/x86.h              |   2 +-
 6 files changed, 121 insertions(+), 167 deletions(-)