KVM: X86: Introduce handle_ud()

Introduce handle_ud() to handle invalid opcode, this function will be
used by later patches.

Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: Liran Alon <liran.alon@oracle.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim KrÄmář <rkrcmar@redhat.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Liran Alon <liran.alon@oracle.com>
Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

4 files changed, 18 insertions, 16 deletions

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index f66fc2ee9058..e0a3f56a791d 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -2676,14 +2676,7 @@ static int bp_interception(struct vcpu_svm *svm)
 
 static int ud_interception(struct vcpu_svm *svm)
 {
-        int er;
-
-        er = emulate_instruction(&svm->vcpu, EMULTYPE_TRAP_UD);
-        if (er == EMULATE_USER_EXIT)
-                return 0;
-        if (er != EMULATE_DONE)
-                kvm_queue_exception(&svm->vcpu, UD_VECTOR);
-        return 1;
+        return handle_ud(&svm->vcpu);
 }
 
 static int ac_interception(struct vcpu_svm *svm)
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index a1572461786e..59d91516a622 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -6434,14 +6434,8 @@ static int handle_exception(struct kvm_vcpu *vcpu)
         if (is_nmi(intr_info))
                 return 1;  /* already handled by vmx_vcpu_run() */
 
-        if (is_invalid_opcode(intr_info)) {
-                er = emulate_instruction(vcpu, EMULTYPE_TRAP_UD);
-                if (er == EMULATE_USER_EXIT)
-                        return 0;
-                if (er != EMULATE_DONE)
-                        kvm_queue_exception(vcpu, UD_VECTOR);
-                return 1;
-        }
+        if (is_invalid_opcode(intr_info))
+                return handle_ud(vcpu);
 
         error_code = 0;
         if (intr_info & INTR_INFO_DELIVER_CODE_MASK)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 7d9a444f2f24..1eb495e04fd3 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -4840,6 +4840,19 @@ out:
 }
 EXPORT_SYMBOL_GPL(kvm_write_guest_virt_system);
 
+int handle_ud(struct kvm_vcpu *vcpu)
+{
+        enum emulation_result er;
+
+        er = emulate_instruction(vcpu, EMULTYPE_TRAP_UD);
+        if (er == EMULATE_USER_EXIT)
+                return 0;
+        if (er != EMULATE_DONE)
+                kvm_queue_exception(vcpu, UD_VECTOR);
+        return 1;
+}
+EXPORT_SYMBOL_GPL(handle_ud);
+
 static int vcpu_is_mmio_gpa(struct kvm_vcpu *vcpu, unsigned long gva,
                             gpa_t gpa, bool write)
 {
diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h
index 1e8617414ee4..7d35ce672989 100644
--- a/arch/x86/kvm/x86.h
+++ b/arch/x86/kvm/x86.h
@@ -255,6 +255,8 @@ int kvm_write_guest_virt_system(struct x86_emulate_ctxt *ctxt,
         gva_t addr, void *val, unsigned int bytes,
         struct x86_exception *exception);
 
+int handle_ud(struct kvm_vcpu *vcpu);
+
 void kvm_vcpu_mtrr_init(struct kvm_vcpu *vcpu);
 u8 kvm_mtrr_get_guest_memory_type(struct kvm_vcpu *vcpu, gfn_t gfn);
 bool kvm_mtrr_valid(struct kvm_vcpu *vcpu, u32 msr, u64 data);