fix(vmm): Pass through CPUID leaf 0x80000005

zulinx86 · pb8o · commit 5aa894161a28 · 2023-07-13T10:38:33.000+02:00
PR #3721 changed to pass through CPUID leaf 0x80000006 indicating L2 cache and TLB and L3 cache information, but CPUID leaf 0x80000005 has not been passed even though it provides L1 Cache and TLB information. Signed-off-by: Takahiro Itazuri <itazur@amazon.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -37,6 +37,7 @@
 - Fixed the T2CL CPU template to pass through the RSBA and RRSBA bits of the
   IA32_ARCH_CAPABILITIES MSR from the host in accordance with an Intel microcode
   update.
+- Fixed passing through cache information from host in CPUID leaf 0x80000005.
 
 ## [1.3.0]
 
diff --git a/docs/cpu_templates/cpuid-normalization.md b/docs/cpu_templates/cpuid-normalization.md
@@ -25,7 +25,8 @@ See also: [boot protocol settings](boot-protocol.md)
 | Update extended topology enumeration                                                 | 0xb        | all     | EAX           | 4:0   |
 | Update extended topology enumeration                                                 | 0xb        | all     | EBX           | 15:0  |
 | Update extended topology enumeration                                                 | 0xb        | all     | ECX           | 15:8  |
-| Pass through cache information from host                                             | 0x80000006 | -       | all           | all   |
+| Pass through L1 cache and TLB information from host                                  | 0x80000005 | -       | all           | all   |
+| Pass through L2 cache and TLB and L3 cache information from host                     | 0x80000006 | -       | all           | all   |
 
 ## Intel-specific CPUID normalization
 
diff --git a/resources/tests/cpu_template_helper/fingerprint_AMD_MILAN_4.14host.json b/resources/tests/cpu_template_helper/fingerprint_AMD_MILAN_4.14host.json
@@ -1,6 +1,6 @@
 {
   "firecracker_version": "1.5.0-dev",
-  "kernel_version": "4.14.314-238.539.amzn2.x86_64",
+  "kernel_version": "4.14.318-241.531.amzn2.x86_64",
   "microcode_version": "0xa0011a9",
   "bios_version": "1.0",
   "bios_revision": "5.22",
@@ -611,19 +611,19 @@
         "modifiers": [
           {
             "register": "eax",
-            "bitmap": "0b00000000000000000000000000000000"
+            "bitmap": "0b11111111010000001111111101000000"
           },
           {
             "register": "ebx",
-            "bitmap": "0b00000000000000000000000000000000"
+            "bitmap": "0b11111111010000001111111101000000"
           },
           {
             "register": "ecx",
-            "bitmap": "0b00000000000000000000000000000000"
+            "bitmap": "0b00100000000010000000000101000000"
           },
           {
             "register": "edx",
-            "bitmap": "0b00000000000000000000000000000000"
+            "bitmap": "0b00100000000010000000000101000000"
           }
         ]
       },
diff --git a/resources/tests/cpu_template_helper/fingerprint_AMD_MILAN_5.10host.json b/resources/tests/cpu_template_helper/fingerprint_AMD_MILAN_5.10host.json
@@ -1,6 +1,6 @@
 {
   "firecracker_version": "1.5.0-dev",
-  "kernel_version": "5.10.179-168.710.amzn2.x86_64",
+  "kernel_version": "5.10.184-175.731.amzn2.x86_64",
   "microcode_version": "0xa0011a9",
   "bios_version": "1.0",
   "bios_revision": "5.22",
@@ -657,19 +657,19 @@
         "modifiers": [
           {
             "register": "eax",
-            "bitmap": "0b00000000000000000000000000000000"
+            "bitmap": "0b11111111010000001111111101000000"
           },
           {
             "register": "ebx",
-            "bitmap": "0b00000000000000000000000000000000"
+            "bitmap": "0b11111111010000001111111101000000"
           },
           {
             "register": "ecx",
-            "bitmap": "0b00000000000000000000000000000000"
+            "bitmap": "0b00100000000010000000000101000000"
           },
           {
             "register": "edx",
-            "bitmap": "0b00000000000000000000000000000000"
+            "bitmap": "0b00100000000010000000000101000000"
           }
         ]
       },
