test: Update fingerprint files

Changes on guest CPU config are as follows: - CPUID.0x7:EBX - ERMS (bit 9) on AMD (marked as reserved in APM) - CPUID.0x7:EDX - FSRM (bit 4) on AMD + kernel 5.10 and 6.10 (marked as reserved in APM) - IA32_ARCH_CAPABILITIES MSR (index: 0x10A) - GDS_CTRL (bit 25) on Intel + kernel 4.14 - GDS_NO (bit 26) on Intel Signed-off-by: Takahiro Itazuri <[email protected]>
firecracker-microvm · Sep 13, 2023 · 9b2979c · 9b2979c
1 parent 3adf2aa
commit 9b2979c
Show file tree

Hide file tree

Showing 18 changed files with 83 additions and 59 deletions.
diff --git a/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_4.14host.json b/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_4.14host.json
@@ -1,10 +1,11 @@
 {
   "firecracker_version": "1.5.0-dev",
-  "kernel_version": "4.14.318-241.531.amzn2.x86_64",
+  "kernel_version": "4.14.322-244.539.amzn2.x86_64",
   "microcode_version": "0xa0011a9",
   "bios_version": "1.0",
-  "bios_revision": "5.22",
+  "bios_revision": "0.57",
   "guest_cpu_config": {
+    "kvm_capabilities": [],
     "cpuid_modifiers": [
       {
         "leaf": "0x0",
@@ -178,7 +179,7 @@
           },
           {
             "register": "ebx",
-            "bitmap": "0b00100001100111000000001110101011"
+            "bitmap": "0b00100001100111000000000110101011"
           },
           {
             "register": "ecx",

diff --git a/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_5.10host.json b/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_5.10host.json
@@ -1,10 +1,11 @@
 {
   "firecracker_version": "1.5.0-dev",
-  "kernel_version": "5.10.184-175.731.amzn2.x86_64",
+  "kernel_version": "5.10.192-182.736.amzn2.x86_64",
   "microcode_version": "0xa0011a9",
   "bios_version": "1.0",
-  "bios_revision": "5.22",
+  "bios_revision": "0.57",
   "guest_cpu_config": {
+    "kvm_capabilities": [],
     "cpuid_modifiers": [
       {
         "leaf": "0x0",
@@ -178,15 +179,15 @@
           },
           {
             "register": "ebx",
-            "bitmap": "0b00100001100111000000011110101011"
+            "bitmap": "0b00100001100111000000010110101011"
           },
           {
             "register": "ecx",
             "bitmap": "0b00000000010000000000011000001100"
           },
           {
             "register": "edx",
-            "bitmap": "0b10001100000000000000000000010000"
+            "bitmap": "0b10001100000000000000000000000000"
           }
         ]
       },

diff --git a/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_6.1host.json b/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_6.1host.json
@@ -1,10 +1,11 @@
 {
   "firecracker_version": "1.5.0-dev",
-  "kernel_version": "6.1.34-59.116.amzn2023.x86_64",
+  "kernel_version": "6.1.49-69.116.amzn2023.x86_64",
   "microcode_version": "0xa0011a9",
   "bios_version": "1.0",
-  "bios_revision": "5.22",
+  "bios_revision": "0.57",
   "guest_cpu_config": {
+    "kvm_capabilities": [],
     "cpuid_modifiers": [
       {
         "leaf": "0x0",
@@ -178,15 +179,15 @@
           },
           {
             "register": "ebx",
-            "bitmap": "0b00100001100111000000011110101011"
+            "bitmap": "0b00100001100111000000010110101011"
           },
           {
             "register": "ecx",
             "bitmap": "0b00000000010000000000011000001100"
           },
           {
             "register": "edx",
-            "bitmap": "0b10001100000000000000000000010000"
+            "bitmap": "0b10001100000000000000000000000000"
           }
         ]
       },

diff --git a/tests/data/cpu_template_helper/fingerprint_ARM_NEOVERSE_N1_4.14host.json b/tests/data/cpu_template_helper/fingerprint_ARM_NEOVERSE_N1_4.14host.json
@@ -1,10 +1,12 @@
 {
   "firecracker_version": "1.5.0-dev",
-  "kernel_version": "4.14.314-238.539.amzn2.aarch64",
+  "kernel_version": "4.14.322-244.539.amzn2.aarch64",
   "microcode_version": "0x00000000000000ff",
   "bios_version": "1.0",
   "bios_revision": "1.0",
   "guest_cpu_config": {
+    "kvm_capabilities": [],
+    "vcpu_features": [],
     "reg_modifiers": [
       {
         "addr": "0x60200000001000d4",
@@ -1048,4 +1050,4 @@
       }
     ]
   }
-}
+}
diff --git a/tests/data/cpu_template_helper/fingerprint_ARM_NEOVERSE_N1_5.10host.json b/tests/data/cpu_template_helper/fingerprint_ARM_NEOVERSE_N1_5.10host.json
@@ -1,10 +1,12 @@
 {
   "firecracker_version": "1.5.0-dev",
-  "kernel_version": "5.10.179-168.710.amzn2.aarch64",
+  "kernel_version": "5.10.192-182.736.amzn2.aarch64",
   "microcode_version": "0x00000000000000ff",
   "bios_version": "1.0",
   "bios_revision": "1.0",
   "guest_cpu_config": {
+    "kvm_capabilities": [],
+    "vcpu_features": [],
     "reg_modifiers": [
       {
         "addr": "0x60200000001000d4",
@@ -1252,4 +1254,4 @@
       }
     ]
   }
-}
+}
diff --git a/tests/data/cpu_template_helper/fingerprint_ARM_NEOVERSE_N1_6.1host.json b/tests/data/cpu_template_helper/fingerprint_ARM_NEOVERSE_N1_6.1host.json
@@ -1,10 +1,12 @@
 {
   "firecracker_version": "1.5.0-dev",
-  "kernel_version": "6.1.29-47.49.amzn2023.aarch64",
+  "kernel_version": "6.1.49-69.116.amzn2023.aarch64",
   "microcode_version": "0x00000000000000ff",
   "bios_version": "1.0",
   "bios_revision": "1.0",
   "guest_cpu_config": {
+    "kvm_capabilities": [],
+    "vcpu_features": [],
     "reg_modifiers": [
       {
         "addr": "0x60200000001000d4",
@@ -972,4 +974,4 @@
       }
     ]
   }
-}
+}
diff --git a/tests/data/cpu_template_helper/fingerprint_ARM_NEOVERSE_V1_4.14host.json b/tests/data/cpu_template_helper/fingerprint_ARM_NEOVERSE_V1_4.14host.json
@@ -1,10 +1,12 @@
 {
   "firecracker_version": "1.5.0-dev",
-  "kernel_version": "4.14.314-238.539.amzn2.aarch64",
+  "kernel_version": "4.14.322-244.539.amzn2.aarch64",
   "microcode_version": "0x0000000000000001",
   "bios_version": "1.0",
   "bios_revision": "1.0",
   "guest_cpu_config": {
+    "kvm_capabilities": [],
+    "vcpu_features": [],
     "reg_modifiers": [
       {
         "addr": "0x60200000001000d4",
@@ -156,7 +158,7 @@
       },
       {
         "addr": "0x6030000000100040",
-        "bitmap": "0b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000010000000000000000000"
+        "bitmap": "0b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000"
       },
       {
         "addr": "0x6030000000100042",

diff --git a/tests/data/cpu_template_helper/fingerprint_ARM_NEOVERSE_V1_5.10host.json b/tests/data/cpu_template_helper/fingerprint_ARM_NEOVERSE_V1_5.10host.json
@@ -1,10 +1,12 @@
 {
   "firecracker_version": "1.5.0-dev",
-  "kernel_version": "5.10.179-168.710.amzn2.aarch64",
+  "kernel_version": "5.10.192-182.736.amzn2.aarch64",
   "microcode_version": "0x0000000000000001",
   "bios_version": "1.0",
   "bios_revision": "1.0",
   "guest_cpu_config": {
+    "kvm_capabilities": [],
+    "vcpu_features": [],
     "reg_modifiers": [
       {
         "addr": "0x60200000001000d4",
@@ -1252,4 +1254,4 @@
       }
     ]
   }
-}
+}
diff --git a/tests/data/cpu_template_helper/fingerprint_ARM_NEOVERSE_V1_6.1host.json b/tests/data/cpu_template_helper/fingerprint_ARM_NEOVERSE_V1_6.1host.json
@@ -1,10 +1,12 @@
 {
   "firecracker_version": "1.5.0-dev",
-  "kernel_version": "6.1.29-47.49.amzn2023.aarch64",
+  "kernel_version": "6.1.49-69.116.amzn2023.aarch64",
   "microcode_version": "0x0000000000000001",
   "bios_version": "1.0",
   "bios_revision": "1.0",
   "guest_cpu_config": {
+    "kvm_capabilities": [],
+    "vcpu_features": [],
     "reg_modifiers": [
       {
         "addr": "0x60200000001000d4",
@@ -972,4 +974,4 @@
       }
     ]
   }
-}
+}
diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_4.14host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_4.14host.json
@@ -1,10 +1,11 @@
 {
   "firecracker_version": "1.5.0-dev",
-  "kernel_version": "4.14.314-238.539.amzn2.x86_64",
-  "microcode_version": "0x5003501",
+  "kernel_version": "4.14.322-244.539.amzn2.x86_64",
+  "microcode_version": "0x5003604",
   "bios_version": "1.0",
-  "bios_revision": "3.65",
+  "bios_revision": "3.80",
   "guest_cpu_config": {
+    "kvm_capabilities": [],
     "cpuid_modifiers": [
       {
         "leaf": "0x0",
@@ -931,7 +932,7 @@
       },
       {
         "addr": "0x10a",
-        "bitmap": "0b0000000000000000000000000000000000000000000010101010110001101011"
+        "bitmap": "0b0000000000000000000000000000000000000110000010101010110001101011"
       },
       {
         "addr": "0x140",

diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_5.10host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_5.10host.json
@@ -1,10 +1,11 @@
 {
   "firecracker_version": "1.5.0-dev",
-  "kernel_version": "5.10.179-168.710.amzn2.x86_64",
-  "microcode_version": "0x5003501",
+  "kernel_version": "5.10.192-182.736.amzn2.x86_64",
+  "microcode_version": "0x5003604",
   "bios_version": "1.0",
-  "bios_revision": "3.65",
+  "bios_revision": "3.80",
   "guest_cpu_config": {
+    "kvm_capabilities": [],
     "cpuid_modifiers": [
       {
         "leaf": "0x0",
@@ -1123,7 +1124,7 @@
       },
       {
         "addr": "0x10a",
-        "bitmap": "0b0000000000000000000000000000000000000000000010101010000011101011"
+        "bitmap": "0b0000000000000000000000000000000000000100000010101010000011101011"
       },
       {
         "addr": "0x140",

diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_6.1host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_6.1host.json
@@ -1,10 +1,11 @@
 {
   "firecracker_version": "1.5.0-dev",
-  "kernel_version": "6.1.29-47.49.amzn2023.x86_64",
-  "microcode_version": "0x5003501",
+  "kernel_version": "6.1.49-69.116.amzn2023.x86_64",
+  "microcode_version": "0x5003604",
   "bios_version": "1.0",
-  "bios_revision": "3.65",
+  "bios_revision": "3.80",
   "guest_cpu_config": {
+    "kvm_capabilities": [],
     "cpuid_modifiers": [
       {
         "leaf": "0x0",
@@ -1123,7 +1124,7 @@
       },
       {
         "addr": "0x10a",
-        "bitmap": "0b0000000000000000000000000000000000000000000010101010000011101011"
+        "bitmap": "0b0000000000000000000000000000000000000100000010101010000011101011"
       },
       {
         "addr": "0x140",

diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_4.14host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_4.14host.json
@@ -1,10 +1,11 @@
 {
   "firecracker_version": "1.5.0-dev",
-  "kernel_version": "4.14.314-238.539.amzn2.x86_64",
-  "microcode_version": "0xd000390",
+  "kernel_version": "4.14.322-244.539.amzn2.x86_64",
+  "microcode_version": "0xd0003a5",
   "bios_version": "1.0",
-  "bios_revision": "1.29",
+  "bios_revision": "1.32",
   "guest_cpu_config": {
+    "kvm_capabilities": [],
     "cpuid_modifiers": [
       {
         "leaf": "0x0",
@@ -885,7 +886,7 @@
       },
       {
         "addr": "0x10a",
-        "bitmap": "0b0000000000000000000000000000000000000000000000101011110001101011"
+        "bitmap": "0b0000000000000000000000000000000000000110000000101011110001101011"
       },
       {
         "addr": "0x140",

diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_5.10host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_5.10host.json
@@ -1,10 +1,11 @@
 {
   "firecracker_version": "1.5.0-dev",
-  "kernel_version": "5.10.179-168.710.amzn2.x86_64",
-  "microcode_version": "0xd000390",
+  "kernel_version": "5.10.192-182.736.amzn2.x86_64",
+  "microcode_version": "0xd0003a5",
   "bios_version": "1.0",
-  "bios_revision": "1.25",
+  "bios_revision": "1.32",
   "guest_cpu_config": {
+    "kvm_capabilities": [],
     "cpuid_modifiers": [
       {
         "leaf": "0x0",
@@ -1215,7 +1216,7 @@
       },
       {
         "addr": "0x10a",
-        "bitmap": "0b0000000000000000000000000000000000000000000000101010000011101011"
+        "bitmap": "0b0000000000000000000000000000000000000100000000101010000011101011"
       },
       {
         "addr": "0x140",

diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_6.1host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_6.1host.json
@@ -1,10 +1,11 @@
 {
   "firecracker_version": "1.5.0-dev",
-  "kernel_version": "6.1.29-47.49.amzn2023.x86_64",
-  "microcode_version": "0xd000390",
+  "kernel_version": "6.1.49-69.116.amzn2023.x86_64",
+  "microcode_version": "0xd0003a5",
   "bios_version": "1.0",
-  "bios_revision": "1.25",
+  "bios_revision": "1.32",
   "guest_cpu_config": {
+    "kvm_capabilities": [],
     "cpuid_modifiers": [
       {
         "leaf": "0x0",
@@ -1215,7 +1216,7 @@
       },
       {
         "addr": "0x10a",
-        "bitmap": "0b0000000000000000000000000000000000000000000000101010000011101011"
+        "bitmap": "0b0000000000000000000000000000000000000100000000101010000011101011"
       },
       {
         "addr": "0x140",

diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_4.14host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_4.14host.json
@@ -1,10 +1,11 @@
 {
   "firecracker_version": "1.5.0-dev",
-  "kernel_version": "4.14.314-238.539.amzn2.x86_64",
-  "microcode_version": "0x2006f05",
+  "kernel_version": "4.14.322-244.539.amzn2.x86_64",
+  "microcode_version": "0x2007006",
   "bios_version": "1.0",
-  "bios_revision": "3.65",
+  "bios_revision": "3.80",
   "guest_cpu_config": {
+    "kvm_capabilities": [],
     "cpuid_modifiers": [
       {
         "leaf": "0x0",
@@ -931,7 +932,7 @@
       },
       {
         "addr": "0x10a",
-        "bitmap": "0b0000000000000000000000000000000000000000000000000000110001001100"
+        "bitmap": "0b0000000000000000000000000000000000000110000000000000110001001100"
       },
       {
         "addr": "0x140",