Changeset 25803 in vbox

Timestamp:

Jan 13, 2010 2:16:12 PM (15 years ago)

Author:

vboxsync

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

56570

Message:

VMM: provide reasonable cache info for Intel CPUs in leaf 4 of CPUID

File:

• trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp

@@ -1072 +1072 @@
         pCpuId = &pVM->cpum.s.GuestCpuIdDef;
 
-    bool fHasMoreCaches = (*pEcx == 0);
+    uint32_t cCurrentCacheIndex = *pEcx;
 
     *pEax = pCpuId->eax;
@@ -1088 +1088 @@
 
     if (    iLeaf == 4
-        &&  fHasMoreCaches
+        &&  cCurrentCacheIndex < 3
         &&  pVM->cpum.s.enmGuestCpuVendor == CPUMCPUVENDOR_INTEL)
     {
-        /* Report L0 data cache, Linux'es num_cpu_cores() requires
-         * that to be non-0 to detect core count correctly. */
-        *pEax |= (1 << 5) /* level 1 */ | 1 /* 1 - data cache, 2 - i-cache, 3 - unified */ ;
-        *pEbx = 63 /* linesize 64 */ ;
+        uint32_t type, level, sharing, linesize,
+                 partitions, associativity, sets, cores;
+
+        /* For type: 1 - data cache, 2 - i-cache, 3 - unified */
+        partitions = 1;
+        /* Those are only to shut up compiler, as they will always 
+           get overwritten, and compiler should be able to figure that out */
+        sets = associativity = sharing = level = 1;
+        cores = pVM->cCpus > 32 ? 32 : pVM->cCpus;
+        switch (cCurrentCacheIndex)
+        {
+            case 0:
+                type = 1;
+                level = 1;
+                sharing = 1;
+                linesize = 64;
+                associativity = 8;
+                sets = 64;
+                break;
+            case 1:
+                level = 1;
+                type = 2;
+                sharing = 1;
+                linesize = 64;
+                associativity = 8;
+                sets = 64;
+                break;
+            case 2:
+                level = 2;
+                type = 3;
+                sharing = 2;
+                linesize = 64;
+                associativity = 24;
+                sets = 4096;
+                break;
+        }
+
+        *pEax |= ((cores - 1) << 26)        |
+                 ((sharing - 1) << 14)      |
+                 (level << 5)               |
+                 1;
+        *pEbx = (linesize - 1)               |
+                ((partitions - 1) << 12)     |
+                ((associativity - 1) << 22); /* -1 encoding */
+        *pEcx = sets - 1;
     }
 
@@ -2076 +2117 @@
     return enmMode;
 }
-