Skip to content

Commit 3a170f6

Browse files
pb8ozulinx86
authored andcommitted
test: baseline aarch64 fingerprint
Looks like the text_offset was changes in recent stable kernel versions, and that is reflected in the PC register prior to booting the VM. Signed-off-by: Pablo Barbáchano <pablob@amazon.com>
1 parent 1119361 commit 3a170f6

6 files changed

+17
-10
lines changed

tests/data/cpu_template_helper/fingerprint_ARM_NEOVERSE_N1_4.14host.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
},
157157
{
158158
"addr": "0x6030000000100040",
159-
"bitmap": "0b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000010000000000000000000"
159+
"bitmap": "0b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000"
160160
},
161161
{
162162
"addr": "0x6030000000100042",
@@ -1048,4 +1048,4 @@
10481048
}
10491049
]
10501050
}
1051-
}
1051+
}

tests/data/cpu_template_helper/fingerprint_ARM_NEOVERSE_N1_5.10host.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
},
157157
{
158158
"addr": "0x6030000000100040",
159-
"bitmap": "0b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000010000000000000000000"
159+
"bitmap": "0b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000"
160160
},
161161
{
162162
"addr": "0x6030000000100042",
@@ -1252,4 +1252,4 @@
12521252
}
12531253
]
12541254
}
1255-
}
1255+
}

tests/data/cpu_template_helper/fingerprint_ARM_NEOVERSE_N1_6.1host.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
},
157157
{
158158
"addr": "0x6030000000100040",
159-
"bitmap": "0b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000010000000000000000000"
159+
"bitmap": "0b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000"
160160
},
161161
{
162162
"addr": "0x6030000000100042",
@@ -972,4 +972,4 @@
972972
}
973973
]
974974
}
975-
}
975+
}

tests/data/cpu_template_helper/fingerprint_ARM_NEOVERSE_V1_5.10host.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
},
157157
{
158158
"addr": "0x6030000000100040",
159-
"bitmap": "0b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000010000000000000000000"
159+
"bitmap": "0b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000"
160160
},
161161
{
162162
"addr": "0x6030000000100042",
@@ -1252,4 +1252,4 @@
12521252
}
12531253
]
12541254
}
1255-
}
1255+
}

tests/data/cpu_template_helper/fingerprint_ARM_NEOVERSE_V1_6.1host.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
},
157157
{
158158
"addr": "0x6030000000100040",
159-
"bitmap": "0b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000010000000000000000000"
159+
"bitmap": "0b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000"
160160
},
161161
{
162162
"addr": "0x6030000000100042",
@@ -972,4 +972,4 @@
972972
}
973973
]
974974
}
975-
}
975+
}

tests/integration_tests/functional/test_cpu_template_helper.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,13 @@ def test_guest_cpu_config_change(test_microvm_with_api, tmp_path, cpu_template_h
349349
Verify that the guest CPU config has not changed since the baseline
350350
fingerprint was gathered.
351351
"""
352+
if (
353+
global_props.host_linux_version == "4.14"
354+
and global_props.instance == "c7g.metal"
355+
):
356+
# The non-SVE kernel has a different value in 0x6030000000100040 because
357+
# it's an old kernel.
358+
pytest.skip("old kernel has different fingerprint")
352359
detect_fingerprint_change(
353360
test_microvm_with_api,
354361
tmp_path,

0 commit comments

Comments
 (0)