69 lines
2.9 KiB
Diff
69 lines
2.9 KiB
Diff
|
From 66f3928b40991d8467a3da086688f73d061886c8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Gavin Shan <gshan@redhat.com>
|
||
|
|
Date: Wed, 11 May 2022 18:01:35 +0800
|
||
|
|
Subject: [PATCH 02/16] qtest/numa-test: Specify CPU topology in
|
||
|
|
aarch64_numa_cpu()
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Gavin Shan <gshan@redhat.com>
|
||
|
|
RH-MergeRequest: 86: hw/arm/virt: Fix the default CPU topology
|
||
|
|
RH-Commit: [2/6] b851e7ad59e057825392ddf75e9040cc102a0385 (gwshan/qemu-rhel-9)
|
||
|
|
RH-Bugzilla: 2041823
|
||
|
|
RH-Acked-by: Eric Auger <eric.auger@redhat.com>
|
||
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
||
|
|
RH-Acked-by: Andrew Jones <drjones@redhat.com>
|
||
|
|
|
||
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2041823
|
||
|
|
|
||
|
|
The CPU topology isn't enabled on arm/virt machine yet, but we're
|
||
|
|
going to do it in next patch. After the CPU topology is enabled by
|
||
|
|
next patch, "thread-id=1" becomes invalid because the CPU core is
|
||
|
|
preferred on arm/virt machine. It means these two CPUs have 0/1
|
||
|
|
as their core IDs, but their thread IDs are all 0. It will trigger
|
||
|
|
test failure as the following message indicates:
|
||
|
|
|
||
|
|
[14/21 qemu:qtest+qtest-aarch64 / qtest-aarch64/numa-test ERROR
|
||
|
|
1.48s killed by signal 6 SIGABRT
|
||
|
|
>>> G_TEST_DBUS_DAEMON=/home/gavin/sandbox/qemu.main/tests/dbus-vmstate-daemon.sh \
|
||
|
|
QTEST_QEMU_STORAGE_DAEMON_BINARY=./storage-daemon/qemu-storage-daemon \
|
||
|
|
QTEST_QEMU_BINARY=./qemu-system-aarch64 \
|
||
|
|
QTEST_QEMU_IMG=./qemu-img MALLOC_PERTURB_=83 \
|
||
|
|
/home/gavin/sandbox/qemu.main/build/tests/qtest/numa-test --tap -k
|
||
|
|
――――――――――――――――――――――――――――――――――――――――――――――
|
||
|
|
stderr:
|
||
|
|
qemu-system-aarch64: -numa cpu,node-id=0,thread-id=1: no match found
|
||
|
|
|
||
|
|
This fixes the issue by providing comprehensive SMP configurations
|
||
|
|
in aarch64_numa_cpu(). The SMP configurations aren't used before
|
||
|
|
the CPU topology is enabled in next patch.
|
||
|
|
|
||
|
|
Signed-off-by: Gavin Shan <gshan@redhat.com>
|
||
|
|
Reviewed-by: Yanan Wang <wangyanan55@huawei.com>
|
||
|
|
Message-id: 20220503140304.855514-3-gshan@redhat.com
|
||
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
||
|
|
(cherry picked from commit ac7199a2523ce2ccf8e685087a5d177eeca89b09)
|
||
|
|
Signed-off-by: Gavin Shan <gshan@redhat.com>
|
||
|
|
---
|
||
|
|
tests/qtest/numa-test.c | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/tests/qtest/numa-test.c b/tests/qtest/numa-test.c
|
||
|
|
index 90bf68a5b3..aeda8c774c 100644
|
||
|
|
--- a/tests/qtest/numa-test.c
|
||
|
|
+++ b/tests/qtest/numa-test.c
|
||
|
|
@@ -223,7 +223,8 @@ static void aarch64_numa_cpu(const void *data)
|
||
|
|
QTestState *qts;
|
||
|
|
g_autofree char *cli = NULL;
|
||
|
|
|
||
|
|
- cli = make_cli(data, "-machine smp.cpus=2 "
|
||
|
|
+ cli = make_cli(data, "-machine "
|
||
|
|
+ "smp.cpus=2,smp.sockets=1,smp.clusters=1,smp.cores=1,smp.threads=2 "
|
||
|
|
"-numa node,nodeid=0,memdev=ram -numa node,nodeid=1 "
|
||
|
|
"-numa cpu,node-id=1,thread-id=0 "
|
||
|
|
"-numa cpu,node-id=0,thread-id=1");
|
||
|
|
--
|
||
|
|
2.31.1
|
||
|
|
|