Changeset 8870

Timestamp:

05/16/08 10:23:10 (5 months ago)

Author:

vboxsync

Message:

Intercept mwait as well (AMD-V)

Files:

• trunk/include/VBox/hwacc_svm.h (modified) (1 diff)
• trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp (modified) (6 diffs)

trunk/include/VBox/hwacc_svm.h

@@ -231 +231 @@
-#define SVM_EXIT_ICEBP                  0x88
-/** WBINVD instruction. */
-
+
+
+
+
+
+
+
-/** Nested paging: host-level page fault occurred (EXITINFO1 contains fault errorcode; EXITINFO2 contains the guest physical address causing the fault.). */
-#define SVM_EXIT_NPF                    0x400

trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp

@@ -253 +253 @@
-
-    /** @todo nested paging */
-    /* Intercept #NM only; #PF is not relevant due to nested paging (we get a seperate exit code (SVM_EXIT_NPF) for
-     * pagefaults that need our attention).
-     */
-    pVMCB->ctrl.u32InterceptException = HWACCM_SVM_TRAP_MASK;
-
@@ -283 +280 @@
-                                    | SVM_CTRL2_INTERCEPT_SKINIT
-                                    | SVM_CTRL2_INTERCEPT_RDTSCP        /* AMD only; we don't support this one */
+                                    | SVM_CTRL2_INTERCEPT_WBINVD
+                                    | SVM_CTRL2_INTERCEPT_MWAIT_UNCOND; /* don't execute mwait or else we'll idle inside the guest (host thinks the cpu load is high) */
-                                    ;
-    Log(("pVMCB->ctrl.u32InterceptException = %x\n", pVMCB->ctrl.u32InterceptException));
@@ -1202 +1201 @@
-        break;
-
+    case SVM_EXIT_WBINVD:
-    case SVM_EXIT_INVD:                 /* Guest software attempted to execute INVD. */
-        STAM_COUNTER_INC(&pVM->hwaccm.s.StatExitInvd);
@@ -1494 +1494 @@
-        break;
-
-    case SVM_EXIT_RDPMC:
-    case SVM_EXIT_RSM:
-    case SVM_EXIT_INVLPGA:
@@ -1521 +1520 @@
-    }
-
-
+
+
+
+
+
+
-    case SVM_EXIT_MSR:
-        rc = VINF_EM_RAW_EXCEPTION_PRIVILEGED;
@@ -1534 +1538 @@
-        break;
-
-    case SVM_EXIT_PAUSE:
-    case SVM_EXIT_IDTR_READ:
-    case SVM_EXIT_GDTR_READ: