AMD: enable topology extension support

We need to enable it since we use the Extended Cache Topology leaf.

Signed-off-by: Serban Iorga <[email protected]>

Author: Serban Iorga

cpuid/src/cpu_leaf.rs

@@ -173,19 +173,6 @@ pub mod leaf_0x7 {
     }
 }
 
-pub mod leaf_0x80000001 {
-    pub const LEAF_NUM: u32 = 0x8000_0001;
-
-    pub mod ecx {
-        pub const PREFETCH_SHIFT: u32 = 8; // 3DNow! PREFETCH/PREFETCHW instructions
-        pub const LZCNT_SHIFT: u32 = 5; // advanced bit manipulation
-    }
-
-    pub mod edx {
-        pub const PDPE1GB_SHIFT: u32 = 26; // 1-GByte pages are available if 1.
-    }
-}
-
 pub mod leaf_0xa {
     pub const LEAF_NUM: u32 = 0xa;
 }
@@ -231,3 +218,17 @@ pub mod leaf_0x80000000 {
         pub const LARGEST_EXTENDED_FN_BITRANGE: BitRange = bit_range!(31, 0);
     }
 }
+
+pub mod leaf_0x80000001 {
+    pub const LEAF_NUM: u32 = 0x8000_0001;
+
+    pub mod ecx {
+        pub const LZCNT_SHIFT: u32 = 5; // advanced bit manipulation
+        pub const PREFETCH_SHIFT: u32 = 8; // 3DNow! PREFETCH/PREFETCHW instructions
+        pub const TOPOEXT_INDEX: u32 = 22;
+    }
+
+    pub mod edx {
+        pub const PDPE1GB_SHIFT: u32 = 26; // 1-GByte pages are available if 1.
+    }
+}

cpuid/src/transformer/amd.rs

@@ -44,6 +44,18 @@ pub fn update_largest_extended_fn_entry(
     Ok(())
 }
 
+pub fn update_extended_feature_info_entry(
+    entry: &mut kvm_cpuid_entry2,
+    _vm_spec: &VmSpec,
+) -> Result<(), Error> {
+    use cpu_leaf::leaf_0x80000001::*;
+
+    // set the Topology Extension bit since we use the Extended Cache Topology leaf
+    entry.ecx.write_bit(ecx::TOPOEXT_INDEX, true);
+
+    Ok(())
+}
+
 pub fn update_extended_cache_topology_entry(
     entry: &mut kvm_cpuid_entry2,
     vm_spec: &VmSpec,
@@ -65,6 +77,7 @@ impl CpuidTransformer for AmdCpuidTransformer {
             leaf_0x1::LEAF_NUM => Some(common::update_feature_info_entry),
             leaf_0x7::LEAF_NUM => Some(amd::update_structured_extended_entry),
             leaf_0x80000000::LEAF_NUM => Some(amd::update_largest_extended_fn_entry),
+            leaf_0x80000001::LEAF_NUM => Some(amd::update_extended_feature_info_entry),
             leaf_0x8000001d::LEAF_NUM => Some(amd::update_extended_cache_topology_entry),
             0x8000_0002..=0x8000_0004 => Some(common::update_brand_string_entry),
             _ => None,
@@ -135,6 +148,27 @@ mod test {
         );
     }
 
+    #[test]
+    fn test_update_extended_feature_info_entry() {
+        use cpu_leaf::leaf_0x80000001::*;
+
+        let vm_spec = VmSpec::new(VENDOR_ID_AMD, 0, 1, false);
+        let mut entry = &mut kvm_cpuid_entry2 {
+            function: LEAF_NUM,
+            index: 0,
+            flags: 0,
+            eax: 0,
+            ebx: 0,
+            ecx: 0,
+            edx: 0,
+            padding: [0, 0, 0],
+        };
+
+        assert!(update_extended_feature_info_entry(&mut entry, &vm_spec).is_ok());
+
+        assert_eq!(entry.ecx.read_bit(ecx::TOPOEXT_INDEX), true);
+    }
+
     #[test]
     fn test_update_extended_cache_topology_entry() {
         let vm_spec = VmSpec::new(VENDOR_ID_AMD, 0, 1, false);