Re: [kvm-unit-tests PATCH v9 2/2] s390x: topology: Checking Configuration Topology Information

Thomas Huth <thuth@xxxxxxxxxx> · Fri, 2 Jun 2023 11:20:23 +0200

On 02/06/2023 10.35, Nico Boehr wrote:
Quoting Janosch Frank (2023-06-01 11:38:37)
[...]
   [topology]
   file = topology.elf
+# 3 CPUs on socket 0 with different CPU TLE (standard, dedicated, origin)
+# 1 CPU on socket 2
+extra_params = -smp 1,drawers=3,books=3,sockets=4,cores=4,maxcpus=144 -cpu z14,ctop=on -device z14-s390x-cpu,core-id=1,entitlement=low -device z14-s390x-cpu,core-id=2,dedicated=on -device z14-s390x-cpu,core-id=10 -device z14-s390x-cpu,core-id=20 -device z14-s390x-cpu,core-id=130,socket-id=0,book-id=0,drawer-id=0 -append '-drawers 3 -books 3 -sockets 4 -cores 4'
+
+[topology-2]
+file = topology.elf
+extra_params = -smp 1,drawers=2,books=2,sockets=2,cores=30,maxcpus=240  -append '-drawers 2 -books 2 -sockets 2 -cores 30' -cpu z14,ctop=on -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=2,entitlement=low -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=3,entitlement=medium -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=4,entitlement=high -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=5,entitlement=high,dedicated=on -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=65,entitlement=low -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=66,entitlement=medium -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=67,entitlement=high -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=68,entitlement=high,dedicated=on

Pardon my ignorance but I see z14 in there, will this work if we run on
a z13?

It causes a skip, I reproduced this on a z14 by changing to z15:
SKIP topology (qemu-system-s390x: unable to find CPU model 'z15')

If we can make this more generic so the tests run on older machines it would be
good, but if we can't it wouldn't break (i.e. FAIL) on older machines.

Can't we simply use "-cpu max,ctop=on" ?

 Thomas