[Xen-changelog] [xen-unstable] x86 vmx: Update EIP when appropriate during task switch

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1250771551 -3600
# Node ID 1cdf9f96e3c19469241aae657c498307ec840579
# Parent  6c2362ce82c93afb7c752ee0d31959f1b630a710
x86 vmx: Update EIP when appropriate during task switch

Signed-off-by: Kouya Shimura <kouya@xxxxxxxxxxxxxx>
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/hvm/vmx/vmx.c |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff -r 6c2362ce82c9 -r 1cdf9f96e3c1 xen/arch/x86/hvm/vmx/vmx.c
--- a/xen/arch/x86/hvm/vmx/vmx.c        Thu Aug 20 10:30:53 2009 +0100
+++ b/xen/arch/x86/hvm/vmx/vmx.c        Thu Aug 20 13:32:31 2009 +0100
@@ -2507,14 +2507,21 @@ asmlinkage void vmx_vmexit_handler(struc
     case EXIT_REASON_TASK_SWITCH: {
         const enum hvm_task_switch_reason reasons[] = {
             TSW_call_or_int, TSW_iret, TSW_jmp, TSW_call_or_int };
-        int32_t errcode = -1;
+        int32_t ecode = -1, source;
         exit_qualification = __vmread(EXIT_QUALIFICATION);
-        if ( (idtv_info & INTR_INFO_VALID_MASK) &&
-             (idtv_info & INTR_INFO_DELIVER_CODE_MASK) )
-            errcode = __vmread(IDT_VECTORING_ERROR_CODE);
-        hvm_task_switch((uint16_t)exit_qualification,
-                        reasons[(exit_qualification >> 30) & 3],
-                        errcode);
+        source = (exit_qualification >> 30) & 3;
+        inst_len = __get_instruction_length(); /* Safe: See SDM 3B 23.2.4 */
+        if ( (source == 3) && (idtv_info & INTR_INFO_VALID_MASK) )
+        {
+            /* ExtInt, NMI, HWException: no instruction to skip over. */
+            if ( !(idtv_info & (1u<<10)) ) /* 0 <= IntrType <= 3? */
+                inst_len = 0;
+            /* If there's an error code then we pass it along. */
+            if ( idtv_info & INTR_INFO_DELIVER_CODE_MASK )
+                ecode = __vmread(IDT_VECTORING_ERROR_CODE);
+        }
+        regs->eip += inst_len;
+        hvm_task_switch((uint16_t)exit_qualification, reasons[source], ecode);
         break;
     }
     case EXIT_REASON_CPUID:

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog