openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

tests: add host CPU data files for validating die_id 

Only Cascadelake-AP CPUs appear to report "die_id" values != 0 on Linux
right now - AMD EPYC's don't report "die_id" (at least with Fedora 31
kernel). Lacking access to Cascadelake-AP CPUs, this test data was from
a Fedora 31 QEMU guest launched with

 -cpu qemu64 -smp sockets=2,dies=3,cores=2,threads=1

Ideally we'd replace this data with some from a real machine reporting
"die_id", to ensure we're not mislead by QEMU's impl.

Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2019-12-16 18:08:24 +00:00
parent 7b79ee2f78
commit 0169f5ecde
191 changed files with 547 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/vircaps2xmldata/linux-basic-dies/system/cpu Symbolic link
View File

@ -0,0 +1 @@
../../../virhostcpudata/linux-with-die/cpu

1
tests/vircaps2xmldata/linux-basic-dies/system/node Symbolic link
View File

@ -0,0 +1 @@
../../../virhostcpudata/linux-with-die/node

35
tests/vircaps2xmldata/vircaps-x86_64-basic-dies.xml Normal file
View File

@ -0,0 +1,35 @@
<capabilities>
<host>
<cpu>
<arch>x86_64</arch>
</cpu>
<power_management/>
<iommu support='no'/>
<topology>
<cells num='1'>
<cell id='0'>
<memory unit='KiB'>1048576</memory>
<pages unit='KiB' size='4'>2048</pages>
<pages unit='KiB' size='2048'>4096</pages>
<pages unit='KiB' size='1048576'>6144</pages>
<cpus num='12'>
<cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/>
<cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1'/>
<cpu id='2' socket_id='0' die_id='1' core_id='0' siblings='2'/>
<cpu id='3' socket_id='0' die_id='1' core_id='1' siblings='3'/>
<cpu id='4' socket_id='0' die_id='2' core_id='0' siblings='4'/>
<cpu id='5' socket_id='0' die_id='2' core_id='1' siblings='5'/>
<cpu id='6' socket_id='1' die_id='0' core_id='0' siblings='6'/>
<cpu id='7' socket_id='1' die_id='0' core_id='1' siblings='7'/>
<cpu id='8' socket_id='1' die_id='1' core_id='0' siblings='8'/>
<cpu id='9' socket_id='1' die_id='1' core_id='1' siblings='9'/>
<cpu id='10' socket_id='1' die_id='2' core_id='0' siblings='10'/>
<cpu id='11' socket_id='1' die_id='2' core_id='1' siblings='11'/>
</cpus>
</cell>
</cells>
</topology>
</host>
</capabilities>

1
tests/vircaps2xmltest.c
View File

@ -102,6 +102,7 @@ mymain(void)
DO_TEST_FULL("basic", VIR_ARCH_X86_64, false, false);
DO_TEST_FULL("basic", VIR_ARCH_AARCH64, true, false);
DO_TEST_FULL("basic-dies", VIR_ARCH_X86_64, false, false);
DO_TEST_FULL("caches", VIR_ARCH_X86_64, true, true);

1
tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus Normal file
View File

@ -0,0 +1 @@
001

1
tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus_list Normal file
View File

@ -0,0 +1 @@
0

1
tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_id Normal file
View File

@ -0,0 +1 @@
0

1
tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings Normal file
View File

@ -0,0 +1 @@
03f

1
tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings_list Normal file
View File

@ -0,0 +1 @@
0-5

1
tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus Normal file
View File

@ -0,0 +1 @@
003

1
tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus_list Normal file
View File

@ -0,0 +1 @@
0-1

1
tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_id Normal file
View File

@ -0,0 +1 @@
0

1
tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus Normal file
View File

@ -0,0 +1 @@
03f

1
tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus_list Normal file
View File

@ -0,0 +1 @@
0-5

1
tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/physical_package_id Normal file
View File

@ -0,0 +1 @@
0

1
tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings Normal file
View File

@ -0,0 +1 @@
001

1
tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings_list Normal file
View File

@ -0,0 +1 @@
0

1
tests/virhostcpudata/linux-with-die/cpu/cpu1/online Normal file
View File

@ -0,0 +1 @@
1

1
tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus Normal file
View File

@ -0,0 +1 @@
002

1
tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus_list Normal file
View File

@ -0,0 +1 @@
1

1
tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_id Normal file
View File

@ -0,0 +1 @@
1

1
tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings Normal file
View File

@ -0,0 +1 @@
03f

1
tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings_list Normal file
View File

@ -0,0 +1 @@
0-5

1
tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus Normal file
View File

@ -0,0 +1 @@
003

1
tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus_list Normal file
View File

@ -0,0 +1 @@
0-1

1
tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_id Normal file
View File

@ -0,0 +1 @@
0

1
tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus Normal file
View File

@ -0,0 +1 @@
03f

1
tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus_list Normal file
View File

@ -0,0 +1 @@
0-5

1
tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/physical_package_id Normal file
View File

@ -0,0 +1 @@
0

1
tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings Normal file
View File

@ -0,0 +1 @@
002

1
tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings_list Normal file
View File

@ -0,0 +1 @@
1

1
tests/virhostcpudata/linux-with-die/cpu/cpu10/online Normal file
View File

@ -0,0 +1 @@
1

1
tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus Normal file
View File

@ -0,0 +1 @@
400

