svm: Intercept and disallow MONITOR/MWAIT.

Signed-off-by: Keir Fraser <keir@xensource.com>
xen-unstable changeset:   16366:837f83225153547109480d63b3386cb8f65b5274
xen-unstable date:        Fri Nov 09 12:08:37 2007 +0000

diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c
index 90b8b770d5267739ba264aa09c94b386ea9a69a5..9967d7c43957ebd5d2d931681fb0b14461be0e0b 100644 (file)
--- a/xen/arch/x86/hvm/svm/svm.c
+++ b/xen/arch/x86/hvm/svm/svm.c
@@ -2587,13 +2587,14 @@ asmlinkage void svm_vmexit_handler(struct cpu_user_regs *regs)
         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 --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c
index ed6b34f82b7647b5fe9bf0372118fe2e9c34c2a3..b8df6f90ede96cdaf60b34dbf986abb7a225b5fd 100644 (file)
--- a/xen/arch/x86/hvm/svm/vmcb.c
+++ b/xen/arch/x86/hvm/svm/vmcb.c
@@ -125,7 +125,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;