Changeset 87521 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Feb 1, 2021 9:48:09 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

142546

Message:

VMM/HM: Moved HM::fHostKernelFeatures to HMR0PERVM. Use the ring-0 uMaxAsid variable (made it a separate global variable), the one in the HM structure is just for ring-3 release logging. bugref:9217

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMR0.cpp (modified) (6 diffs)
• HMSVMR0.cpp (modified) (2 diffs)
• HMVMXR0.cpp (modified) (5 diffs)

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

@@ -144 +144 @@
             } svm;
         } u;
-        /** Maximum allowed ASID/VPID (inclusive). */
-        uint32_t                    uMaxAsid;
         /** MSRs. */
         SUPHWVIRTMSRS               Msrs;
@@ -168 +166 @@
     RTONCE                          EnableAllCpusOnce;
 } g_HmR0;
+
+/** Maximum allowed ASID/VPID (inclusive).
+ * @todo r=bird: This is exclusive for VT-x according to source code comment.
+ *       Couldn't immediately find any docs on AMD-V, but suspect it is
+ *       exclusive there as well given how hmR0SvmFlushTaggedTlb() use it. */
+uint32_t    g_uHmMaxAsid;
 
 
@@ -345 +349 @@
 
         /* Initialize VPID - 16 bits ASID. */
-        g_HmR0.hwvirt.uMaxAsid = 0x10000; /* exclusive */
+        g_uHmMaxAsid = 0x10000; /* exclusive */
 
         /*
@@ -487 +491 @@
     /* Query AMD features. */
     uint32_t u32Dummy;
-    ASMCpuId(0x8000000a, &g_HmR0.hwvirt.u.svm.u32Rev, &g_HmR0.hwvirt.uMaxAsid, &u32Dummy, &g_HmR0.hwvirt.u.svm.u32Features);
+    ASMCpuId(0x8000000a, &g_HmR0.hwvirt.u.svm.u32Rev, &g_uHmMaxAsid, &u32Dummy, &g_HmR0.hwvirt.u.svm.u32Features);
 
     /*
@@ -1179 +1183 @@
     }
     pVM->hm.s.rcInit              = g_HmR0.rcInit;
-    pVM->hm.s.uMaxAsid            = g_HmR0.hwvirt.uMaxAsid;
+    pVM->hm.s.uMaxAsidForLog      = g_uHmMaxAsid;
 
     /*
@@ -1218 +1222 @@
      * but it shouldn't be done later than this point so we do it here.
      */
-    pVM->hm.s.fHostKernelFeatures = SUPR0GetKernelFeatures();
+    pVM->hmr0.s.fHostKernelFeatures = SUPR0GetKernelFeatures();
 
     /*

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

@@ -1346 +1346 @@
 
                 bool fHitASIDLimit = false;
-                if (pHostCpu->uCurrentAsid >= pVM->hm.s.uMaxAsid)
+                if (pHostCpu->uCurrentAsid >= g_uHmMaxAsid)
                 {
                     pHostCpu->uCurrentAsid = 1;      /* Wraparound at 1; host uses 0 */
@@ -1387 +1387 @@
     AssertMsg(pVCpu->hmr0.s.cTlbFlushes == pHostCpu->cTlbFlushes,
               ("Flush count mismatch for cpu %u (%u vs %u)\n", pHostCpu->idCpu, pVCpu->hmr0.s.cTlbFlushes, pHostCpu->cTlbFlushes));
