Skip to content

hw/arm/virt: Fix the default CPU topology

Gavin Shan requested to merge (removed):bug2041823 into c9s

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=bug2041823
Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=45210062
Upstream Status: QEMU v7.1
Tested: Passed, no CPU topology broken warnings are observed

The default CPU topology is broken on arm/virt machine because two threads
from one socket can be associated with two separate NUMA nodes. It's not
expected by Linux guest as the following warning indicates. The warning
messages are observed in Linux guest booting stage.

This backports upstream commits to fix the issue. With this applied, the
default CPU topology won't break socket-NUMA-node boundary. No warning
messages are seen in Linux guest booting stage.

ae9141d4 hw/acpi/aml-build: Use existing CPU topology to build PPTT table
4c18bc19 hw/arm/virt: Fix CPU's default NUMA node ID
e280ecb3 qtest/numa-test: Correct CPU and NUMA association in aarch64_numa_cpu()
c9ec4cb5 hw/arm/virt: Consider SMP configuration in CPU topology
ac7199a2 qtest/numa-test: Specify CPU topology in aarch64_numa_cpu()
1dcf7001 qapi/machine.json: Add cluster-id

Signed-off-by: Gavin Shan gshan@redhat.com

Edited by Gavin Shan

Merge request reports