Add instruction length and trap type in HVMOP_inject_trap.

Signed-off-by: Xudong Hao <xudong.hao@intel.com>
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
Signed-off-by: Keir Fraser <keir@xen.org>

diff --git a/tools/libxc/xc_misc.c b/tools/libxc/xc_misc.c
index a029d791ba3d310e58878bedd247c9274a4490ab..405e619d90219417035244a2600ffef9c22a64d5 100644 (file)
--- a/tools/libxc/xc_misc.c
+++ b/tools/libxc/xc_misc.c
@@ -602,7 +602,8 @@ int xc_hvm_get_mem_access(
 }
 
 int xc_hvm_inject_trap(
-    xc_interface *xch, domid_t dom, int vcpu, uint32_t trap, uint32_t error_code, 
+    xc_interface *xch, domid_t dom, int vcpu, uint32_t vector,
+    uint32_t type, uint32_t error_code, uint32_t inslen,
     uint64_t cr2)
 {
     DECLARE_HYPERCALL;
@@ -618,8 +619,10 @@ int xc_hvm_inject_trap(
 
     arg->domid       = dom;
     arg->vcpuid      = vcpu;
-    arg->trap        = trap;
+    arg->vector      = vector;
+    arg->type        = type;
     arg->error_code  = error_code;
+    arg->inslen      = inslen;
     arg->cr2         = cr2;
 
     hypercall.op     = __HYPERVISOR_hvm_op;

diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h
index 3bbc8279ced3c4dd152493d242fc0fdf9e0e138d..fe1431ac1b06a2249a347af05b46d8b208a1b664 100644 (file)
--- a/tools/libxc/xenctrl.h
+++ b/tools/libxc/xenctrl.h
@@ -1578,7 +1578,8 @@ int xc_hvm_get_mem_access(
  * resumes. 
  */
 int xc_hvm_inject_trap(
-    xc_interface *xch, domid_t dom, int vcpu, uint32_t trap, uint32_t error_code, 
+    xc_interface *xch, domid_t dom, int vcpu, uint32_t vector,
+    uint32_t type, uint32_t error_code, uint32_t inslen,
     uint64_t cr2);
 
 /*

diff --git a/tools/tests/xen-access/xen-access.c b/tools/tests/xen-access/xen-access.c
index 906f46f25efc75cd8862e09a1b1cc56b6b36e474..e2c8d5e5a4320a1e4225cd48370ea336be7d06b4 100644 (file)
--- a/tools/tests/xen-access/xen-access.c
+++ b/tools/tests/xen-access/xen-access.c
@@ -662,7 +662,9 @@ int main(int argc, char *argv[])
                        req.vcpu_id);
 
                 /* Reinject */
-                rc = xc_hvm_inject_trap(xch, domain_id, req.vcpu_id, 3, -1, 0);
+                rc = xc_hvm_inject_trap(
+                    xch, domain_id, req.vcpu_id, 3,
+                    HVMOP_TRAP_hw_exc, -1, 0, 0);
                 if (rc < 0)
                 {
                     ERROR("Error %d injecting int3\n", rc);

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index f3c87bc9c3a03e2bc71cb00620f31ad1913fec3d..269deb2e8fec6d6de1fe318c7c58caa32f5e849a 100644 (file)
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -4289,8 +4289,10 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg)
             rc = -EBUSY;
         else 
         {
-            v->arch.hvm_vcpu.inject_trap.vector = tr.trap;
+            v->arch.hvm_vcpu.inject_trap.vector = tr.vector;
+            v->arch.hvm_vcpu.inject_trap.type = tr.type;
             v->arch.hvm_vcpu.inject_trap.error_code = tr.error_code;
+            v->arch.hvm_vcpu.inject_trap.inslen = tr.inslen;
             v->arch.hvm_vcpu.inject_trap.cr2 = tr.cr2;
         }
 

diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h
index a3d8bf14a0cb4409663c270ac9815a22aeb3646c..3ac0bb44c0f451ede4f8aa75e8192139a88b7d5e 100644 (file)
--- a/xen/include/asm-x86/hvm/hvm.h
+++ b/xen/include/asm-x86/hvm/hvm.h
@@ -75,8 +75,8 @@ struct hvm_trap {
     int           vector;
     unsigned int  type;         /* X86_EVENTTYPE_* */
     int           error_code;   /* HVM_DELIVER_NO_ERROR_CODE if n/a */
-    unsigned long cr2;          /* Only for TRAP_page_fault h/w exception */
     int           inslen;       /* Instruction length */ 
+    unsigned long cr2;          /* Only for TRAP_page_fault h/w exception */
 };
 
 /*
@@ -372,12 +372,12 @@ static inline int hvm_do_pmu_interrupt(struct cpu_user_regs *regs)
  *  Intel VMX: {VM_ENTRY,VM_EXIT,IDT_VECTORING}_INTR_INFO[10:8]
  *  AMD SVM: eventinj[10:8] and exitintinfo[10:8] (types 0-4 only)
  */
-#define X86_EVENTTYPE_EXT_INTR              0    /* external interrupt */
-#define X86_EVENTTYPE_NMI                   2    /* NMI                */
-#define X86_EVENTTYPE_HW_EXCEPTION          3    /* hardware exception */
-#define X86_EVENTTYPE_SW_INTERRUPT          4    /* software interrupt */
-#define X86_EVENTTYPE_PRI_SW_EXCEPTION      5    /* privileged software exception */
-#define X86_EVENTTYPE_SW_EXCEPTION          6    /* software exception */
+#define X86_EVENTTYPE_EXT_INTR         0 /* external interrupt */
+#define X86_EVENTTYPE_NMI              2 /* NMI */
+#define X86_EVENTTYPE_HW_EXCEPTION     3 /* hardware exception */
+#define X86_EVENTTYPE_SW_INTERRUPT     4 /* software interrupt (CD nn) */
+#define X86_EVENTTYPE_PRI_SW_EXCEPTION 5 /* ICEBP (F1) */
+#define X86_EVENTTYPE_SW_EXCEPTION     6 /* INT3 (CC), INTO (CE) */
 
 int hvm_event_needs_reinjection(uint8_t type, uint8_t vector);
 

diff --git a/xen/include/public/hvm/hvm_op.h b/xen/include/public/hvm/hvm_op.h
index 6a78f757d5a1f43b86bef7d6b96d5fb0e3084d10..dbaf5ce6ac31df9750470bff628fc16dd07864af 100644 (file)
--- a/xen/include/public/hvm/hvm_op.h
+++ b/xen/include/public/hvm/hvm_op.h
@@ -217,10 +217,21 @@ struct xen_hvm_inject_trap {
     domid_t domid;
     /* VCPU */
     uint32_t vcpuid;
-    /* Trap number */
-    uint32_t trap;
-    /* Error code, or -1 to skip */
+    /* Vector number */
+    uint32_t vector;
+    /* Trap type (HVMOP_TRAP_*) */
+    uint32_t type;
+/* NB. This enumeration precisely matches hvm.h:X86_EVENTTYPE_* */
+# define HVMOP_TRAP_ext_int    0 /* external interrupt */
+# define HVMOP_TRAP_nmi        2 /* nmi */
+# define HVMOP_TRAP_hw_exc     3 /* hardware exception */
+# define HVMOP_TRAP_sw_int     4 /* software interrupt (CD nn) */
+# define HVMOP_TRAP_pri_sw_exc 5 /* ICEBP (F1) */
+# define HVMOP_TRAP_sw_exc     6 /* INT3 (CC), INTO (CE) */
+    /* Error code, or ~0u to skip */
     uint32_t error_code;
+    /* Intruction length */
+    uint32_t inslen;
     /* CR2 for page faults */
     uint64_aligned_t cr2;
 };