KVM: x86: Add x86 callback for intercept check

This patch adds a callback into kvm_x86_ops so that svm and
vmx code can do intercept checks on emulated instructions.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

2 files changed, 27 insertions, 2 deletions

diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h
index cab841a034f9..eb7033cefe8e 100644
--- a/arch/x86/include/asm/kvm_emulate.h
+++ b/arch/x86/include/asm/kvm_emulate.h
@@ -26,6 +26,24 @@ struct x86_exception {
 };
 
 /*
+ * This struct is used to carry enough information from the instruction
+ * decoder to main KVM so that a decision can be made whether the
+ * instruction needs to be intercepted or not.
+ */
+struct x86_instruction_info {
+        u8  intercept;          /* which intercept                      */
+        u8  rep_prefix;         /* rep prefix?                          */
+        u8  modrm_mod;          /* mod part of modrm                    */
+        u8  modrm_reg;          /* index of register used               */
+        u8  modrm_rm;           /* rm part of modrm                     */
+        u64 src_val;            /* value of source operand              */
+        u8  src_bytes;          /* size of source operand               */
+        u8  dst_bytes;          /* size of destination operand          */
+        u8  ad_bytes;           /* size of src/dst address              */
+        u64 next_rip;           /* rip following the instruction        */
+};
+
+/*
  * x86_emulate_ops:
  *
  * These operations represent the instruction emulator's interface to memory.
@@ -163,8 +181,8 @@ struct x86_emulate_ops {
         int (*get_msr)(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata);
         void (*get_fpu)(struct x86_emulate_ctxt *ctxt); /* disables preempt */
         void (*put_fpu)(struct x86_emulate_ctxt *ctxt); /* reenables preempt */
-        int (*intercept)(struct x86_emulate_ctxt *ctxt,
-                         enum x86_intercept intercept,
+        int (*intercept)(struct kvm_vcpu *vcpu,
+                         struct x86_instruction_info *info,
                          enum x86_intercept_stage stage);
 };
 
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index e820c6339b8b..038562c222e8 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -505,6 +505,8 @@ struct kvm_vcpu_stat {
         u32 nmi_injections;
 };
 
+struct x86_instruction_info;
+
 struct kvm_x86_ops {
         int (*cpu_has_kvm_support)(void);          /* __init */
         int (*disabled_by_bios)(void);             /* __init */
@@ -592,6 +594,11 @@ struct kvm_x86_ops {
         void (*write_tsc_offset)(struct kvm_vcpu *vcpu, u64 offset);
 
         void (*get_exit_info)(struct kvm_vcpu *vcpu, u64 *info1, u64 *info2);
+
+        int (*check_intercept)(struct kvm_vcpu *vcpu,
+                               struct x86_instruction_info *info,
+                               enum x86_intercept_stage stage);
+
         const struct trace_print_flags *exit_reasons_str;
 };