[Xen-changelog] [xen-unstable] svm: Intercept and disallow MONITOR/MWAIT.

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

# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1194610117 0
# Node ID 837f83225153547109480d63b3386cb8f65b5274
# Parent  fc8be8f3707bd1ffeab55efea5f9804fa570177e
svm: Intercept and disallow MONITOR/MWAIT.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 xen/arch/x86/hvm/svm/svm.c  |    3 ++-
 xen/arch/x86/hvm/svm/vmcb.c |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff -r fc8be8f3707b -r 837f83225153 xen/arch/x86/hvm/svm/svm.c
--- a/xen/arch/x86/hvm/svm/svm.c        Fri Nov 09 12:05:27 2007 +0000
+++ b/xen/arch/x86/hvm/svm/svm.c        Fri Nov 09 12:08:37 2007 +0000
@@ -2280,13 +2280,14 @@ asmlinkage void svm_vmexit_handler(struc
         hvm_triple_fault();
         break;
 
+    case VMEXIT_MONITOR:
+    case VMEXIT_MWAIT:
     case VMEXIT_VMRUN:
     case VMEXIT_VMLOAD:
     case VMEXIT_VMSAVE:
     case VMEXIT_STGI:
     case VMEXIT_CLGI:
     case VMEXIT_SKINIT:
-        /* Report "Invalid opcode" on any VM-operation except VMMCALL */
         svm_inject_exception(v, TRAP_invalid_op, 0, 0);
         break;
 
diff -r fc8be8f3707b -r 837f83225153 xen/arch/x86/hvm/svm/vmcb.c
--- a/xen/arch/x86/hvm/svm/vmcb.c       Fri Nov 09 12:05:27 2007 +0000
+++ b/xen/arch/x86/hvm/svm/vmcb.c       Fri Nov 09 12:08:37 2007 +0000
@@ -128,7 +128,8 @@ static int construct_vmcb(struct vcpu *v
         GENERAL2_INTERCEPT_VMLOAD      | GENERAL2_INTERCEPT_VMSAVE      |
         GENERAL2_INTERCEPT_STGI        | GENERAL2_INTERCEPT_CLGI        |
         GENERAL2_INTERCEPT_SKINIT      | GENERAL2_INTERCEPT_RDTSCP      |
-        GENERAL2_INTERCEPT_WBINVD;
+        GENERAL2_INTERCEPT_WBINVD      | GENERAL2_INTERCEPT_MONITOR     |
+        GENERAL2_INTERCEPT_MWAIT;
 
     /* Intercept all debug-register writes. */
     vmcb->dr_intercepts = ~0u;

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