On Mon, 25 Apr 2022 11:27:59 +0800 Gavin Shan <gs...@redhat.com> wrote:
> 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, "thrad-id=1" becomes invalid because the CPU core is ^^^ typo > 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 <gs...@redhat.com> > Reviewed-by: Yanan Wang <wangyana...@huawei.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 " ^^^^ make it sensible as well, i.e. socket/cluster/cores-ids ... > "-numa cpu,node-id=0,thread-id=1");