Skip to content

Commit 73079dd

Browse files
committed
fix(test): skip test_cpu_topology test on Ubuntu
On Aarch64 systems we do not normalize vCPUs, we let KVM configure them. This means that the CPU cache hierarchy exposed to the guest depends entirely on what the KVM decides it to be. We observed that when we're running tests on Ubuntu hosts with a 6.14 kernel the cache hierarchy is different than the one we expect on AL hosts. Until we decide how to deal with CPU hierarchy in a controled way (or not) skip the test on Ubuntu systems. The actual test checks that the host kernel version is greater or equal to 6.14. Signed-off-by: Babis Chalios <[email protected]>
1 parent d33011c commit 73079dd

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

tests/integration_tests/functional/test_topology.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
# SPDX-License-Identifier: Apache-2.0
33
"""Tests for ensuring correctness of CPU and cache topology in the guest."""
44

5+
from packaging import version
56
import platform
67
import subprocess
78

89
import pytest
910

11+
from framework.utils import get_kernel_version
1012
import framework.utils_cpuid as utils
11-
from framework.properties import global_props
1213

1314
TOPOLOGY_STR = {1: "0", 2: "0,1", 16: "0-15"}
1415
PLATFORM = platform.machine()
@@ -198,6 +199,12 @@ def test_cpu_topology(uvm_plain_any, num_vcpus, htt):
198199
"""
199200
if htt and PLATFORM == "aarch64":
200201
pytest.skip("SMT is configurable only on x86.")
202+
203+
# TODO:Remove (or adapt) this once we unify the way we expose the CPU cache hierarchy on
204+
# Aarch64 systems.
205+
if version.parse(get_kernel_version()) >= version.parse("6.14"):
206+
pytest.skip("Starting on 6.14 KVM exposes a different CPU cache hierarchy")
207+
201208
vm = uvm_plain_any
202209
vm.spawn()
203210
vm.basic_config(vcpu_count=num_vcpus, smt=htt)

0 commit comments

Comments
 (0)