diff --git a/.buildkite/common.py b/.buildkite/common.py index 57a46f945d0..6860608e341 100644 --- a/.buildkite/common.py +++ b/.buildkite/common.py @@ -16,9 +16,8 @@ # fmt: off DEFAULT_INSTANCES = [ - "c5n.metal", # Intel Skylake "m5n.metal", # Intel Cascade Lake - "m6i.metal", # Intel Icelake + "m6i.metal", # Intel Ice Lake "m7i.metal-24xl", # Intel Sapphire Rapids "m7i.metal-48xl", # Intel Sapphire Rapids "m6a.metal", # AMD Milan diff --git a/.buildkite/pipeline_cpu_template.py b/.buildkite/pipeline_cpu_template.py index 312f9061ed1..f984f85648e 100755 --- a/.buildkite/pipeline_cpu_template.py +++ b/.buildkite/pipeline_cpu_template.py @@ -27,7 +27,6 @@ class BkStep(str, Enum): ], BkStep.LABEL: "πŸ“– rdmsr", "instances": [ - "c5n.metal", "m5n.metal", "m6i.metal", "m7i.metal-24xl", @@ -63,12 +62,10 @@ class BkStep(str, Enum): BkStep.TIMEOUT: 30, }, "cross_instances": { - "m5n.metal": ["c5n.metal", "m6i.metal"], - "c5n.metal": ["m5n.metal", "m6i.metal"], - "m6i.metal": ["m5n.metal", "c5n.metal"], + "m5n.metal": ["m6i.metal"], + "m6i.metal": ["m5n.metal"], }, "instances": [ - "c5n.metal", "m5n.metal", "m6i.metal", "m7i.metal-24xl", diff --git a/.buildkite/pipeline_cross.py b/.buildkite/pipeline_cross.py index e9a7be73891..f476fee76ad 100755 --- a/.buildkite/pipeline_cross.py +++ b/.buildkite/pipeline_cross.py @@ -19,7 +19,6 @@ per_instance.pop("instances") per_instance.pop("platforms") instances_x86_64 = [ - "c5n.metal", "m5n.metal", "m6i.metal", "m7i.metal-24xl", @@ -49,9 +48,8 @@ # allow-list of what instances can be restores on what other instances (in # addition to itself) supported = { - "c5n.metal": ["m5n.metal", "m6i.metal"], - "m5n.metal": ["c5n.metal", "m6i.metal"], - "m6i.metal": ["c5n.metal", "m5n.metal"], + "m5n.metal": ["m6i.metal"], + "m6i.metal": ["m5n.metal"], } # https://github.com/firecracker-microvm/firecracker/blob/main/docs/kernel-policy.md#experimental-snapshot-compatibility-across-kernel-versions @@ -82,7 +80,6 @@ continue pytest_keyword_for_instance = { - "c5n.metal": "-k 'not None'", "m5n.metal": "-k 'not None'", "m6i.metal": "-k 'not None'", "m6a.metal": "", diff --git a/CHANGELOG.md b/CHANGELOG.md index 5892614b4a3..f9dc8a03f12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -84,6 +84,11 @@ and this project adheres to ### Removed +- [#5411](https://github.com/firecracker-microvm/firecracker/pull/5411): Removed + official support for Intel Skylake instances. Firecracker will continue to + work on those instances, but we will no longer perform automated testing on + them. + ### Fixed - [#5222](https://github.com/firecracker-microvm/firecracker/pull/5222): Fixed diff --git a/README.md b/README.md index a03f098eb32..3e5eb984688 100644 --- a/README.md +++ b/README.md @@ -130,19 +130,18 @@ The **API endpoint** can be used to: We test all combinations of: -| Instance | Host OS & Kernel | Guest Rootfs | Guest Kernel | -| :------------- | :--------------- | :----------- | :----------- | -| c5n.metal | al2 linux_5.10 | ubuntu 24.04 | linux_5.10 | -| m5n.metal | al2023 linux_6.1 | | linux_6.1 | -| m6i.metal | | | | -| m7i.metal-24xl | | | | -| m7i.metal-48xl | | | | -| m6a.metal | | | | -| m7a.metal-48xl | | | | -| m6g.metal | | | | -| m7g.metal | | | | -| m8g.metal-24xl | | | | -| m8g.metal-48xl | | | | +| Instance | Host OS & Kernel | Guest Rootfs | Guest Kernel | +| :------------------------------------- | :--------------- | :----------- | :----------- | +| m5n.metal (Intel Cascade Lake) | al2 linux_5.10 | ubuntu 24.04 | linux_5.10 | +| m6i.metal (Intel Ice Lake) | al2023 linux_6.1 | | linux_6.1 | +| m7i.metal-24xl (Intel Sapphire Rapids) | | | | +| m7i.metal-48xl (Intel Sapphire Rapids) | | | | +| m6a.metal (AMD Milan) | | | | +| m7a.metal-48xl (AMD Genoa) | | | | +| m6g.metal (Graviton 2) | | | | +| m7g.metal (Graviton 3) | | | | +| m8g.metal-24xl (Graviton 4) | | | | +| m8g.metal-48xl (Graviton 4) | | | | ## Known issues and Limitations diff --git a/docs/snapshotting/snapshot-support.md b/docs/snapshotting/snapshot-support.md index 9f8a443179d..6e1ac4d4c35 100644 --- a/docs/snapshotting/snapshot-support.md +++ b/docs/snapshotting/snapshot-support.md @@ -625,10 +625,11 @@ the compatibility table reported below: | .metal instance type | taken on host kernel | restored on host kernel | | -------------------- | -------------------- | ----------------------- | -| {c5n,m5n,m6i,m6a} | 5.10 | 6.1 | +| {m5n,m6i,m6a} | 5.10 | 6.1 | -For example, a snapshot taken on a m6i.metal host running a 5.10 host kernel can -be restored on a different m6i.metal host running a 6.1 host kernel (but not -vice versa), but could not be restored on a c5n.metal host. +For example, a snapshot taken on a m6i.metal host (Intel Ice Lake) running a +5.10 host kernel can be restored on a different m6i.metal host running a 6.1 +host kernel (but not vice versa), but could not be restored on a m5n.metal host +(Intel Cascade Lake). [man mincore]: https://man7.org/linux/man-pages/man2/mincore.2.html diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_5.10host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_5.10host.json deleted file mode 100644 index ce346c88a28..00000000000 --- a/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_5.10host.json +++ /dev/null @@ -1,1227 +0,0 @@ -{ - "firecracker_version": "1.13.0-dev", - "kernel_version": "5.10.238-234.956.amzn2.x86_64", - "microcode_version": "0x2007006", - "bios_version": "1.0", - "bios_revision": "4.14", - "guest_cpu_config": { - "kvm_capabilities": [], - "cpuid_modifiers": [ - { - "leaf": "0x0", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000010110" - }, - { - "register": "ebx", - "bitmap": "0b01110101011011100110010101000111" - }, - { - "register": "ecx", - "bitmap": "0b01101100011001010111010001101110" - }, - { - "register": "edx", - "bitmap": "0b01001001011001010110111001101001" - } - ] - }, - { - "leaf": "0x1", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000001010000011001010100" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000010000100000000000" - }, - { - "register": "ecx", - "bitmap": "0b11110111111110100011001000000011" - }, - { - "register": "edx", - "bitmap": "0b00001111100010111111101111111111" - } - ] - }, - { - "leaf": "0x2", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b01110110000000110110001100000001" - }, - { - "register": "ebx", - "bitmap": "0b00000000111100001011010111111111" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000110000110000000000000000" - } - ] - }, - { - "leaf": "0x3", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x4", - "subleaf": "0x0", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000100100001" - }, - { - "register": "ebx", - "bitmap": "0b00000001110000000000000000111111" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000111111" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x4", - "subleaf": "0x1", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000100100010" - }, - { - "register": "ebx", - "bitmap": "0b00000001110000000000000000111111" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000111111" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x4", - "subleaf": "0x2", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000101000011" - }, - { - "register": "ebx", - "bitmap": "0b00000011110000000000000000111111" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000001111111111" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x4", - "subleaf": "0x3", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000101100011" - }, - { - "register": "ebx", - "bitmap": "0b00000010100000000000000000111111" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000001000111111111111" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000100" - } - ] - }, - { - "leaf": "0x4", - "subleaf": "0x4", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x5", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x6", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000100" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x7", - "subleaf": "0x0", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b11010001100111110110111111111011" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000001100" - }, - { - "register": "edx", - "bitmap": "0b10101100000000000000010000000000" - } - ] - }, - { - "leaf": "0x8", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x9", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xa", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xb", - "subleaf": "0x0", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000001" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000100000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xb", - "subleaf": "0x1", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000101" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000001" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000001000000001" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xc", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xd", - "subleaf": "0x0", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000001011111111" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000001001000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000101010001000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xd", - "subleaf": "0x1", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000001111" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000001001000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xd", - "subleaf": "0x2", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000100000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000001001000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xd", - "subleaf": "0x3", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000001000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000001111000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xd", - "subleaf": "0x4", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000001000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000010000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xd", - "subleaf": "0x5", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000001000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000010001000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xd", - "subleaf": "0x6", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000001000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000010010000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xd", - "subleaf": "0x7", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000010000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000011010000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xd", - "subleaf": "0x9", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000001000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000101010000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xe", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xf", - "subleaf": "0x0", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x10", - "subleaf": "0x0", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x11", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x12", - "subleaf": "0x0", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x13", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x14", - "subleaf": "0x0", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x15", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x16", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x40000000", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b01000000000000000000000000000001" - }, - { - "register": "ebx", - "bitmap": "0b01001011010011010101011001001011" - }, - { - "register": "ecx", - "bitmap": "0b01010110010010110100110101010110" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000001001101" - } - ] - }, - { - "leaf": "0x40000001", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000001000000000111111011111011" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x80000000", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b10000000000000000000000000001000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x80000001", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000100100001" - }, - { - "register": "edx", - "bitmap": "0b00101100000100000000100000000000" - } - ] - }, - { - "leaf": "0x80000002", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b01100101011101000110111001001001" - }, - { - "register": "ebx", - "bitmap": "0b00101001010100100010100001101100" - }, - { - "register": "ecx", - "bitmap": "0b01101111011001010101100000100000" - }, - { - "register": "edx", - "bitmap": "0b00101001010100100010100001101110" - } - ] - }, - { - "leaf": "0x80000003", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b01101111011100100101000000100000" - }, - { - "register": "ebx", - "bitmap": "0b01110011011100110110010101100011" - }, - { - "register": "ecx", - "bitmap": "0b01000000001000000111001001101111" - }, - { - "register": "edx", - "bitmap": "0b00110000001011100011001100100000" - } - ] - }, - { - "leaf": "0x80000004", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b01111010010010000100011100110000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x80000005", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x80000006", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000001000000000110000001000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x80000007", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000100000000" - } - ] - }, - { - "leaf": "0x80000008", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000011000000101110" - }, - { - "register": "ebx", - "bitmap": "0b00000001000000001101000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - } - ], - "msr_modifiers": [ - { - "addr": "0x11", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x12", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x34", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x3a", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x3b", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x48", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x8b", - "bitmap": "0b0000000000000000000000000000000100000000000000000000000000000000" - }, - { - "addr": "0x9e", - "bitmap": "0b0000000000000000000000000000000000000000000000110000000000000000" - }, - { - "addr": "0xce", - "bitmap": "0b0000000000000000000000000000000010000000000000000000000000000000" - }, - { - "addr": "0x10a", - "bitmap": "0b0100000000000000000000000000000000001100000000000000000001001100" - }, - { - "addr": "0x140", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x174", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x175", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x176", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x1a0", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000001" - }, - { - "addr": "0x1fc", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x277", - "bitmap": "0b0000000000000111000001000000011000000000000001110000010000000110" - }, - { - "addr": "0xd90", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x4b564d00", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x4b564d01", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x4b564d02", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x4b564d03", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x4b564d04", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x4b564d05", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000001" - }, - { - "addr": "0x4b564d06", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x4b564d07", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0xc0000081", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0xc0000082", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0xc0000083", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0xc0000084", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0xc0000102", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0xc0000103", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0xc0010015", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - } - ] - } -} \ No newline at end of file diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_6.1host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_6.1host.json deleted file mode 100644 index 87c941f3a04..00000000000 --- a/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_6.1host.json +++ /dev/null @@ -1,1227 +0,0 @@ -{ - "firecracker_version": "1.13.0-dev", - "kernel_version": "6.1.141-165.249.amzn2023.x86_64", - "microcode_version": "0x2007006", - "bios_version": "1.0", - "bios_revision": "4.14", - "guest_cpu_config": { - "kvm_capabilities": [], - "cpuid_modifiers": [ - { - "leaf": "0x0", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000010110" - }, - { - "register": "ebx", - "bitmap": "0b01110101011011100110010101000111" - }, - { - "register": "ecx", - "bitmap": "0b01101100011001010111010001101110" - }, - { - "register": "edx", - "bitmap": "0b01001001011001010110111001101001" - } - ] - }, - { - "leaf": "0x1", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000001010000011001010100" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000010000100000000000" - }, - { - "register": "ecx", - "bitmap": "0b11110111111110100011001000000011" - }, - { - "register": "edx", - "bitmap": "0b00001111100010111111101111111111" - } - ] - }, - { - "leaf": "0x2", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b01110110000000110110001100000001" - }, - { - "register": "ebx", - "bitmap": "0b00000000111100001011010111111111" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000110000110000000000000000" - } - ] - }, - { - "leaf": "0x3", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x4", - "subleaf": "0x0", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000100100001" - }, - { - "register": "ebx", - "bitmap": "0b00000001110000000000000000111111" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000111111" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x4", - "subleaf": "0x1", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000100100010" - }, - { - "register": "ebx", - "bitmap": "0b00000001110000000000000000111111" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000111111" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x4", - "subleaf": "0x2", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000101000011" - }, - { - "register": "ebx", - "bitmap": "0b00000011110000000000000000111111" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000001111111111" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x4", - "subleaf": "0x3", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000101100011" - }, - { - "register": "ebx", - "bitmap": "0b00000010100000000000000000111111" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000001000111111111111" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000100" - } - ] - }, - { - "leaf": "0x4", - "subleaf": "0x4", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x5", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x6", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000100" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x7", - "subleaf": "0x0", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b11010001100111110110111111111011" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000001100" - }, - { - "register": "edx", - "bitmap": "0b10101100000000000000010000000000" - } - ] - }, - { - "leaf": "0x8", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x9", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xa", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xb", - "subleaf": "0x0", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000001" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000100000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xb", - "subleaf": "0x1", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000101" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000001" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000001000000001" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xc", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xd", - "subleaf": "0x0", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000001011111111" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000001001000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000101010001000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xd", - "subleaf": "0x1", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000001111" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000001001000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xd", - "subleaf": "0x2", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000100000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000001001000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xd", - "subleaf": "0x3", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000001000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000001111000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xd", - "subleaf": "0x4", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000001000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000010000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xd", - "subleaf": "0x5", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000001000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000010001000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xd", - "subleaf": "0x6", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000001000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000010010000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xd", - "subleaf": "0x7", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000010000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000011010000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xd", - "subleaf": "0x9", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000001000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000101010000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xe", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0xf", - "subleaf": "0x0", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x10", - "subleaf": "0x0", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x11", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x12", - "subleaf": "0x0", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x13", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x14", - "subleaf": "0x0", - "flags": 1, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x15", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x16", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x40000000", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b01000000000000000000000000000001" - }, - { - "register": "ebx", - "bitmap": "0b01001011010011010101011001001011" - }, - { - "register": "ecx", - "bitmap": "0b01010110010010110100110101010110" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000001001101" - } - ] - }, - { - "leaf": "0x40000001", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000001000000000111111011111011" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x80000000", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b10000000000000000000000000001000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x80000001", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000100100001" - }, - { - "register": "edx", - "bitmap": "0b00101100000100000000100000000000" - } - ] - }, - { - "leaf": "0x80000002", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b01100101011101000110111001001001" - }, - { - "register": "ebx", - "bitmap": "0b00101001010100100010100001101100" - }, - { - "register": "ecx", - "bitmap": "0b01101111011001010101100000100000" - }, - { - "register": "edx", - "bitmap": "0b00101001010100100010100001101110" - } - ] - }, - { - "leaf": "0x80000003", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b01101111011100100101000000100000" - }, - { - "register": "ebx", - "bitmap": "0b01110011011100110110010101100011" - }, - { - "register": "ecx", - "bitmap": "0b01000000001000000111001001101111" - }, - { - "register": "edx", - "bitmap": "0b00110000001011100011001100100000" - } - ] - }, - { - "leaf": "0x80000004", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b01111010010010000100011100110000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x80000005", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x80000006", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000001000000000110000001000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - }, - { - "leaf": "0x80000007", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ebx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000100000000" - } - ] - }, - { - "leaf": "0x80000008", - "subleaf": "0x0", - "flags": 0, - "modifiers": [ - { - "register": "eax", - "bitmap": "0b00000000000000000011000000101110" - }, - { - "register": "ebx", - "bitmap": "0b00000001000000001101000000000000" - }, - { - "register": "ecx", - "bitmap": "0b00000000000000000000000000000000" - }, - { - "register": "edx", - "bitmap": "0b00000000000000000000000000000000" - } - ] - } - ], - "msr_modifiers": [ - { - "addr": "0x11", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x12", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x34", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x3a", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x3b", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x48", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x8b", - "bitmap": "0b0000000000000000000000000000000100000000000000000000000000000000" - }, - { - "addr": "0x9e", - "bitmap": "0b0000000000000000000000000000000000000000000000110000000000000000" - }, - { - "addr": "0xce", - "bitmap": "0b0000000000000000000000000000000010000000000000000000000000000000" - }, - { - "addr": "0x10a", - "bitmap": "0b0100000000000000000000000000000000001100000000000000000001001100" - }, - { - "addr": "0x140", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x174", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x175", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x176", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x1a0", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000001" - }, - { - "addr": "0x1fc", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x277", - "bitmap": "0b0000000000000111000001000000011000000000000001110000010000000110" - }, - { - "addr": "0xd90", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x4b564d00", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x4b564d01", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x4b564d02", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x4b564d03", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x4b564d04", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x4b564d05", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000001" - }, - { - "addr": "0x4b564d06", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0x4b564d07", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0xc0000081", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0xc0000082", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0xc0000083", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0xc0000084", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0xc0000102", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0xc0000103", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - }, - { - "addr": "0xc0010015", - "bitmap": "0b0000000000000000000000000000000000000000000000000000000000000000" - } - ] - } -} \ No newline at end of file diff --git a/tests/data/msr/msr_list_T2S_INTEL_SKYLAKE_5.10host_5.10guest.csv b/tests/data/msr/msr_list_T2S_INTEL_SKYLAKE_5.10host_5.10guest.csv deleted file mode 100644 index c901b2c8483..00000000000 --- a/tests/data/msr/msr_list_T2S_INTEL_SKYLAKE_5.10host_5.10guest.csv +++ /dev/null @@ -1,508 +0,0 @@ -MSR_ADDR,VALUE -0x0,0x0 -0x1,0x0 -0x10,0xff34f950 -0x11,0x2748008 -0x12,0x2749001 -0x17,0x0 -0x1b,0xfee00d00 -0x2a,0x0 -0x2c,0x1000000 -0x34,0x0 -0x3a,0x1 -0x3b,0x0 -0x48,0x1 -0x8b,0x100000000 -0xc1,0x0 -0xc2,0x0 -0xcd,0x3 -0xce,0x80000000 -0xfe,0x508 -0x10a,0xc080c4c -0x11e,0xbe702111 -0x140,0x0 -0x174,0x10 -0x175,0xfffffe0000003000 -0x176,0xffffffff81801450 -0x179,0x20 -0x17a,0x0 -0x186,0x0 -0x187,0x0 -0x198,0x400000003e8 -0x199,0x0 -0x1a0,0x1 -0x1d9,0x0 -0x1db,0x0 -0x1dc,0x0 -0x1dd,0x0 -0x1de,0x0 -0x1fc,0x0 -0x200,0x0 -0x201,0x0 -0x202,0x0 -0x203,0x0 -0x204,0x0 -0x205,0x0 -0x206,0x0 -0x207,0x0 -0x208,0x0 -0x209,0x0 -0x20a,0x0 -0x20b,0x0 -0x20c,0x0 -0x20d,0x0 -0x20e,0x0 -0x20f,0x0 -0x250,0x0 -0x258,0x0 -0x259,0x0 -0x268,0x0 -0x269,0x0 -0x26a,0x0 -0x26b,0x0 -0x26c,0x0 -0x26d,0x0 -0x26e,0x0 -0x26f,0x0 -0x277,0x7040600070406 -0x2ff,0x0 -0x400,0x0 -0x401,0x0 -0x402,0x0 -0x403,0x0 -0x404,0x0 -0x405,0x0 -0x406,0x0 -0x407,0x0 -0x408,0x0 -0x409,0x0 -0x40a,0x0 -0x40b,0x0 -0x40c,0x0 -0x40d,0x0 -0x40e,0x0 -0x40f,0x0 -0x410,0x0 -0x411,0x0 -0x412,0x0 -0x413,0x0 -0x414,0x0 -0x415,0x0 -0x416,0x0 -0x417,0x0 -0x418,0x0 -0x419,0x0 -0x41a,0x0 -0x41b,0x0 -0x41c,0x0 -0x41d,0x0 -0x41e,0x0 -0x41f,0x0 -0x420,0x0 -0x421,0x0 -0x422,0x0 -0x423,0x0 -0x424,0x0 -0x425,0x0 -0x426,0x0 -0x427,0x0 -0x428,0x0 -0x429,0x0 -0x42a,0x0 -0x42b,0x0 -0x42c,0x0 -0x42d,0x0 -0x42e,0x0 -0x42f,0x0 -0x430,0x0 -0x431,0x0 -0x432,0x0 -0x433,0x0 -0x434,0x0 -0x435,0x0 -0x436,0x0 -0x437,0x0 -0x438,0x0 -0x439,0x0 -0x43a,0x0 -0x43b,0x0 -0x43c,0x0 -0x43d,0x0 -0x43e,0x0 -0x43f,0x0 -0x440,0x0 -0x441,0x0 -0x442,0x0 -0x443,0x0 -0x444,0x0 -0x445,0x0 -0x446,0x0 -0x447,0x0 -0x448,0x0 -0x449,0x0 -0x44a,0x0 -0x44b,0x0 -0x44c,0x0 -0x44d,0x0 -0x44e,0x0 -0x44f,0x0 -0x450,0x0 -0x451,0x0 -0x452,0x0 -0x453,0x0 -0x454,0x0 -0x455,0x0 -0x456,0x0 -0x457,0x0 -0x458,0x0 -0x459,0x0 -0x45a,0x0 -0x45b,0x0 -0x45c,0x0 -0x45d,0x0 -0x45e,0x0 -0x45f,0x0 -0x460,0x0 -0x461,0x0 -0x462,0x0 -0x463,0x0 -0x464,0x0 -0x465,0x0 -0x466,0x0 -0x467,0x0 -0x468,0x0 -0x469,0x0 -0x46a,0x0 -0x46b,0x0 -0x46c,0x0 -0x46d,0x0 -0x46e,0x0 -0x46f,0x0 -0x470,0x0 -0x471,0x0 -0x472,0x0 -0x473,0x0 -0x474,0x0 -0x475,0x0 -0x476,0x0 -0x477,0x0 -0x478,0x0 -0x479,0x0 -0x47a,0x0 -0x47b,0x0 -0x47c,0x0 -0x47d,0x0 -0x47e,0x0 -0x47f,0x0 -0x606,0x0 -0x611,0x0 -0x619,0x0 -0x639,0x0 -0x641,0x0 -0x6e0,0x2d1e43b52 -0x800,0x0 -0x801,0x0 -0x802,0x0 -0x803,0x50014 -0x804,0x0 -0x805,0x0 -0x806,0x0 -0x807,0x0 -0x808,0x10 -0x809,0x0 -0x80a,0x10 -0x80b,0x0 -0x80c,0x0 -0x80d,0x1 -0x80e,0xffffffff -0x80f,0x1ff -0x810,0x0 -0x811,0x0 -0x812,0x0 -0x813,0x0 -0x814,0x0 -0x815,0x0 -0x816,0x0 -0x817,0x0 -0x818,0x0 -0x819,0x0 -0x81a,0x0 -0x81b,0x0 -0x81c,0x0 -0x81d,0x0 -0x81e,0x0 -0x81f,0x0 -0x820,0x0 -0x821,0x0 -0x822,0x0 -0x823,0x0 -0x824,0x0 -0x825,0x0 -0x826,0x0 -0x827,0x0 -0x828,0x0 -0x829,0x0 -0x82a,0x0 -0x82b,0x0 -0x82c,0x0 -0x82d,0x0 -0x82e,0x0 -0x82f,0x0 -0x830,0x0 -0x831,0x0 -0x832,0x400ec -0x833,0x10000 -0x834,0x10000 -0x835,0x10700 -0x836,0x400 -0x837,0xfe -0x838,0x0 -0x839,0x0 -0x83a,0x0 -0x83b,0x0 -0x83c,0x0 -0x83d,0x0 -0x83e,0x0 -0x83f,0x0 -0x840,0x0 -0x841,0x0 -0x842,0x0 -0x843,0x0 -0x844,0x0 -0x845,0x0 -0x846,0x0 -0x847,0x0 -0x848,0x0 -0x849,0x0 -0x84a,0x0 -0x84b,0x0 -0x84c,0x0 -0x84d,0x0 -0x84e,0x0 -0x84f,0x0 -0x850,0x0 -0x851,0x0 -0x852,0x0 -0x853,0x0 -0x854,0x0 -0x855,0x0 -0x856,0x0 -0x857,0x0 -0x858,0x0 -0x859,0x0 -0x85a,0x0 -0x85b,0x0 -0x85c,0x0 -0x85d,0x0 -0x85e,0x0 -0x85f,0x0 -0x860,0x0 -0x861,0x0 -0x862,0x0 -0x863,0x0 -0x864,0x0 -0x865,0x0 -0x866,0x0 -0x867,0x0 -0x868,0x0 -0x869,0x0 -0x86a,0x0 -0x86b,0x0 -0x86c,0x0 -0x86d,0x0 -0x86e,0x0 -0x86f,0x0 -0x870,0x0 -0x871,0x0 -0x872,0x0 -0x873,0x0 -0x874,0x0 -0x875,0x0 -0x876,0x0 -0x877,0x0 -0x878,0x0 -0x879,0x0 -0x87a,0x0 -0x87b,0x0 -0x87c,0x0 -0x87d,0x0 -0x87e,0x0 -0x87f,0x0 -0x880,0x0 -0x881,0x0 -0x882,0x0 -0x883,0x0 -0x884,0x0 -0x885,0x0 -0x886,0x0 -0x887,0x0 -0x888,0x0 -0x889,0x0 -0x88a,0x0 -0x88b,0x0 -0x88c,0x0 -0x88d,0x0 -0x88e,0x0 -0x88f,0x0 -0x890,0x0 -0x891,0x0 -0x892,0x0 -0x893,0x0 -0x894,0x0 -0x895,0x0 -0x896,0x0 -0x897,0x0 -0x898,0x0 -0x899,0x0 -0x89a,0x0 -0x89b,0x0 -0x89c,0x0 -0x89d,0x0 -0x89e,0x0 -0x89f,0x0 -0x8a0,0x0 -0x8a1,0x0 -0x8a2,0x0 -0x8a3,0x0 -0x8a4,0x0 -0x8a5,0x0 -0x8a6,0x0 -0x8a7,0x0 -0x8a8,0x0 -0x8a9,0x0 -0x8aa,0x0 -0x8ab,0x0 -0x8ac,0x0 -0x8ad,0x0 -0x8ae,0x0 -0x8af,0x0 -0x8b0,0x0 -0x8b1,0x0 -0x8b2,0x0 -0x8b3,0x0 -0x8b4,0x0 -0x8b5,0x0 -0x8b6,0x0 -0x8b7,0x0 -0x8b8,0x0 -0x8b9,0x0 -0x8ba,0x0 -0x8bb,0x0 -0x8bc,0x0 -0x8bd,0x0 -0x8be,0x0 -0x8bf,0x0 -0x8c0,0x0 -0x8c1,0x0 -0x8c2,0x0 -0x8c3,0x0 -0x8c4,0x0 -0x8c5,0x0 -0x8c6,0x0 -0x8c7,0x0 -0x8c8,0x0 -0x8c9,0x0 -0x8ca,0x0 -0x8cb,0x0 -0x8cc,0x0 -0x8cd,0x0 -0x8ce,0x0 -0x8cf,0x0 -0x8d0,0x0 -0x8d1,0x0 -0x8d2,0x0 -0x8d3,0x0 -0x8d4,0x0 -0x8d5,0x0 -0x8d6,0x0 -0x8d7,0x0 -0x8d8,0x0 -0x8d9,0x0 -0x8da,0x0 -0x8db,0x0 -0x8dc,0x0 -0x8dd,0x0 -0x8de,0x0 -0x8df,0x0 -0x8e0,0x0 -0x8e1,0x0 -0x8e2,0x0 -0x8e3,0x0 -0x8e4,0x0 -0x8e5,0x0 -0x8e6,0x0 -0x8e7,0x0 -0x8e8,0x0 -0x8e9,0x0 -0x8ea,0x0 -0x8eb,0x0 -0x8ec,0x0 -0x8ed,0x0 -0x8ee,0x0 -0x8ef,0x0 -0x8f0,0x0 -0x8f1,0x0 -0x8f2,0x0 -0x8f3,0x0 -0x8f4,0x0 -0x8f5,0x0 -0x8f6,0x0 -0x8f7,0x0 -0x8f8,0x0 -0x8f9,0x0 -0x8fa,0x0 -0x8fb,0x0 -0x8fc,0x0 -0x8fd,0x0 -0x8fe,0x0 -0x8ff,0x0 -0xc0000080,0xd01 -0xc0000081,0x23001000000000 -0xc0000082,0xffffffff81800040 -0xc0000083,0xffffffff81801500 -0xc0000084,0x47700 -0xc0000100,0x7ff086f4a740 -0xc0000101,0xffff88803ec00000 -0xc0000102,0x0 -0xc0000103,0x0 -0xc0010000,0x0 -0xc0010001,0x0 -0xc0010002,0x0 -0xc0010003,0x0 -0xc0010004,0x0 -0xc0010005,0x0 -0xc0010006,0x0 -0xc0010007,0x0 -0xc0010010,0x0 -0xc0010015,0x0 -0xc001001b,0x20000000 -0xc001001f,0x0 -0xc0010055,0x0 -0xc0010058,0x0 -0xc0010112,0x0 -0xc0010113,0x0 -0xc0010117,0x0 -0xc0010200,0x0 -0xc0010201,0x0 -0xc0010202,0x0 -0xc0010203,0x0 -0xc0010204,0x0 -0xc0010205,0x0 -0xc0010206,0x0 -0xc0010207,0x0 -0xc0010208,0x0 -0xc0010209,0x0 -0xc001020a,0x0 -0xc001020b,0x0 -0xc0011022,0x0 -0xc0011023,0x0 -0xc001102a,0x0 -0xc001102c,0x0 -0x400000000,0x0 -0x2000000000,0x0 -0x4000000000,0x0 -0x8000000000,0x0 -0x1000000000000,0x0 -0x3c000000000000,0x0 -0x80000000000000,0x0 -0x40000000000000,0x0 diff --git a/tests/data/msr/msr_list_T2S_INTEL_SKYLAKE_5.10host_6.1guest.csv b/tests/data/msr/msr_list_T2S_INTEL_SKYLAKE_5.10host_6.1guest.csv deleted file mode 100644 index 8ba340cea6d..00000000000 --- a/tests/data/msr/msr_list_T2S_INTEL_SKYLAKE_5.10host_6.1guest.csv +++ /dev/null @@ -1,508 +0,0 @@ -MSR_ADDR,VALUE -0x0,0x0 -0x1,0x0 -0x10,0xff34f950 -0x11,0x2748008 -0x12,0x2749001 -0x17,0x0 -0x1b,0xfee00d00 -0x2a,0x0 -0x2c,0x1000000 -0x34,0x0 -0x3a,0x1 -0x3b,0x0 -0x48,0x1 -0x8b,0x100000000 -0xc1,0x0 -0xc2,0x0 -0xcd,0x3 -0xce,0x80000000 -0xfe,0x508 -0x10a,0xc080c4c -0x11e,0xbe702111 -0x140,0x0 -0x174,0x10 -0x175,0xfffffe0000003000 -0x176,0xffffffff81801450 -0x179,0x20 -0x17a,0x0 -0x186,0x0 -0x187,0x0 -0x198,0x400000003e8 -0x199,0x0 -0x1a0,0x1 -0x1d9,0x0 -0x1db,0x0 -0x1dc,0x0 -0x1dd,0x0 -0x1de,0x0 -0x1fc,0x0 -0x200,0x0 -0x201,0x0 -0x202,0x0 -0x203,0x0 -0x204,0x0 -0x205,0x0 -0x206,0x0 -0x207,0x0 -0x208,0x0 -0x209,0x0 -0x20a,0x0 -0x20b,0x0 -0x20c,0x0 -0x20d,0x0 -0x20e,0x0 -0x20f,0x0 -0x250,0x0 -0x258,0x0 -0x259,0x0 -0x268,0x0 -0x269,0x0 -0x26a,0x0 -0x26b,0x0 -0x26c,0x0 -0x26d,0x0 -0x26e,0x0 -0x26f,0x0 -0x277,0x7040600070406 -0x2ff,0x0 -0x400,0x0 -0x401,0x0 -0x402,0x0 -0x403,0x0 -0x404,0x0 -0x405,0x0 -0x406,0x0 -0x407,0x0 -0x408,0x0 -0x409,0x0 -0x40a,0x0 -0x40b,0x0 -0x40c,0x0 -0x40d,0x0 -0x40e,0x0 -0x40f,0x0 -0x410,0x0 -0x411,0x0 -0x412,0x0 -0x413,0x0 -0x414,0x0 -0x415,0x0 -0x416,0x0 -0x417,0x0 -0x418,0x0 -0x419,0x0 -0x41a,0x0 -0x41b,0x0 -0x41c,0x0 -0x41d,0x0 -0x41e,0x0 -0x41f,0x0 -0x420,0x0 -0x421,0x0 -0x422,0x0 -0x423,0x0 -0x424,0x0 -0x425,0x0 -0x426,0x0 -0x427,0x0 -0x428,0x0 -0x429,0x0 -0x42a,0x0 -0x42b,0x0 -0x42c,0x0 -0x42d,0x0 -0x42e,0x0 -0x42f,0x0 -0x430,0x0 -0x431,0x0 -0x432,0x0 -0x433,0x0 -0x434,0x0 -0x435,0x0 -0x436,0x0 -0x437,0x0 -0x438,0x0 -0x439,0x0 -0x43a,0x0 -0x43b,0x0 -0x43c,0x0 -0x43d,0x0 -0x43e,0x0 -0x43f,0x0 -0x440,0x0 -0x441,0x0 -0x442,0x0 -0x443,0x0 -0x444,0x0 -0x445,0x0 -0x446,0x0 -0x447,0x0 -0x448,0x0 -0x449,0x0 -0x44a,0x0 -0x44b,0x0 -0x44c,0x0 -0x44d,0x0 -0x44e,0x0 -0x44f,0x0 -0x450,0x0 -0x451,0x0 -0x452,0x0 -0x453,0x0 -0x454,0x0 -0x455,0x0 -0x456,0x0 -0x457,0x0 -0x458,0x0 -0x459,0x0 -0x45a,0x0 -0x45b,0x0 -0x45c,0x0 -0x45d,0x0 -0x45e,0x0 -0x45f,0x0 -0x460,0x0 -0x461,0x0 -0x462,0x0 -0x463,0x0 -0x464,0x0 -0x465,0x0 -0x466,0x0 -0x467,0x0 -0x468,0x0 -0x469,0x0 -0x46a,0x0 -0x46b,0x0 -0x46c,0x0 -0x46d,0x0 -0x46e,0x0 -0x46f,0x0 -0x470,0x0 -0x471,0x0 -0x472,0x0 -0x473,0x0 -0x474,0x0 -0x475,0x0 -0x476,0x0 -0x477,0x0 -0x478,0x0 -0x479,0x0 -0x47a,0x0 -0x47b,0x0 -0x47c,0x0 -0x47d,0x0 -0x47e,0x0 -0x47f,0x0 -0x606,0x0 -0x611,0x0 -0x619,0x0 -0x639,0x0 -0x641,0x0 -0x6e0,0x2d1e43b52 -0x800,0x0 -0x801,0x0 -0x802,0x0 -0x803,0x50014 -0x804,0x0 -0x805,0x0 -0x806,0x0 -0x807,0x0 -0x808,0x10 -0x809,0x0 -0x80a,0x10 -0x80b,0x0 -0x80c,0x0 -0x80d,0x1 -0x80e,0xffffffff -0x80f,0x1ff -0x810,0x0 -0x811,0x0 -0x812,0x0 -0x813,0x0 -0x814,0x0 -0x815,0x0 -0x816,0x0 -0x817,0x0 -0x818,0x0 -0x819,0x0 -0x81a,0x0 -0x81b,0x0 -0x81c,0x0 -0x81d,0x0 -0x81e,0x0 -0x81f,0x0 -0x820,0x0 -0x821,0x0 -0x822,0x0 -0x823,0x0 -0x824,0x0 -0x825,0x0 -0x826,0x0 -0x827,0x0 -0x828,0x0 -0x829,0x0 -0x82a,0x0 -0x82b,0x0 -0x82c,0x0 -0x82d,0x0 -0x82e,0x0 -0x82f,0x0 -0x830,0x0 -0x831,0x0 -0x832,0x400ec -0x833,0x10000 -0x834,0x10000 -0x835,0x10700 -0x836,0x400 -0x837,0xfe -0x838,0x0 -0x839,0x0 -0x83a,0x0 -0x83b,0x0 -0x83c,0x0 -0x83d,0x0 -0x83e,0x0 -0x83f,0x0 -0x840,0x0 -0x841,0x0 -0x842,0x0 -0x843,0x0 -0x844,0x0 -0x845,0x0 -0x846,0x0 -0x847,0x0 -0x848,0x0 -0x849,0x0 -0x84a,0x0 -0x84b,0x0 -0x84c,0x0 -0x84d,0x0 -0x84e,0x0 -0x84f,0x0 -0x850,0x0 -0x851,0x0 -0x852,0x0 -0x853,0x0 -0x854,0x0 -0x855,0x0 -0x856,0x0 -0x857,0x0 -0x858,0x0 -0x859,0x0 -0x85a,0x0 -0x85b,0x0 -0x85c,0x0 -0x85d,0x0 -0x85e,0x0 -0x85f,0x0 -0x860,0x0 -0x861,0x0 -0x862,0x0 -0x863,0x0 -0x864,0x0 -0x865,0x0 -0x866,0x0 -0x867,0x0 -0x868,0x0 -0x869,0x0 -0x86a,0x0 -0x86b,0x0 -0x86c,0x0 -0x86d,0x0 -0x86e,0x0 -0x86f,0x0 -0x870,0x0 -0x871,0x0 -0x872,0x0 -0x873,0x0 -0x874,0x0 -0x875,0x0 -0x876,0x0 -0x877,0x0 -0x878,0x0 -0x879,0x0 -0x87a,0x0 -0x87b,0x0 -0x87c,0x0 -0x87d,0x0 -0x87e,0x0 -0x87f,0x0 -0x880,0x0 -0x881,0x0 -0x882,0x0 -0x883,0x0 -0x884,0x0 -0x885,0x0 -0x886,0x0 -0x887,0x0 -0x888,0x0 -0x889,0x0 -0x88a,0x0 -0x88b,0x0 -0x88c,0x0 -0x88d,0x0 -0x88e,0x0 -0x88f,0x0 -0x890,0x0 -0x891,0x0 -0x892,0x0 -0x893,0x0 -0x894,0x0 -0x895,0x0 -0x896,0x0 -0x897,0x0 -0x898,0x0 -0x899,0x0 -0x89a,0x0 -0x89b,0x0 -0x89c,0x0 -0x89d,0x0 -0x89e,0x0 -0x89f,0x0 -0x8a0,0x0 -0x8a1,0x0 -0x8a2,0x0 -0x8a3,0x0 -0x8a4,0x0 -0x8a5,0x0 -0x8a6,0x0 -0x8a7,0x0 -0x8a8,0x0 -0x8a9,0x0 -0x8aa,0x0 -0x8ab,0x0 -0x8ac,0x0 -0x8ad,0x0 -0x8ae,0x0 -0x8af,0x0 -0x8b0,0x0 -0x8b1,0x0 -0x8b2,0x0 -0x8b3,0x0 -0x8b4,0x0 -0x8b5,0x0 -0x8b6,0x0 -0x8b7,0x0 -0x8b8,0x0 -0x8b9,0x0 -0x8ba,0x0 -0x8bb,0x0 -0x8bc,0x0 -0x8bd,0x0 -0x8be,0x0 -0x8bf,0x0 -0x8c0,0x0 -0x8c1,0x0 -0x8c2,0x0 -0x8c3,0x0 -0x8c4,0x0 -0x8c5,0x0 -0x8c6,0x0 -0x8c7,0x0 -0x8c8,0x0 -0x8c9,0x0 -0x8ca,0x0 -0x8cb,0x0 -0x8cc,0x0 -0x8cd,0x0 -0x8ce,0x0 -0x8cf,0x0 -0x8d0,0x0 -0x8d1,0x0 -0x8d2,0x0 -0x8d3,0x0 -0x8d4,0x0 -0x8d5,0x0 -0x8d6,0x0 -0x8d7,0x0 -0x8d8,0x0 -0x8d9,0x0 -0x8da,0x0 -0x8db,0x0 -0x8dc,0x0 -0x8dd,0x0 -0x8de,0x0 -0x8df,0x0 -0x8e0,0x0 -0x8e1,0x0 -0x8e2,0x0 -0x8e3,0x0 -0x8e4,0x0 -0x8e5,0x0 -0x8e6,0x0 -0x8e7,0x0 -0x8e8,0x0 -0x8e9,0x0 -0x8ea,0x0 -0x8eb,0x0 -0x8ec,0x0 -0x8ed,0x0 -0x8ee,0x0 -0x8ef,0x0 -0x8f0,0x0 -0x8f1,0x0 -0x8f2,0x0 -0x8f3,0x0 -0x8f4,0x0 -0x8f5,0x0 -0x8f6,0x0 -0x8f7,0x0 -0x8f8,0x0 -0x8f9,0x0 -0x8fa,0x0 -0x8fb,0x0 -0x8fc,0x0 -0x8fd,0x0 -0x8fe,0x0 -0x8ff,0x0 -0xc0000080,0xd01 -0xc0000081,0x23001000000000 -0xc0000082,0xffffffff81800040 -0xc0000083,0xffffffff81801500 -0xc0000084,0x257fd5 -0xc0000100,0x7ff086f4a740 -0xc0000101,0xffff88803ec00000 -0xc0000102,0x0 -0xc0000103,0x0 -0xc0010000,0x0 -0xc0010001,0x0 -0xc0010002,0x0 -0xc0010003,0x0 -0xc0010004,0x0 -0xc0010005,0x0 -0xc0010006,0x0 -0xc0010007,0x0 -0xc0010010,0x0 -0xc0010015,0x0 -0xc001001b,0x20000000 -0xc001001f,0x0 -0xc0010055,0x0 -0xc0010058,0x0 -0xc0010112,0x0 -0xc0010113,0x0 -0xc0010117,0x0 -0xc0010200,0x0 -0xc0010201,0x0 -0xc0010202,0x0 -0xc0010203,0x0 -0xc0010204,0x0 -0xc0010205,0x0 -0xc0010206,0x0 -0xc0010207,0x0 -0xc0010208,0x0 -0xc0010209,0x0 -0xc001020a,0x0 -0xc001020b,0x0 -0xc0011022,0x0 -0xc0011023,0x0 -0xc001102a,0x0 -0xc001102c,0x0 -0x400000000,0x0 -0x2000000000,0x0 -0x4000000000,0x0 -0x8000000000,0x0 -0x1000000000000,0x0 -0x3c000000000000,0x0 -0x80000000000000,0x0 -0x40000000000000,0x0 diff --git a/tests/data/msr/msr_list_T2S_INTEL_SKYLAKE_6.1host_5.10guest.csv b/tests/data/msr/msr_list_T2S_INTEL_SKYLAKE_6.1host_5.10guest.csv deleted file mode 100644 index 8cb7d9379a8..00000000000 --- a/tests/data/msr/msr_list_T2S_INTEL_SKYLAKE_6.1host_5.10guest.csv +++ /dev/null @@ -1,496 +0,0 @@ -MSR_ADDR,VALUE -0x0,0x0 -0x1,0x0 -0x10,0x1000556b4 -0x11,0x2748008 -0x12,0x2749001 -0x17,0x0 -0x1b,0xfee00d00 -0x2a,0x0 -0x2c,0x1000000 -0x34,0x0 -0x3a,0x1 -0x3b,0x0 -0x48,0x1 -0x8b,0x100000000 -0xc1,0x0 -0xc2,0x0 -0xcd,0x3 -0xce,0x80000000 -0xfe,0x508 -0x10a,0xc080c4c -0x11e,0xbe702111 -0x140,0x0 -0x174,0x10 -0x175,0xfffffe0000003000 -0x176,0xffffffff81801450 -0x179,0x20 -0x17a,0x0 -0x186,0x0 -0x187,0x0 -0x198,0x400000003e8 -0x199,0x0 -0x1a0,0x1 -0x1d9,0x0 -0x1db,0x0 -0x1dc,0x0 -0x1dd,0x0 -0x1de,0x0 -0x1fc,0x0 -0x200,0x0 -0x201,0x0 -0x202,0x0 -0x203,0x0 -0x204,0x0 -0x205,0x0 -0x206,0x0 -0x207,0x0 -0x208,0x0 -0x209,0x0 -0x20a,0x0 -0x20b,0x0 -0x20c,0x0 -0x20d,0x0 -0x20e,0x0 -0x20f,0x0 -0x250,0x0 -0x258,0x0 -0x259,0x0 -0x268,0x0 -0x269,0x0 -0x26a,0x0 -0x26b,0x0 -0x26c,0x0 -0x26d,0x0 -0x26e,0x0 -0x26f,0x0 -0x277,0x7040600070406 -0x2ff,0x0 -0x400,0x0 -0x401,0x0 -0x402,0x0 -0x403,0x0 -0x404,0x0 -0x405,0x0 -0x406,0x0 -0x407,0x0 -0x408,0x0 -0x409,0x0 -0x40a,0x0 -0x40b,0x0 -0x40c,0x0 -0x40d,0x0 -0x40e,0x0 -0x40f,0x0 -0x410,0x0 -0x411,0x0 -0x412,0x0 -0x413,0x0 -0x414,0x0 -0x415,0x0 -0x416,0x0 -0x417,0x0 -0x418,0x0 -0x419,0x0 -0x41a,0x0 -0x41b,0x0 -0x41c,0x0 -0x41d,0x0 -0x41e,0x0 -0x41f,0x0 -0x420,0x0 -0x421,0x0 -0x422,0x0 -0x423,0x0 -0x424,0x0 -0x425,0x0 -0x426,0x0 -0x427,0x0 -0x428,0x0 -0x429,0x0 -0x42a,0x0 -0x42b,0x0 -0x42c,0x0 -0x42d,0x0 -0x42e,0x0 -0x42f,0x0 -0x430,0x0 -0x431,0x0 -0x432,0x0 -0x433,0x0 -0x434,0x0 -0x435,0x0 -0x436,0x0 -0x437,0x0 -0x438,0x0 -0x439,0x0 -0x43a,0x0 -0x43b,0x0 -0x43c,0x0 -0x43d,0x0 -0x43e,0x0 -0x43f,0x0 -0x440,0x0 -0x441,0x0 -0x442,0x0 -0x443,0x0 -0x444,0x0 -0x445,0x0 -0x446,0x0 -0x447,0x0 -0x448,0x0 -0x449,0x0 -0x44a,0x0 -0x44b,0x0 -0x44c,0x0 -0x44d,0x0 -0x44e,0x0 -0x44f,0x0 -0x450,0x0 -0x451,0x0 -0x452,0x0 -0x453,0x0 -0x454,0x0 -0x455,0x0 -0x456,0x0 -0x457,0x0 -0x458,0x0 -0x459,0x0 -0x45a,0x0 -0x45b,0x0 -0x45c,0x0 -0x45d,0x0 -0x45e,0x0 -0x45f,0x0 -0x460,0x0 -0x461,0x0 -0x462,0x0 -0x463,0x0 -0x464,0x0 -0x465,0x0 -0x466,0x0 -0x467,0x0 -0x468,0x0 -0x469,0x0 -0x46a,0x0 -0x46b,0x0 -0x46c,0x0 -0x46d,0x0 -0x46e,0x0 -0x46f,0x0 -0x470,0x0 -0x471,0x0 -0x472,0x0 -0x473,0x0 -0x474,0x0 -0x475,0x0 -0x476,0x0 -0x477,0x0 -0x478,0x0 -0x479,0x0 -0x47a,0x0 -0x47b,0x0 -0x47c,0x0 -0x47d,0x0 -0x47e,0x0 -0x47f,0x0 -0x606,0x0 -0x611,0x0 -0x619,0x0 -0x639,0x0 -0x641,0x0 -0x6e0,0x2d4880d12 -0x800,0x0 -0x801,0x0 -0x802,0x0 -0x803,0x50014 -0x804,0x0 -0x805,0x0 -0x806,0x0 -0x807,0x0 -0x808,0x10 -0x809,0x0 -0x80a,0x10 -0x80b,0x0 -0x80c,0x0 -0x80d,0x1 -0x80e,0xffffffff -0x80f,0x1ff -0x810,0x0 -0x811,0x0 -0x812,0x0 -0x813,0x0 -0x814,0x0 -0x815,0x0 -0x816,0x0 -0x817,0x0 -0x818,0x0 -0x819,0x0 -0x81a,0x0 -0x81b,0x0 -0x81c,0x0 -0x81d,0x0 -0x81e,0x0 -0x81f,0x0 -0x820,0x0 -0x821,0x0 -0x822,0x0 -0x823,0x0 -0x824,0x0 -0x825,0x0 -0x826,0x0 -0x827,0x0 -0x828,0x0 -0x829,0x0 -0x82a,0x0 -0x82b,0x0 -0x82c,0x0 -0x82d,0x0 -0x82e,0x0 -0x82f,0x0 -0x830,0x0 -0x831,0x0 -0x832,0x400ec -0x833,0x10000 -0x834,0x10000 -0x835,0x10700 -0x836,0x400 -0x837,0xfe -0x838,0x0 -0x839,0x0 -0x83a,0x0 -0x83b,0x0 -0x83c,0x0 -0x83d,0x0 -0x83e,0x0 -0x83f,0x0 -0x840,0x0 -0x841,0x0 -0x842,0x0 -0x843,0x0 -0x844,0x0 -0x845,0x0 -0x846,0x0 -0x847,0x0 -0x848,0x0 -0x849,0x0 -0x84a,0x0 -0x84b,0x0 -0x84c,0x0 -0x84d,0x0 -0x84e,0x0 -0x84f,0x0 -0x850,0x0 -0x851,0x0 -0x852,0x0 -0x853,0x0 -0x854,0x0 -0x855,0x0 -0x856,0x0 -0x857,0x0 -0x858,0x0 -0x859,0x0 -0x85a,0x0 -0x85b,0x0 -0x85c,0x0 -0x85d,0x0 -0x85e,0x0 -0x85f,0x0 -0x860,0x0 -0x861,0x0 -0x862,0x0 -0x863,0x0 -0x864,0x0 -0x865,0x0 -0x866,0x0 -0x867,0x0 -0x868,0x0 -0x869,0x0 -0x86a,0x0 -0x86b,0x0 -0x86c,0x0 -0x86d,0x0 -0x86e,0x0 -0x86f,0x0 -0x870,0x0 -0x871,0x0 -0x872,0x0 -0x873,0x0 -0x874,0x0 -0x875,0x0 -0x876,0x0 -0x877,0x0 -0x878,0x0 -0x879,0x0 -0x87a,0x0 -0x87b,0x0 -0x87c,0x0 -0x87d,0x0 -0x87e,0x0 -0x87f,0x0 -0x880,0x0 -0x881,0x0 -0x882,0x0 -0x883,0x0 -0x884,0x0 -0x885,0x0 -0x886,0x0 -0x887,0x0 -0x888,0x0 -0x889,0x0 -0x88a,0x0 -0x88b,0x0 -0x88c,0x0 -0x88d,0x0 -0x88e,0x0 -0x88f,0x0 -0x890,0x0 -0x891,0x0 -0x892,0x0 -0x893,0x0 -0x894,0x0 -0x895,0x0 -0x896,0x0 -0x897,0x0 -0x898,0x0 -0x899,0x0 -0x89a,0x0 -0x89b,0x0 -0x89c,0x0 -0x89d,0x0 -0x89e,0x0 -0x89f,0x0 -0x8a0,0x0 -0x8a1,0x0 -0x8a2,0x0 -0x8a3,0x0 -0x8a4,0x0 -0x8a5,0x0 -0x8a6,0x0 -0x8a7,0x0 -0x8a8,0x0 -0x8a9,0x0 -0x8aa,0x0 -0x8ab,0x0 -0x8ac,0x0 -0x8ad,0x0 -0x8ae,0x0 -0x8af,0x0 -0x8b0,0x0 -0x8b1,0x0 -0x8b2,0x0 -0x8b3,0x0 -0x8b4,0x0 -0x8b5,0x0 -0x8b6,0x0 -0x8b7,0x0 -0x8b8,0x0 -0x8b9,0x0 -0x8ba,0x0 -0x8bb,0x0 -0x8bc,0x0 -0x8bd,0x0 -0x8be,0x0 -0x8bf,0x0 -0x8c0,0x0 -0x8c1,0x0 -0x8c2,0x0 -0x8c3,0x0 -0x8c4,0x0 -0x8c5,0x0 -0x8c6,0x0 -0x8c7,0x0 -0x8c8,0x0 -0x8c9,0x0 -0x8ca,0x0 -0x8cb,0x0 -0x8cc,0x0 -0x8cd,0x0 -0x8ce,0x0 -0x8cf,0x0 -0x8d0,0x0 -0x8d1,0x0 -0x8d2,0x0 -0x8d3,0x0 -0x8d4,0x0 -0x8d5,0x0 -0x8d6,0x0 -0x8d7,0x0 -0x8d8,0x0 -0x8d9,0x0 -0x8da,0x0 -0x8db,0x0 -0x8dc,0x0 -0x8dd,0x0 -0x8de,0x0 -0x8df,0x0 -0x8e0,0x0 -0x8e1,0x0 -0x8e2,0x0 -0x8e3,0x0 -0x8e4,0x0 -0x8e5,0x0 -0x8e6,0x0 -0x8e7,0x0 -0x8e8,0x0 -0x8e9,0x0 -0x8ea,0x0 -0x8eb,0x0 -0x8ec,0x0 -0x8ed,0x0 -0x8ee,0x0 -0x8ef,0x0 -0x8f0,0x0 -0x8f1,0x0 -0x8f2,0x0 -0x8f3,0x0 -0x8f4,0x0 -0x8f5,0x0 -0x8f6,0x0 -0x8f7,0x0 -0x8f8,0x0 -0x8f9,0x0 -0x8fa,0x0 -0x8fb,0x0 -0x8fc,0x0 -0x8fd,0x0 -0x8fe,0x0 -0x8ff,0x0 -0xc0000080,0xd01 -0xc0000081,0x23001000000000 -0xc0000082,0xffffffff81800040 -0xc0000083,0xffffffff81801500 -0xc0000084,0x47700 -0xc0000100,0x7f4e02611740 -0xc0000101,0xffff88803ec00000 -0xc0000102,0x0 -0xc0000103,0x0 -0xc0010000,0x0 -0xc0010001,0x0 -0xc0010002,0x0 -0xc0010003,0x0 -0xc0010004,0x0 -0xc0010005,0x0 -0xc0010006,0x0 -0xc0010007,0x0 -0xc0010010,0x0 -0xc0010015,0x0 -0xc001001b,0x20000000 -0xc001001f,0x0 -0xc0010055,0x0 -0xc0010058,0x0 -0xc0010112,0x0 -0xc0010113,0x0 -0xc0010117,0x0 -0xc0011022,0x0 -0xc0011023,0x0 -0xc001102a,0x0 -0xc001102c,0x0 -0x400000000,0x0 -0x2000000000,0x0 -0x4000000000,0x0 -0x8000000000,0x0 -0x1000000000000,0x0 -0x3c000000000000,0x0 -0x80000000000000,0x0 -0x40000000000000,0x0 diff --git a/tests/data/msr/msr_list_T2S_INTEL_SKYLAKE_6.1host_6.1guest.csv b/tests/data/msr/msr_list_T2S_INTEL_SKYLAKE_6.1host_6.1guest.csv deleted file mode 100644 index 2952a73b658..00000000000 --- a/tests/data/msr/msr_list_T2S_INTEL_SKYLAKE_6.1host_6.1guest.csv +++ /dev/null @@ -1,496 +0,0 @@ -MSR_ADDR,VALUE -0x0,0x0 -0x1,0x0 -0x10,0x1000556b4 -0x11,0x2748008 -0x12,0x2749001 -0x17,0x0 -0x1b,0xfee00d00 -0x2a,0x0 -0x2c,0x1000000 -0x34,0x0 -0x3a,0x1 -0x3b,0x0 -0x48,0x1 -0x8b,0x100000000 -0xc1,0x0 -0xc2,0x0 -0xcd,0x3 -0xce,0x80000000 -0xfe,0x508 -0x10a,0xc080c4c -0x11e,0xbe702111 -0x140,0x0 -0x174,0x10 -0x175,0xfffffe0000003000 -0x176,0xffffffff81801450 -0x179,0x20 -0x17a,0x0 -0x186,0x0 -0x187,0x0 -0x198,0x400000003e8 -0x199,0x0 -0x1a0,0x1 -0x1d9,0x0 -0x1db,0x0 -0x1dc,0x0 -0x1dd,0x0 -0x1de,0x0 -0x1fc,0x0 -0x200,0x0 -0x201,0x0 -0x202,0x0 -0x203,0x0 -0x204,0x0 -0x205,0x0 -0x206,0x0 -0x207,0x0 -0x208,0x0 -0x209,0x0 -0x20a,0x0 -0x20b,0x0 -0x20c,0x0 -0x20d,0x0 -0x20e,0x0 -0x20f,0x0 -0x250,0x0 -0x258,0x0 -0x259,0x0 -0x268,0x0 -0x269,0x0 -0x26a,0x0 -0x26b,0x0 -0x26c,0x0 -0x26d,0x0 -0x26e,0x0 -0x26f,0x0 -0x277,0x7040600070406 -0x2ff,0x0 -0x400,0x0 -0x401,0x0 -0x402,0x0 -0x403,0x0 -0x404,0x0 -0x405,0x0 -0x406,0x0 -0x407,0x0 -0x408,0x0 -0x409,0x0 -0x40a,0x0 -0x40b,0x0 -0x40c,0x0 -0x40d,0x0 -0x40e,0x0 -0x40f,0x0 -0x410,0x0 -0x411,0x0 -0x412,0x0 -0x413,0x0 -0x414,0x0 -0x415,0x0 -0x416,0x0 -0x417,0x0 -0x418,0x0 -0x419,0x0 -0x41a,0x0 -0x41b,0x0 -0x41c,0x0 -0x41d,0x0 -0x41e,0x0 -0x41f,0x0 -0x420,0x0 -0x421,0x0 -0x422,0x0 -0x423,0x0 -0x424,0x0 -0x425,0x0 -0x426,0x0 -0x427,0x0 -0x428,0x0 -0x429,0x0 -0x42a,0x0 -0x42b,0x0 -0x42c,0x0 -0x42d,0x0 -0x42e,0x0 -0x42f,0x0 -0x430,0x0 -0x431,0x0 -0x432,0x0 -0x433,0x0 -0x434,0x0 -0x435,0x0 -0x436,0x0 -0x437,0x0 -0x438,0x0 -0x439,0x0 -0x43a,0x0 -0x43b,0x0 -0x43c,0x0 -0x43d,0x0 -0x43e,0x0 -0x43f,0x0 -0x440,0x0 -0x441,0x0 -0x442,0x0 -0x443,0x0 -0x444,0x0 -0x445,0x0 -0x446,0x0 -0x447,0x0 -0x448,0x0 -0x449,0x0 -0x44a,0x0 -0x44b,0x0 -0x44c,0x0 -0x44d,0x0 -0x44e,0x0 -0x44f,0x0 -0x450,0x0 -0x451,0x0 -0x452,0x0 -0x453,0x0 -0x454,0x0 -0x455,0x0 -0x456,0x0 -0x457,0x0 -0x458,0x0 -0x459,0x0 -0x45a,0x0 -0x45b,0x0 -0x45c,0x0 -0x45d,0x0 -0x45e,0x0 -0x45f,0x0 -0x460,0x0 -0x461,0x0 -0x462,0x0 -0x463,0x0 -0x464,0x0 -0x465,0x0 -0x466,0x0 -0x467,0x0 -0x468,0x0 -0x469,0x0 -0x46a,0x0 -0x46b,0x0 -0x46c,0x0 -0x46d,0x0 -0x46e,0x0 -0x46f,0x0 -0x470,0x0 -0x471,0x0 -0x472,0x0 -0x473,0x0 -0x474,0x0 -0x475,0x0 -0x476,0x0 -0x477,0x0 -0x478,0x0 -0x479,0x0 -0x47a,0x0 -0x47b,0x0 -0x47c,0x0 -0x47d,0x0 -0x47e,0x0 -0x47f,0x0 -0x606,0x0 -0x611,0x0 -0x619,0x0 -0x639,0x0 -0x641,0x0 -0x6e0,0x2d4880d12 -0x800,0x0 -0x801,0x0 -0x802,0x0 -0x803,0x50014 -0x804,0x0 -0x805,0x0 -0x806,0x0 -0x807,0x0 -0x808,0x10 -0x809,0x0 -0x80a,0x10 -0x80b,0x0 -0x80c,0x0 -0x80d,0x1 -0x80e,0xffffffff -0x80f,0x1ff -0x810,0x0 -0x811,0x0 -0x812,0x0 -0x813,0x0 -0x814,0x0 -0x815,0x0 -0x816,0x0 -0x817,0x0 -0x818,0x0 -0x819,0x0 -0x81a,0x0 -0x81b,0x0 -0x81c,0x0 -0x81d,0x0 -0x81e,0x0 -0x81f,0x0 -0x820,0x0 -0x821,0x0 -0x822,0x0 -0x823,0x0 -0x824,0x0 -0x825,0x0 -0x826,0x0 -0x827,0x0 -0x828,0x0 -0x829,0x0 -0x82a,0x0 -0x82b,0x0 -0x82c,0x0 -0x82d,0x0 -0x82e,0x0 -0x82f,0x0 -0x830,0x0 -0x831,0x0 -0x832,0x400ec -0x833,0x10000 -0x834,0x10000 -0x835,0x10700 -0x836,0x400 -0x837,0xfe -0x838,0x0 -0x839,0x0 -0x83a,0x0 -0x83b,0x0 -0x83c,0x0 -0x83d,0x0 -0x83e,0x0 -0x83f,0x0 -0x840,0x0 -0x841,0x0 -0x842,0x0 -0x843,0x0 -0x844,0x0 -0x845,0x0 -0x846,0x0 -0x847,0x0 -0x848,0x0 -0x849,0x0 -0x84a,0x0 -0x84b,0x0 -0x84c,0x0 -0x84d,0x0 -0x84e,0x0 -0x84f,0x0 -0x850,0x0 -0x851,0x0 -0x852,0x0 -0x853,0x0 -0x854,0x0 -0x855,0x0 -0x856,0x0 -0x857,0x0 -0x858,0x0 -0x859,0x0 -0x85a,0x0 -0x85b,0x0 -0x85c,0x0 -0x85d,0x0 -0x85e,0x0 -0x85f,0x0 -0x860,0x0 -0x861,0x0 -0x862,0x0 -0x863,0x0 -0x864,0x0 -0x865,0x0 -0x866,0x0 -0x867,0x0 -0x868,0x0 -0x869,0x0 -0x86a,0x0 -0x86b,0x0 -0x86c,0x0 -0x86d,0x0 -0x86e,0x0 -0x86f,0x0 -0x870,0x0 -0x871,0x0 -0x872,0x0 -0x873,0x0 -0x874,0x0 -0x875,0x0 -0x876,0x0 -0x877,0x0 -0x878,0x0 -0x879,0x0 -0x87a,0x0 -0x87b,0x0 -0x87c,0x0 -0x87d,0x0 -0x87e,0x0 -0x87f,0x0 -0x880,0x0 -0x881,0x0 -0x882,0x0 -0x883,0x0 -0x884,0x0 -0x885,0x0 -0x886,0x0 -0x887,0x0 -0x888,0x0 -0x889,0x0 -0x88a,0x0 -0x88b,0x0 -0x88c,0x0 -0x88d,0x0 -0x88e,0x0 -0x88f,0x0 -0x890,0x0 -0x891,0x0 -0x892,0x0 -0x893,0x0 -0x894,0x0 -0x895,0x0 -0x896,0x0 -0x897,0x0 -0x898,0x0 -0x899,0x0 -0x89a,0x0 -0x89b,0x0 -0x89c,0x0 -0x89d,0x0 -0x89e,0x0 -0x89f,0x0 -0x8a0,0x0 -0x8a1,0x0 -0x8a2,0x0 -0x8a3,0x0 -0x8a4,0x0 -0x8a5,0x0 -0x8a6,0x0 -0x8a7,0x0 -0x8a8,0x0 -0x8a9,0x0 -0x8aa,0x0 -0x8ab,0x0 -0x8ac,0x0 -0x8ad,0x0 -0x8ae,0x0 -0x8af,0x0 -0x8b0,0x0 -0x8b1,0x0 -0x8b2,0x0 -0x8b3,0x0 -0x8b4,0x0 -0x8b5,0x0 -0x8b6,0x0 -0x8b7,0x0 -0x8b8,0x0 -0x8b9,0x0 -0x8ba,0x0 -0x8bb,0x0 -0x8bc,0x0 -0x8bd,0x0 -0x8be,0x0 -0x8bf,0x0 -0x8c0,0x0 -0x8c1,0x0 -0x8c2,0x0 -0x8c3,0x0 -0x8c4,0x0 -0x8c5,0x0 -0x8c6,0x0 -0x8c7,0x0 -0x8c8,0x0 -0x8c9,0x0 -0x8ca,0x0 -0x8cb,0x0 -0x8cc,0x0 -0x8cd,0x0 -0x8ce,0x0 -0x8cf,0x0 -0x8d0,0x0 -0x8d1,0x0 -0x8d2,0x0 -0x8d3,0x0 -0x8d4,0x0 -0x8d5,0x0 -0x8d6,0x0 -0x8d7,0x0 -0x8d8,0x0 -0x8d9,0x0 -0x8da,0x0 -0x8db,0x0 -0x8dc,0x0 -0x8dd,0x0 -0x8de,0x0 -0x8df,0x0 -0x8e0,0x0 -0x8e1,0x0 -0x8e2,0x0 -0x8e3,0x0 -0x8e4,0x0 -0x8e5,0x0 -0x8e6,0x0 -0x8e7,0x0 -0x8e8,0x0 -0x8e9,0x0 -0x8ea,0x0 -0x8eb,0x0 -0x8ec,0x0 -0x8ed,0x0 -0x8ee,0x0 -0x8ef,0x0 -0x8f0,0x0 -0x8f1,0x0 -0x8f2,0x0 -0x8f3,0x0 -0x8f4,0x0 -0x8f5,0x0 -0x8f6,0x0 -0x8f7,0x0 -0x8f8,0x0 -0x8f9,0x0 -0x8fa,0x0 -0x8fb,0x0 -0x8fc,0x0 -0x8fd,0x0 -0x8fe,0x0 -0x8ff,0x0 -0xc0000080,0xd01 -0xc0000081,0x23001000000000 -0xc0000082,0xffffffff81800040 -0xc0000083,0xffffffff81801500 -0xc0000084,0x257fd5 -0xc0000100,0x7f4e02611740 -0xc0000101,0xffff88803ec00000 -0xc0000102,0x0 -0xc0000103,0x0 -0xc0010000,0x0 -0xc0010001,0x0 -0xc0010002,0x0 -0xc0010003,0x0 -0xc0010004,0x0 -0xc0010005,0x0 -0xc0010006,0x0 -0xc0010007,0x0 -0xc0010010,0x0 -0xc0010015,0x0 -0xc001001b,0x20000000 -0xc001001f,0x0 -0xc0010055,0x0 -0xc0010058,0x0 -0xc0010112,0x0 -0xc0010113,0x0 -0xc0010117,0x0 -0xc0011022,0x0 -0xc0011023,0x0 -0xc001102a,0x0 -0xc001102c,0x0 -0x400000000,0x0 -0x2000000000,0x0 -0x4000000000,0x0 -0x8000000000,0x0 -0x1000000000000,0x0 -0x3c000000000000,0x0 -0x80000000000000,0x0 -0x40000000000000,0x0 diff --git a/tests/framework/utils_cpu_templates.py b/tests/framework/utils_cpu_templates.py index 372d9a11bad..dcfc98b6d3d 100644 --- a/tests/framework/utils_cpu_templates.py +++ b/tests/framework/utils_cpu_templates.py @@ -25,8 +25,6 @@ def get_supported_cpu_templates(): """Return the list of static CPU templates supported by the platform.""" host_linux = global_props.host_linux_version_tpl match get_cpu_vendor(), global_props.cpu_codename: - case CpuVendor.INTEL, CpuModel.INTEL_SKYLAKE: - return sorted(set(INTEL_TEMPLATES) - {"T2CL"}) case CpuVendor.INTEL, CpuModel.INTEL_CASCADELAKE: return INTEL_TEMPLATES case CpuVendor.INTEL, CpuModel.INTEL_ICELAKE: @@ -46,8 +44,6 @@ def get_supported_custom_cpu_templates(): """Return the list of custom CPU templates supported by the platform.""" host_linux = global_props.host_linux_version_tpl match get_cpu_vendor(), global_props.cpu_codename: - case CpuVendor.INTEL, CpuModel.INTEL_SKYLAKE: - return set(INTEL_TEMPLATES) - {"T2CL"} case CpuVendor.INTEL, CpuModel.INTEL_CASCADELAKE: return INTEL_TEMPLATES case CpuVendor.INTEL, CpuModel.INTEL_ICELAKE: diff --git a/tests/framework/utils_cpuid.py b/tests/framework/utils_cpuid.py index 8e93f60a9a8..73a0e6b5373 100644 --- a/tests/framework/utils_cpuid.py +++ b/tests/framework/utils_cpuid.py @@ -29,7 +29,6 @@ class CpuModel(str, Enum): ARM_NEOVERSE_N1 = "ARM_NEOVERSE_N1" ARM_NEOVERSE_V1 = "ARM_NEOVERSE_V1" ARM_NEOVERSE_V2 = "ARM_NEOVERSE_V2" - INTEL_SKYLAKE = "INTEL_SKYLAKE" INTEL_CASCADELAKE = "INTEL_CASCADELAKE" INTEL_ICELAKE = "INTEL_ICELAKE" INTEL_SAPPHIRE_RAPIDS = "INTEL_SAPPHIRE_RAPIDS" @@ -37,8 +36,6 @@ class CpuModel(str, Enum): CPU_DICT = { CpuVendor.INTEL: { - "Intel(R) Xeon(R) Platinum 8175M CPU": "INTEL_SKYLAKE", - "Intel(R) Xeon(R) Platinum 8124M CPU": "INTEL_SKYLAKE", "Intel(R) Xeon(R) Platinum 8259CL CPU": "INTEL_CASCADELAKE", "Intel(R) Xeon(R) Platinum 8375C CPU": "INTEL_ICELAKE", "Intel(R) Xeon(R) Platinum 8488C": "INTEL_SAPPHIRE_RAPIDS", diff --git a/tests/integration_tests/functional/test_cpu_features_host_vs_guest.py b/tests/integration_tests/functional/test_cpu_features_host_vs_guest.py index 78ea0380f1b..012e1c7d3e7 100644 --- a/tests/integration_tests/functional/test_cpu_features_host_vs_guest.py +++ b/tests/integration_tests/functional/test_cpu_features_host_vs_guest.py @@ -180,10 +180,6 @@ def test_host_vs_guest_cpu_features(uvm_plain_any): assert guest_feats - host_feats == AMD_GUEST_ONLY_FEATS - case CpuModel.INTEL_SKYLAKE: - assert host_feats - guest_feats == INTEL_HOST_ONLY_FEATS - assert guest_feats - host_feats == INTEL_GUEST_ONLY_FEATS - case CpuModel.INTEL_CASCADELAKE: expected_host_minus_guest = INTEL_HOST_ONLY_FEATS expected_guest_minus_host = INTEL_GUEST_ONLY_FEATS diff --git a/tests/integration_tests/functional/test_cpu_features_x86_64.py b/tests/integration_tests/functional/test_cpu_features_x86_64.py index 8e25d92b7d0..bf37139a685 100644 --- a/tests/integration_tests/functional/test_cpu_features_x86_64.py +++ b/tests/integration_tests/functional/test_cpu_features_x86_64.py @@ -1084,31 +1084,6 @@ def check_enabled_features(test_microvm, cpu_template): ) -def test_c3_on_skylake_show_warning(uvm_plain, cpu_template_any): - """ - This test verifies that the warning message about MMIO stale data mitigation - is displayed only on Intel Skylake with static C3 template. - """ - uvm = uvm_plain - uvm.spawn() - uvm.basic_config(vcpu_count=2, mem_size_mib=256) - uvm.add_net_iface() - uvm.set_cpu_template(cpu_template_any) - uvm.start() - - message = ( - "On processors that do not enumerate FBSDP_NO, PSDP_NO and " - "SBDR_SSDP_NO on IA32_ARCH_CAPABILITIES MSR, the guest kernel " - "does not apply the mitigation against MMIO stale data " - "vulnerability." - ) - - if cpu_template_any == "C3" and global_props.cpu_codename == "INTEL_SKYLAKE": - assert message in uvm.log_data - else: - assert message not in uvm.log_data - - @pytest.mark.skipif( global_props.cpu_codename != "INTEL_SAPPHIRE_RAPIDS" or global_props.host_linux_version_tpl < (5, 17), diff --git a/tests/integration_tests/security/test_vulnerabilities.py b/tests/integration_tests/security/test_vulnerabilities.py index a8835f97c87..d71d4cad832 100644 --- a/tests/integration_tests/security/test_vulnerabilities.py +++ b/tests/integration_tests/security/test_vulnerabilities.py @@ -147,7 +147,7 @@ def get_vuln_files_exception_dict(template): # Exception for mmio_stale_data # ============================= # - # Guests on Intel Skylake or with T2S template + # Guests with T2S template # -------------------------------------------- # Whether mmio_stale_data is marked as "Vulnerable" or not is determined by the code here. # https://elixir.bootlin.com/linux/v6.1.46/source/arch/x86/kernel/cpu/bugs.c#L431 @@ -155,30 +155,17 @@ def get_vuln_files_exception_dict(template): # has been passed through to guests only since kernel v6.4. # https://github.com/torvalds/linux/commit/da3db168fb671f15e393b227f5c312c698ecb6ea # Thus, since the FLUSH_L1D bit is masked off prior to kernel v6.4, guests with - # IA32_ARCH_CAPABILITIES.FB_CLEAR (bit 17) = 0 (like guests on Intel Skylake and guests with - # T2S template) fall onto the second hand of the condition and fail the test. The value is - # "Vulnerable: Clear CPU buffers attempted, no microcode" on guests on Intel Skylake and guests - # with T2S template but "Mitigation: Clear CPU buffers; SMT Host state unknown" on kernel v6.4 - # or later. In any case, the kernel attempts to clear CPU buffers using VERW instruction and it + # IA32_ARCH_CAPABILITIES.FB_CLEAR (bit 17) = 0 (like guests with T2S template which presents + # an Intel Skylake CPU) fall into the MMIO_MITIGATION_UCODE_NEEDED branch, marking the + # system as vulnerable to MMIO Stale Data. + # The value is "Vulnerable: Clear CPU buffers attempted, no microcode" on guests on Intel + # Skylake and guests with T2S template but "Mitigation: Clear CPU buffers; SMT Host state + # unknown" on kernel v6.4 or later. + # In any case, the kernel attempts to clear CPU buffers using VERW instruction and it # is safe to ingore the "Vulnerable" message if the host has the microcode update applied # correctly. Here we expect the common string "Clear CPU buffers" to cover both cases. - # - # Guest on Intel Skylake with C3 template - # --------------------------------------- - # If the processor does not enumerate IA32_ARCH_CAPABILITIES.{FBSDP_NO,PSDP_NO,SBDR_SSDP_NO}, - # the kernel checks its lists of affected/unaffected processors and determines whether the - # mitigation is required, and if the processor is not included in the lists, the sysfs is marked - # as "Unknown". - # https://elixir.bootlin.com/linux/v6.1.50/source/arch/x86/kernel/cpu/common.c#L1387 - # The behavior for "Unknown" state was added in the following commit and older processors that - # are no longer serviced are not listed up. - # https://github.com/torvalds/linux/commit/7df548840c496b0141fb2404b889c346380c2b22 - # Since those bits are not set on Intel Skylake and C3 template makes guests pretend to be AWS - # C3 instance (quite old processor now) by overwriting CPUID.1H:EAX, it is impossible to avoid - # this "Unknown" state. - if global_props.cpu_codename == "INTEL_SKYLAKE" and template == "C3": - exception_dict["mmio_stale_data"] = "Unknown: No mitigations" - elif global_props.cpu_codename == "INTEL_SKYLAKE" or template == "T2S": + + if template == "T2S": exception_dict["mmio_stale_data"] = "Clear CPU buffers" return exception_dict

AltStyle γ«γ‚ˆγ£γ¦ε€‰ζ›γ•γ‚ŒγŸγƒšγƒΌγ‚Έ (->γ‚ͺγƒͺγ‚ΈγƒŠγƒ«) /