1
tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus_list Normal file
View File

@ -0,0 +1 @@
10

1
tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_id Normal file
View File

@ -0,0 +1 @@
0

1
tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings Normal file
View File

@ -0,0 +1 @@
fc0

1
tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings_list Normal file
View File

@ -0,0 +1 @@
6-11

1
tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus Normal file
View File

@ -0,0 +1 @@
c00

1
tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus_list Normal file
View File

@ -0,0 +1 @@
10-11

1
tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_id Normal file
View File

@ -0,0 +1 @@
2

1
tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus Normal file
View File

@ -0,0 +1 @@
fc0

1
tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus_list Normal file
View File

@ -0,0 +1 @@
6-11

1
tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/physical_package_id Normal file
View File

@ -0,0 +1 @@
1

1
tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings Normal file
View File

@ -0,0 +1 @@
400

1
tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings_list Normal file
View File

@ -0,0 +1 @@
10

1
tests/virhostcpudata/linux-with-die/cpu/cpu11/online Normal file
View File

@ -0,0 +1 @@
1

1
tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus Normal file
View File

@ -0,0 +1 @@
800

1
tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus_list Normal file
View File

@ -0,0 +1 @@
11

1
tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_id Normal file
View File

@ -0,0 +1 @@
1

1
tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings Normal file
View File

@ -0,0 +1 @@
fc0

1
tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings_list Normal file
View File

@ -0,0 +1 @@
6-11

1
tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus Normal file
View File

@ -0,0 +1 @@
c00

1
tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus_list Normal file
View File

@ -0,0 +1 @@
10-11

1
tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_id Normal file
View File

@ -0,0 +1 @@
2

1
tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus Normal file
View File

@ -0,0 +1 @@
fc0

1
tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus_list Normal file
View File

@ -0,0 +1 @@
6-11

1
tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/physical_package_id Normal file
View File

@ -0,0 +1 @@
1

1
tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings Normal file
View File

@ -0,0 +1 @@
800

1
tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings_list Normal file
View File

@ -0,0 +1 @@
11

1
tests/virhostcpudata/linux-with-die/cpu/cpu2/online Normal file
View File

@ -0,0 +1 @@
1

1
tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus Normal file
View File

@ -0,0 +1 @@
004

1
tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus_list Normal file
View File

@ -0,0 +1 @@
2

1
tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_id Normal file
View File

@ -0,0 +1 @@
0

1
tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings Normal file
View File

@ -0,0 +1 @@
03f

1
tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings_list Normal file
View File

@ -0,0 +1 @@
0-5

1
tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus Normal file
View File

@ -0,0 +1 @@
00c

1
tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus_list Normal file
View File

@ -0,0 +1 @@
2-3

1
tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_id Normal file
View File

@ -0,0 +1 @@
1

1
tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus Normal file
View File

@ -0,0 +1 @@
03f

1
tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus_list Normal file
View File

@ -0,0 +1 @@
0-5

1
tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/physical_package_id Normal file
View File

@ -0,0 +1 @@
0

1
tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings Normal file
View File

@ -0,0 +1 @@
004

1
tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings_list Normal file
View File

@ -0,0 +1 @@
2

1
tests/virhostcpudata/linux-with-die/cpu/cpu3/online Normal file
View File

@ -0,0 +1 @@
1

1
tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus Normal file
View File

@ -0,0 +1 @@
008

1
tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus_list Normal file
View File

@ -0,0 +1 @@
3

1
tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_id Normal file
View File

@ -0,0 +1 @@
1

1
tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings Normal file
View File

@ -0,0 +1 @@
03f

1
tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings_list Normal file
View File

@ -0,0 +1 @@
0-5

1
tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus Normal file
View File

@ -0,0 +1 @@
00c

1
tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus_list Normal file
View File

@ -0,0 +1 @@
2-3

1
tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_id Normal file
View File

@ -0,0 +1 @@
1

1
tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus Normal file
View File

@ -0,0 +1 @@
03f

1
tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus_list Normal file
View File

@ -0,0 +1 @@
0-5

1
tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/physical_package_id Normal file
View File

@ -0,0 +1 @@
0

1
tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings Normal file
View File

@ -0,0 +1 @@
008

1
tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings_list Normal file
View File

@ -0,0 +1 @@
3

1
tests/virhostcpudata/linux-with-die/cpu/cpu4/online Normal file
View File

@ -0,0 +1 @@
1

1
tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus Normal file
View File

@ -0,0 +1 @@
010

1
tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus_list Normal file
View File

@ -0,0 +1 @@
4

1
tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_id Normal file
View File

@ -0,0 +1 @@
0

1
tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings Normal file
View File

@ -0,0 +1 @@
03f

1
tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings_list Normal file
View File

@ -0,0 +1 @@
0-5

1
tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus Normal file
View File

@ -0,0 +1 @@
030

1
tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus_list Normal file
View File

@ -0,0 +1 @@
4-5

1
tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_id Normal file
View File

@ -0,0 +1 @@
2

1
tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus Normal file
View File

@ -0,0 +1 @@
03f

1
tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus_list Normal file
View File

@ -0,0 +1 @@
0-5

1
tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/physical_package_id Normal file
View File

@ -0,0 +1 @@
0

1
tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings Normal file
View File

@ -0,0 +1 @@
010

Some files were not shown because too many files have changed in this diff Show More