diff --git a/resources/tests/cpu_template_helper/fingerprint_AMD_MILAN_6.1host.json b/resources/tests/cpu_template_helper/fingerprint_AMD_MILAN_6.1host.json
@@ -1,6 +1,6 @@
 {
   "firecracker_version": "1.5.0-dev",
-  "kernel_version": "6.1.29-47.49.amzn2023.x86_64",
+  "kernel_version": "6.1.34-59.116.amzn2023.x86_64",
   "microcode_version": "0xa0011a9",
   "bios_version": "1.0",
   "bios_revision": "5.22",
@@ -657,19 +657,19 @@
         "modifiers": [
           {
             "register": "eax",
-            "bitmap": "0b00000000000000000000000000000000"
+            "bitmap": "0b11111111010000001111111101000000"
           },
           {
             "register": "ebx",
-            "bitmap": "0b00000000000000000000000000000000"
+            "bitmap": "0b11111111010000001111111101000000"
           },
           {
             "register": "ecx",
-            "bitmap": "0b00000000000000000000000000000000"
+            "bitmap": "0b00100000000010000000000101000000"
           },
           {
             "register": "edx",
-            "bitmap": "0b00000000000000000000000000000000"
+            "bitmap": "0b00100000000010000000000101000000"
           }
         ]
       },