-    AssertMsg(pHostCpu->uCurrentAsid >= 1 && pHostCpu->uCurrentAsid < pVM->hm.s.uMaxAsid,
+    AssertMsg(pHostCpu->uCurrentAsid >= 1 && pHostCpu->uCurrentAsid < g_uHmMaxAsid,
               ("cpu%d uCurrentAsid = %x\n", pHostCpu->idCpu, pHostCpu->uCurrentAsid));
-    AssertMsg(pVCpu->hmr0.s.uCurrentAsid >= 1 && pVCpu->hmr0.s.uCurrentAsid < pVM->hm.s.uMaxAsid,
+    AssertMsg(pVCpu->hmr0.s.uCurrentAsid >= 1 && pVCpu->hmr0.s.uCurrentAsid < g_uHmMaxAsid,
               ("cpu%d VM uCurrentAsid = %x\n", pHostCpu->idCpu, pVCpu->hmr0.s.uCurrentAsid));
 

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

@@ -3040 +3040 @@
     {
         ++pHostCpu->uCurrentAsid;
-        if (pHostCpu->uCurrentAsid >= pVM->hm.s.uMaxAsid)
+        if (pHostCpu->uCurrentAsid >= g_uHmMaxAsid)
         {
             pHostCpu->uCurrentAsid = 1;            /* Wraparound to 1; host uses 0. */
@@ -3097 +3097 @@
     AssertMsg(pVCpu->hmr0.s.cTlbFlushes == pHostCpu->cTlbFlushes,
               ("Flush count mismatch for cpu %d (%u vs %u)\n", pHostCpu->idCpu, pVCpu->hmr0.s.cTlbFlushes, pHostCpu->cTlbFlushes));
-    AssertMsg(pHostCpu->uCurrentAsid >= 1 && pHostCpu->uCurrentAsid < pVM->hm.s.uMaxAsid,
+    AssertMsg(pHostCpu->uCurrentAsid >= 1 && pHostCpu->uCurrentAsid < g_uHmMaxAsid,
               ("Cpu[%u] uCurrentAsid=%u cTlbFlushes=%u pVCpu->idLastCpu=%u pVCpu->cTlbFlushes=%u\n", pHostCpu->idCpu,
                pHostCpu->uCurrentAsid, pHostCpu->cTlbFlushes, pVCpu->hmr0.s.idLastCpu, pVCpu->hmr0.s.cTlbFlushes));
-    AssertMsg(pVCpu->hmr0.s.uCurrentAsid >= 1 && pVCpu->hmr0.s.uCurrentAsid < pVM->hm.s.uMaxAsid,
+    AssertMsg(pVCpu->hmr0.s.uCurrentAsid >= 1 && pVCpu->hmr0.s.uCurrentAsid < g_uHmMaxAsid,
               ("Cpu[%u] pVCpu->uCurrentAsid=%u\n", pHostCpu->idCpu, pVCpu->hmr0.s.uCurrentAsid));
 
@@ -3220 +3220 @@
     {
         ++pHostCpu->uCurrentAsid;
-        if (pHostCpu->uCurrentAsid >= pVM->hm.s.uMaxAsid)
+        if (pHostCpu->uCurrentAsid >= g_uHmMaxAsid)
         {
             pHostCpu->uCurrentAsid        = 1;     /* Wraparound to 1; host uses 0 */
@@ -3249 +3249 @@
     AssertMsg(pVCpu->hmr0.s.cTlbFlushes == pHostCpu->cTlbFlushes,
               ("Flush count mismatch for cpu %d (%u vs %u)\n", pHostCpu->idCpu, pVCpu->hmr0.s.cTlbFlushes, pHostCpu->cTlbFlushes));
-    AssertMsg(pHostCpu->uCurrentAsid >= 1 && pHostCpu->uCurrentAsid < pVM->hm.s.uMaxAsid,
+    AssertMsg(pHostCpu->uCurrentAsid >= 1 && pHostCpu->uCurrentAsid < g_uHmMaxAsid,
               ("Cpu[%u] uCurrentAsid=%u cTlbFlushes=%u pVCpu->idLastCpu=%u pVCpu->cTlbFlushes=%u\n", pHostCpu->idCpu,
                pHostCpu->uCurrentAsid, pHostCpu->cTlbFlushes, pVCpu->hmr0.s.idLastCpu, pVCpu->hmr0.s.cTlbFlushes));
-    AssertMsg(pVCpu->hmr0.s.uCurrentAsid >= 1 && pVCpu->hmr0.s.uCurrentAsid < pVM->hm.s.uMaxAsid,
+    AssertMsg(pVCpu->hmr0.s.uCurrentAsid >= 1 && pVCpu->hmr0.s.uCurrentAsid < g_uHmMaxAsid,
               ("Cpu[%u] pVCpu->uCurrentAsid=%u\n", pHostCpu->idCpu, pVCpu->hmr0.s.uCurrentAsid));
 
@@ -4812 +4812 @@
 
         /* If the host has made GDT read-only, we would need to temporarily toggle CR0.WP before writing the GDT. */
-        PVM pVM = pVCpu->CTX_SUFF(pVM);
-        if (pVM->hm.s.fHostKernelFeatures & SUPKERNELFEATURES_GDT_READ_ONLY)
+        PVMCC pVM = pVCpu->CTX_SUFF(pVM);
+        if (pVM->hmr0.s.fHostKernelFeatures & SUPKERNELFEATURES_GDT_READ_ONLY)
             fRestoreHostFlags |= VMX_RESTORE_HOST_GDT_READ_ONLY;
-        if (pVM->hm.s.fHostKernelFeatures & SUPKERNELFEATURES_GDT_NEED_WRITABLE)
+        if (pVM->hmr0.s.fHostKernelFeatures & SUPKERNELFEATURES_GDT_NEED_WRITABLE)
         {
             /* The GDT is read-only but the writable GDT is available. */