Changeset 15071 in vbox for trunk

Timestamp:

Dec 7, 2008 4:42:49 PM (16 years ago)

Author:

vboxsync

Message:

Deal with 64 bits address flushes in 32 bits host mode. (flush the whole TLB)

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWSVMR0.cpp (modified) (1 diff)
• HWVMXR0.cpp (modified) (1 diff)

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

@@ -2248 +2248 @@
 
         STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatFlushPageManual);
-        SVMR0InvlpgA(GCVirt, pVMCB->ctrl.TLBCtrl.n.u32ASID);
+#if HC_ARCH_BITS == 32
+        /* If we get a flush in 64 bits guest mode, then force a full TLB flush. Invlpga takes only 32 bits addresses. */
+        if (CPUMIsGuestInLongMode(pVM)
+            pVCpu->hwaccm.s.fForceTLBFlush = true;
+        else
+#endif
+            SVMR0InvlpgA(GCVirt, pVMCB->ctrl.TLBCtrl.n.u32ASID);
     }
     return VINF_SUCCESS;

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

@@ -3193 +3193 @@
 static void vmxR0FlushVPID(PVM pVM, PVMCPU pVCpu, VMX_FLUSH enmFlush, RTGCPTR GCPtr)
 {
-    uint64_t descriptor[2];
-
-    Assert(pVM->hwaccm.s.vmx.fVPID);
-    descriptor[0] = pVCpu->hwaccm.s.uCurrentASID;
-    descriptor[1] = GCPtr;
-    int rc = VMXR0InvVPID(enmFlush, &descriptor[0]);
-    AssertRC(rc);
+#if HC_ARCH_BITS == 32
+    /* If we get a flush in 64 bits guest mode, then force a full TLB flush. Invvpid probably takes only 32 bits addresses. (@todo) */
+    if (CPUMIsGuestInLongMode(pVM)
+    {
+        pVCpu->hwaccm.s.fForceTLBFlush = true;
+    }
+    else
+#endif
+    {
+        uint64_t descriptor[2];
+
+        Assert(pVM->hwaccm.s.vmx.fVPID);
+        descriptor[0] = pVCpu->hwaccm.s.uCurrentASID;
+        descriptor[1] = GCPtr;
+        int rc = VMXR0InvVPID(enmFlush, &descriptor[0]);
+        AssertRC(rc);
+    }
 }
 #endif /* HWACCM_VTX_WITH_VPID */