diff --git a/src/vmm/src/cpu_config/x86_64/cpuid/normalize.rs b/src/vmm/src/cpu_config/x86_64/cpuid/normalize.rs
@@ -98,6 +98,9 @@ pub enum ExtendedTopologyError {
 /// Error type for setting leaf 0x80000006 of Cpuid::normalize().
 #[derive(Debug, thiserror::Error, Eq, PartialEq)]
 pub enum ExtendedCacheFeaturesError {
+    /// Leaf 0x80000005 is missing from CPUID.
+    #[error("Leaf 0x80000005 is missing from CPUID.")]
+    MissingLeaf0x80000005,
     /// Leaf 0x80000006 is missing from CPUID.
     #[error("Leaf 0x80000006 is missing from CPUID.")]
     MissingLeaf0x80000006,
@@ -465,6 +468,13 @@ impl super::Cpuid {
 
     // Update extended cache features entry
     fn update_extended_cache_features(&mut self) -> Result<(), ExtendedCacheFeaturesError> {
+        // Leaf 0x800000005 indicates L1 Cache and TLB Information.
+        let guest_leaf_0x80000005 = self
+            .get_mut(&CpuidKey::leaf(0x80000005))
+            .ok_or(ExtendedCacheFeaturesError::MissingLeaf0x80000005)?;
+        guest_leaf_0x80000005.result = cpuid(0x80000005).into();
+
+        // Leaf 0x80000006 indicates L2 Cache and TLB and L3 Cache Information.
         let guest_leaf_0x80000006 = self
             .get_mut(&CpuidKey::leaf(0x80000006))
             .ok_or(ExtendedCacheFeaturesError::MissingLeaf0x80000006)?;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"firecracker_version": "1.5.0-dev",`
`3`		`- "kernel_version": "4.14.314-238.539.amzn2.x86_64",`
	`3`	`+ "kernel_version": "4.14.318-241.531.amzn2.x86_64",`
`4`	`4`	`"microcode_version": "0xa0011a9",`
`5`	`5`	`"bios_version": "1.0",`
`6`	`6`	`"bios_revision": "5.22",`
`@@ -611,19 +611,19 @@`
`611`	`611`	`"modifiers": [`
`612`	`612`	`{`
`613`	`613`	`"register": "eax",`
`614`		`- "bitmap": "0b00000000000000000000000000000000"`
	`614`	`+ "bitmap": "0b11111111010000001111111101000000"`
`615`	`615`	`},`
`616`	`616`	`{`
`617`	`617`	`"register": "ebx",`
`618`		`- "bitmap": "0b00000000000000000000000000000000"`
	`618`	`+ "bitmap": "0b11111111010000001111111101000000"`
`619`	`619`	`},`
`620`	`620`	`{`
`621`	`621`	`"register": "ecx",`
`622`		`- "bitmap": "0b00000000000000000000000000000000"`
	`622`	`+ "bitmap": "0b00100000000010000000000101000000"`
`623`	`623`	`},`
`624`	`624`	`{`
`625`	`625`	`"register": "edx",`
`626`		`- "bitmap": "0b00000000000000000000000000000000"`
	`626`	`+ "bitmap": "0b00100000000010000000000101000000"`
`627`	`627`	`}`
`628`	`628`	`]`
`629`	`629`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"firecracker_version": "1.5.0-dev",`
`3`		`- "kernel_version": "5.10.179-168.710.amzn2.x86_64",`
	`3`	`+ "kernel_version": "5.10.184-175.731.amzn2.x86_64",`
`4`	`4`	`"microcode_version": "0xa0011a9",`
`5`	`5`	`"bios_version": "1.0",`
`6`	`6`	`"bios_revision": "5.22",`
`@@ -657,19 +657,19 @@`
`657`	`657`	`"modifiers": [`
`658`	`658`	`{`
`659`	`659`	`"register": "eax",`
`660`		`- "bitmap": "0b00000000000000000000000000000000"`
	`660`	`+ "bitmap": "0b11111111010000001111111101000000"`
`661`	`661`	`},`
`662`	`662`	`{`
`663`	`663`	`"register": "ebx",`
`664`		`- "bitmap": "0b00000000000000000000000000000000"`
	`664`	`+ "bitmap": "0b11111111010000001111111101000000"`
`665`	`665`	`},`
`666`	`666`	`{`
`667`	`667`	`"register": "ecx",`
`668`		`- "bitmap": "0b00000000000000000000000000000000"`
	`668`	`+ "bitmap": "0b00100000000010000000000101000000"`
`669`	`669`	`},`
`670`	`670`	`{`
`671`	`671`	`"register": "edx",`
`672`		`- "bitmap": "0b00000000000000000000000000000000"`
	`672`	`+ "bitmap": "0b00100000000010000000000101000000"`
`673`	`673`	`}`
`674`	`674`	`]`
`675`	`675`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"firecracker_version": "1.5.0-dev",`
`3`		`- "kernel_version": "6.1.29-47.49.amzn2023.x86_64",`
	`3`	`+ "kernel_version": "6.1.34-59.116.amzn2023.x86_64",`
`4`	`4`	`"microcode_version": "0xa0011a9",`
`5`	`5`	`"bios_version": "1.0",`
`6`	`6`	`"bios_revision": "5.22",`
`@@ -657,19 +657,19 @@`
`657`	`657`	`"modifiers": [`
`658`	`658`	`{`
`659`	`659`	`"register": "eax",`
`660`		`- "bitmap": "0b00000000000000000000000000000000"`
	`660`	`+ "bitmap": "0b11111111010000001111111101000000"`
`661`	`661`	`},`
`662`	`662`	`{`
`663`	`663`	`"register": "ebx",`
`664`		`- "bitmap": "0b00000000000000000000000000000000"`
	`664`	`+ "bitmap": "0b11111111010000001111111101000000"`
`665`	`665`	`},`
`666`	`666`	`{`
`667`	`667`	`"register": "ecx",`
`668`		`- "bitmap": "0b00000000000000000000000000000000"`
	`668`	`+ "bitmap": "0b00100000000010000000000101000000"`
`669`	`669`	`},`
`670`	`670`	`{`
`671`	`671`	`"register": "edx",`
`672`		`- "bitmap": "0b00000000000000000000000000000000"`
	`672`	`+ "bitmap": "0b00100000000010000000000101000000"`
`673`	`673`	`}`
`674`	`674`	`]`
`675`	`675`	`},`