Skip to content

Commit 615948b

Browse files
zulinx86zulinx86
authored
Merge branch 'main' into ibpb_exit_to_user_on_ubuntu
2 parents 837abb2 + eb05db9 commit 615948b

File tree

5 files changed

+22
-49
lines changed

5 files changed

+22
-49
lines changed

‎tests/data/cpu_template_helper/fingerprint_AMD_GENOA_5.10host.json‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"firecracker_version": "1.13.0-dev",
3-
"kernel_version": "5.10.238-234.956.amzn2.x86_64",
4-
"microcode_version": "0xa101154",
2+
"firecracker_version": "1.14.0-dev",
3+
"kernel_version": "5.10.244-240.965.amzn2.x86_64",
4+
"microcode_version": "0xa101156",
55
"bios_version": "1.0",
6-
"bios_revision": "2.21",
6+
"bios_revision": "2.23",
77
"guest_cpu_config": {
88
"kvm_capabilities": [],
99
"cpuid_modifiers": [
@@ -1494,15 +1494,14 @@
14941494
},
14951495
{
14961496
"register": "ecx",
1497-
"bitmap": "0b00000000000000000010000000000000"
1497+
"bitmap": "0b00000000000000000110000000000000"
14981498
},
14991499
{
15001500
"register": "edx",
15011501
"bitmap": "0b00000000000000000000000000000000"
15021502
}
15031503
]
15041504
}
1505-
15061505
],
15071506
"msr_modifiers": [
15081507
{
@@ -1635,4 +1634,4 @@
16351634
}
16361635
]
16371636
}
1638-
}
1637+
}

‎tests/data/cpu_template_helper/fingerprint_AMD_GENOA_6.1host.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"firecracker_version": "1.13.0-dev",
3-
"kernel_version": "6.1.141-165.249.amzn2023.x86_64",
4-
"microcode_version": "0xa101154",
2+
"firecracker_version": "1.14.0-dev",
3+
"kernel_version": "6.1.153-175.280.amzn2023.x86_64",
4+
"microcode_version": "0xa101156",
55
"bios_version": "1.0",
6-
"bios_revision": "2.21",
6+
"bios_revision": "2.23",
77
"guest_cpu_config": {
88
"kvm_capabilities": [],
99
"cpuid_modifiers": [
@@ -1486,7 +1486,7 @@
14861486
"modifiers": [
14871487
{
14881488
"register": "eax",
1489-
"bitmap": "0b00000000000000000000000001000101"
1489+
"bitmap": "0b00000000000000000000001001100101"
14901490
},
14911491
{
14921492
"register": "ebx",

‎tests/data/cpu_template_helper/fingerprint_AMD_MILAN_5.10host.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"firecracker_version": "1.13.0-dev",
3-
"kernel_version": "5.10.238-234.956.amzn2.x86_64",
4-
"microcode_version": "0xa0011db",
2+
"firecracker_version": "1.14.0-dev",
3+
"kernel_version": "5.10.244-240.965.amzn2.x86_64",
4+
"microcode_version": "0xa0011de",
55
"bios_version": "1.0",
6-
"bios_revision": "0.94",
6+
"bios_revision": "0.98",
77
"guest_cpu_config": {
88
"kvm_capabilities": [],
99
"cpuid_modifiers": [
@@ -1402,7 +1402,7 @@
14021402
},
14031403
{
14041404
"register": "ecx",
1405-
"bitmap": "0b00000000000000000010000000000000"
1405+
"bitmap": "0b00000000000000000110000000000000"
14061406
},
14071407
{
14081408
"register": "edx",
@@ -1542,4 +1542,4 @@
15421542
}
15431543
]
15441544
}
1545-
}
1545+
}

‎tests/data/cpu_template_helper/fingerprint_AMD_MILAN_6.1host.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"firecracker_version": "1.13.0-dev",
3-
"kernel_version": "6.1.141-165.249.amzn2023.x86_64",
4-
"microcode_version": "0xa0011db",
2+
"firecracker_version": "1.14.0-dev",
3+
"kernel_version": "6.1.153-175.280.amzn2023.x86_64",
4+
"microcode_version": "0xa0011de",
55
"bios_version": "1.0",
6-
"bios_revision": "0.94",
6+
"bios_revision": "0.98",
77
"guest_cpu_config": {
88
"kvm_capabilities": [],
99
"cpuid_modifiers": [
@@ -1394,7 +1394,7 @@
13941394
"modifiers": [
13951395
{
13961396
"register": "eax",
1397-
"bitmap": "0b00000000000000000000000001000101"
1397+
"bitmap": "0b00000000000000000000001001100101"
13981398
},
13991399
{
14001400
"register": "ebx",

‎tests/integration_tests/security/test_vulnerabilities.py‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@
1111

1212
import pytest
1313
import requests
14-
from packaging import version
1514

1615
from framework import utils
1716
from framework.ab_test import git_clone
1817
from framework.microvm import MicroVMFactory
1918
from framework.properties import global_props
20-
from framework.utils_cpuid import CpuVendor, get_cpu_vendor
2119

2220
CHECKER_URL = "https://raw.githubusercontent.com/speed47/spectre-meltdown-checker/master/spectre-meltdown-checker.sh"
2321
CHECKER_FILENAME = "spectre-meltdown-checker.sh"
@@ -134,32 +132,8 @@ def get_vuln_files_exception_dict(template):
134132
"""
135133
Returns a dictionary of expected values for vulnerability files requiring special treatment.
136134
"""
137-
host_kernel_version = version.parse(utils.get_kernel_version())
138-
cpu_vendor = get_cpu_vendor()
139135
exception_dict = {}
140136

141-
# Exception for tsa
142-
# =============================
143-
#
144-
# AMD guests on 6.1 hosts before 6.1.153
145-
# --------------------------------------------
146-
# On 6.1 kernels before 6.1.153 [1], KVM doesn't tell the guest that the microcode with the TSA
147-
# mitigation has been applied by setting CPUID.(EAX=0x80000021,ECX=0):EAX[5 (CLEAR_VERW)].
148-
# The guest applies the mitigation anyways, but flags it as possibly vulnerable as it cannot
149-
# verify that the microcode update has been applied correctly.
150-
# Note that this doesn't affect the T2A template (deprecated) as the presented CPU is older
151-
# and not recognised as being affected by TSA.
152-
# [1]: https://github.com/amazonlinux/linux/commit/8d1e0db16431610b5b35737d88595bdd7a08e271
153-
154-
if (
155-
cpu_vendor == CpuVendor.AMD
156-
and template == "None"
157-
and host_kernel_version.major == 6
158-
and host_kernel_version.minor == 1
159-
and host_kernel_version.micro < 153
160-
):
161-
exception_dict["tsa"] = "Vulnerable: Clear CPU buffers attempted, no microcode"
162-
163137
# Exception for mmio_stale_data
164138
# =============================
165139
#

0 commit comments

Comments
 (0)