thebeanogamer / rpms / qemu-kvm

Forked from rpms/qemu-kvm 5 months ago
Clone

Blame SOURCES/kvm-qtest-numa-test-Specify-CPU-topology-in-aarch64_numa.patch

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