External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Report CPU clusters in capabilities XML

Browse Source 
For machines that don't expose useful information through sysfs,
the dummy ID 0 is used.

https://issues.redhat.com/browse/RHEL-7043

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Andrea Bolognani 2024-01-05 16:03:54 +01:00
parent fb81a56f32
commit 5fc56aefb6
19 changed files with 182 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/conf/capabilities.c
View File

@ -811,9 +811,10 @@ virCapsHostNUMACellCPUFormat(virBuffer *buf,
return -1; return -1;
virBufferAsprintf(&childBuf, virBufferAsprintf(&childBuf,
" socket_id='%d' die_id='%d' core_id='%d' siblings='%s'", " socket_id='%d' die_id='%d' cluster_id='%d' core_id='%d' siblings='%s'",
cpus[j].socket_id, cpus[j].socket_id,
cpus[j].die_id, cpus[j].die_id,
cpus[j].cluster_id,
cpus[j].core_id, cpus[j].core_id,
siblings); siblings);
} }
@ -1453,6 +1454,7 @@ virCapabilitiesFillCPUInfo(int cpu_id G_GNUC_UNUSED,
if (virHostCPUGetSocket(cpu_id, &cpu->socket_id) < 0 || if (virHostCPUGetSocket(cpu_id, &cpu->socket_id) < 0 ||
virHostCPUGetDie(cpu_id, &cpu->die_id) < 0 || virHostCPUGetDie(cpu_id, &cpu->die_id) < 0 ||
virHostCPUGetCluster(cpu_id, &cpu->cluster_id) < 0 ||
virHostCPUGetCore(cpu_id, &cpu->core_id) < 0) virHostCPUGetCore(cpu_id, &cpu->core_id) < 0)
return -1; return -1;
@ -1712,6 +1714,7 @@ virCapabilitiesHostNUMAInitFake(virCapsHostNUMA *caps)
if (tmp) { if (tmp) {
cpus[cid].id = id; cpus[cid].id = id;
cpus[cid].die_id = 0; cpus[cid].die_id = 0;
cpus[cid].cluster_id = 0;
cpus[cid].socket_id = s; cpus[cid].socket_id = s;
cpus[cid].core_id = c; cpus[cid].core_id = c;
cpus[cid].siblings = virBitmapNewCopy(siblings); cpus[cid].siblings = virBitmapNewCopy(siblings);

1
src/conf/capabilities.h
View File

@ -89,6 +89,7 @@ struct _virCapsHostNUMACellCPU {
unsigned int id; unsigned int id;
unsigned int socket_id; unsigned int socket_id;
unsigned int die_id; unsigned int die_id;
unsigned int cluster_id;
unsigned int core_id; unsigned int core_id;
virBitmap *siblings; virBitmap *siblings;
}; };

3
src/conf/schemas/capability.rng
View File

@ -201,6 +201,9 @@
<attribute name="die_id"> <attribute name="die_id">
<ref name="unsignedInt"/> <ref name="unsignedInt"/>
</attribute> </attribute>
<attribute name="cluster_id">
<ref name="unsignedInt"/>
</attribute>
<attribute name="core_id"> <attribute name="core_id">
<ref name="unsignedInt"/> <ref name="unsignedInt"/>
</attribute> </attribute>

1
src/libvirt_linux.syms
View File

@ -3,6 +3,7 @@
# #
# util/virhostcpu.h # util/virhostcpu.h
virHostCPUGetCluster;
virHostCPUGetCore; virHostCPUGetCore;
virHostCPUGetDie; virHostCPUGetDie;
virHostCPUGetInfoPopulateLinux; virHostCPUGetInfoPopulateLinux;

22
src/util/virhostcpu.c
View File

@ -232,6 +232,28 @@ virHostCPUGetDie(unsigned int cpu, unsigned int *die)
return 0; return 0;
} }
int
virHostCPUGetCluster(unsigned int cpu, unsigned int *cluster)
{
int cluster_id;
int ret = virFileReadValueInt(&cluster_id,
"%s/cpu/cpu%u/topology/cluster_id",
SYSFS_SYSTEM_PATH, cpu);
if (ret == -1)
return -1;
/* If the file doesn't exists (old kernel) or the value contained
* in it is -1 (architecture without CPU clusters), report 0 to
* indicate the lack of information */
if (ret == -2 || cluster_id < 0)
cluster_id = 0;
*cluster = cluster_id;
return 0;
}
int int
virHostCPUGetCore(unsigned int cpu, unsigned int *core) virHostCPUGetCore(unsigned int cpu, unsigned int *core)
{ {

1
src/util/virhostcpu.h
View File

@ -68,6 +68,7 @@ int virHostCPUStatsAssign(virNodeCPUStatsPtr param,
#ifdef __linux__ #ifdef __linux__
int virHostCPUGetSocket(unsigned int cpu, unsigned int *socket); int virHostCPUGetSocket(unsigned int cpu, unsigned int *socket);
int virHostCPUGetDie(unsigned int cpu, unsigned int *die); int virHostCPUGetDie(unsigned int cpu, unsigned int *die);
int virHostCPUGetCluster(unsigned int cpu, unsigned int *cluster);
int virHostCPUGetCore(unsigned int cpu, unsigned int *core); int virHostCPUGetCore(unsigned int cpu, unsigned int *core);
virBitmap *virHostCPUGetSiblingsList(unsigned int cpu); virBitmap *virHostCPUGetSiblingsList(unsigned int cpu);

32
tests/capabilityschemadata/caps-qemu-kvm.xml
View File

@ -64,14 +64,14 @@
<sibling id='1' value='21'/> <sibling id='1' value='21'/>
</distances> </distances>
<cpus num='8'> <cpus num='8'>
<cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/> <cpu id='0' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0'/>
<cpu id='2' socket_id='0' die_id='0' core_id='1' siblings='2'/> <cpu id='2' socket_id='0' die_id='0' cluster_id='0' core_id='1' siblings='2'/>
<cpu id='4' socket_id='0' die_id='0' core_id='2' siblings='4'/> <cpu id='4' socket_id='0' die_id='0' cluster_id='0' core_id='2' siblings='4'/>
<cpu id='6' socket_id='0' die_id='0' core_id='3' siblings='6'/> <cpu id='6' socket_id='0' die_id='0' cluster_id='0' core_id='3' siblings='6'/>
<cpu id='8' socket_id='0' die_id='0' core_id='4' siblings='8'/> <cpu id='8' socket_id='0' die_id='0' cluster_id='0' core_id='4' siblings='8'/>
<cpu id='10' socket_id='0' die_id='0' core_id='5' siblings='10'/> <cpu id='10' socket_id='0' die_id='0' cluster_id='0' core_id='5' siblings='10'/>
<cpu id='12' socket_id='0' die_id='0' core_id='6' siblings='12'/> <cpu id='12' socket_id='0' die_id='0' cluster_id='0' core_id='6' siblings='12'/>
<cpu id='14' socket_id='0' die_id='0' core_id='7' siblings='14'/> <cpu id='14' socket_id='0' die_id='0' cluster_id='0' core_id='7' siblings='14'/>
</cpus> </cpus>
</cell> </cell>
<cell id='1'> <cell id='1'>
@ -84,14 +84,14 @@
<sibling id='1' value='10'/> <sibling id='1' value='10'/>
</distances> </distances>
<cpus num='8'> <cpus num='8'>
<cpu id='1' socket_id='1' die_id='0' core_id='0' siblings='1'/> <cpu id='1' socket_id='1' die_id='0' cluster_id='0' core_id='0' siblings='1'/>
<cpu id='3' socket_id='1' die_id='0' core_id='1' siblings='3'/> <cpu id='3' socket_id='1' die_id='0' cluster_id='0' core_id='1' siblings='3'/>
<cpu id='5' socket_id='1' die_id='0' core_id='2' siblings='5'/> <cpu id='5' socket_id='1' die_id='0' cluster_id='0' core_id='2' siblings='5'/>
<cpu id='7' socket_id='1' die_id='0' core_id='3' siblings='7'/> <cpu id='7' socket_id='1' die_id='0' cluster_id='0' core_id='3' siblings='7'/>
<cpu id='9' socket_id='1' die_id='0' core_id='4' siblings='9'/> <cpu id='9' socket_id='1' die_id='0' cluster_id='0' core_id='4' siblings='9'/>
<cpu id='11' socket_id='1' die_id='0' core_id='5' siblings='11'/> <cpu id='11' socket_id='1' die_id='0' cluster_id='0' core_id='5' siblings='11'/>
<cpu id='13' socket_id='1' die_id='0' core_id='6' siblings='13'/> <cpu id='13' socket_id='1' die_id='0' cluster_id='0' core_id='6' siblings='13'/>
<cpu id='15' socket_id='1' die_id='0' core_id='7' siblings='15'/> <cpu id='15' socket_id='1' die_id='0' cluster_id='0' core_id='7' siblings='15'/>
</cpus> </cpus>
</cell> </cell>
</cells> </cells>

16
tests/vircaps2xmldata/vircaps-aarch64-basic-clusters.xml
View File

@ -14,10 +14,10 @@
<pages unit='KiB' size='2048'>4096</pages> <pages unit='KiB' size='2048'>4096</pages>
<pages unit='KiB' size='1048576'>6144</pages> <pages unit='KiB' size='1048576'>6144</pages>
<cpus num='4'> <cpus num='4'>
<cpu id='0' socket_id='36' die_id='0' core_id='0' siblings='0-1'/> <cpu id='0' socket_id='36' die_id='0' cluster_id='0' core_id='0' siblings='0-1'/>
<cpu id='1' socket_id='36' die_id='0' core_id='0' siblings='0-1'/> <cpu id='1' socket_id='36' die_id='0' cluster_id='0' core_id='0' siblings='0-1'/>
<cpu id='2' socket_id='36' die_id='0' core_id='1' siblings='2-3'/> <cpu id='2' socket_id='36' die_id='0' cluster_id='1' core_id='1' siblings='2-3'/>
<cpu id='3' socket_id='36' die_id='0' core_id='1' siblings='2-3'/> <cpu id='3' socket_id='36' die_id='0' cluster_id='1' core_id='1' siblings='2-3'/>
</cpus> </cpus>
</cell> </cell>
<cell id='1'> <cell id='1'>
@ -26,10 +26,10 @@
<pages unit='KiB' size='2048'>6144</pages> <pages unit='KiB' size='2048'>6144</pages>
<pages unit='KiB' size='1048576'>8192</pages> <pages unit='KiB' size='1048576'>8192</pages>
<cpus num='4'> <cpus num='4'>
<cpu id='4' socket_id='3180' die_id='0' core_id='256' siblings='4-5'/> <cpu id='4' socket_id='3180' die_id='0' cluster_id='256' core_id='256' siblings='4-5'/>
<cpu id='5' socket_id='3180' die_id='0' core_id='256' siblings='4-5'/> <cpu id='5' socket_id='3180' die_id='0' cluster_id='256' core_id='256' siblings='4-5'/>
<cpu id='6' socket_id='3180' die_id='0' core_id='257' siblings='6-7'/> <cpu id='6' socket_id='3180' die_id='0' cluster_id='257' core_id='257' siblings='6-7'/>
<cpu id='7' socket_id='3180' die_id='0' core_id='257' siblings='6-7'/> <cpu id='7' socket_id='3180' die_id='0' cluster_id='257' core_id='257' siblings='6-7'/>
</cpus> </cpus>
</cell> </cell>
</cells> </cells>

32
tests/vircaps2xmldata/vircaps-aarch64-basic.xml
View File

@ -16,10 +16,10 @@
<pages unit='KiB' size='2048'>4096</pages> <pages unit='KiB' size='2048'>4096</pages>
<pages unit='KiB' size='1048576'>6144</pages> <pages unit='KiB' size='1048576'>6144</pages>
<cpus num='4'> <cpus num='4'>
<cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/> <cpu id='0' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0'/>
<cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1'/> <cpu id='1' socket_id='0' die_id='0' cluster_id='0' core_id='1' siblings='1'/>
<cpu id='2' socket_id='0' die_id='0' core_id='2' siblings='2'/> <cpu id='2' socket_id='0' die_id='0' cluster_id='0' core_id='2' siblings='2'/>
<cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3'/> <cpu id='3' socket_id='0' die_id='0' cluster_id='0' core_id='3' siblings='3'/>
</cpus> </cpus>
</cell> </cell>
<cell id='1'> <cell id='1'>
@ -28,10 +28,10 @@
<pages unit='KiB' size='2048'>6144</pages> <pages unit='KiB' size='2048'>6144</pages>
<pages unit='KiB' size='1048576'>8192</pages> <pages unit='KiB' size='1048576'>8192</pages>
<cpus num='4'> <cpus num='4'>
<cpu id='4' socket_id='1' die_id='0' core_id='4' siblings='4'/> <cpu id='4' socket_id='1' die_id='0' cluster_id='0' core_id='4' siblings='4'/>
<cpu id='5' socket_id='1' die_id='0' core_id='5' siblings='5'/> <cpu id='5' socket_id='1' die_id='0' cluster_id='0' core_id='5' siblings='5'/>
<cpu id='6' socket_id='1' die_id='0' core_id='6' siblings='6'/> <cpu id='6' socket_id='1' die_id='0' cluster_id='0' core_id='6' siblings='6'/>
<cpu id='7' socket_id='1' die_id='0' core_id='7' siblings='7'/> <cpu id='7' socket_id='1' die_id='0' cluster_id='0' core_id='7' siblings='7'/>
</cpus> </cpus>
</cell> </cell>
<cell id='2'> <cell id='2'>
@ -40,10 +40,10 @@
<pages unit='KiB' size='2048'>8192</pages> <pages unit='KiB' size='2048'>8192</pages>
<pages unit='KiB' size='1048576'>10240</pages> <pages unit='KiB' size='1048576'>10240</pages>
<cpus num='4'> <cpus num='4'>
<cpu id='8' socket_id='2' die_id='0' core_id='8' siblings='8'/> <cpu id='8' socket_id='2' die_id='0' cluster_id='0' core_id='8' siblings='8'/>
<cpu id='9' socket_id='2' die_id='0' core_id='9' siblings='9'/> <cpu id='9' socket_id='2' die_id='0' cluster_id='0' core_id='9' siblings='9'/>
<cpu id='10' socket_id='2' die_id='0' core_id='10' siblings='10'/> <cpu id='10' socket_id='2' die_id='0' cluster_id='0' core_id='10' siblings='10'/>
<cpu id='11' socket_id='2' die_id='0' core_id='11' siblings='11'/> <cpu id='11' socket_id='2' die_id='0' cluster_id='0' core_id='11' siblings='11'/>
</cpus> </cpus>
</cell> </cell>
<cell id='3'> <cell id='3'>
@ -52,10 +52,10 @@
<pages unit='KiB' size='2048'>10240</pages> <pages unit='KiB' size='2048'>10240</pages>
<pages unit='KiB' size='1048576'>12288</pages> <pages unit='KiB' size='1048576'>12288</pages>
<cpus num='4'> <cpus num='4'>
<cpu id='12' socket_id='3' die_id='0' core_id='12' siblings='12'/> <cpu id='12' socket_id='3' die_id='0' cluster_id='0' core_id='12' siblings='12'/>
<cpu id='13' socket_id='3' die_id='0' core_id='13' siblings='13'/> <cpu id='13' socket_id='3' die_id='0' cluster_id='0' core_id='13' siblings='13'/>
<cpu id='14' socket_id='3' die_id='0' core_id='14' siblings='14'/> <cpu id='14' socket_id='3' die_id='0' cluster_id='0' core_id='14' siblings='14'/>
<cpu id='15' socket_id='3' die_id='0' core_id='15' siblings='15'/> <cpu id='15' socket_id='3' die_id='0' cluster_id='0' core_id='15' siblings='15'/>
</cpus> </cpus>
</cell> </cell>
</cells> </cells>

24
tests/vircaps2xmldata/vircaps-x86_64-basic-dies.xml
View File

@ -14,18 +14,18 @@
<pages unit='KiB' size='2048'>4096</pages> <pages unit='KiB' size='2048'>4096</pages>
<pages unit='KiB' size='1048576'>6144</pages> <pages unit='KiB' size='1048576'>6144</pages>
<cpus num='12'> <cpus num='12'>
<cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/> <cpu id='0' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0'/>
<cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1'/> <cpu id='1' socket_id='0' die_id='0' cluster_id='0' core_id='1' siblings='1'/>
<cpu id='2' socket_id='0' die_id='1' core_id='0' siblings='2'/> <cpu id='2' socket_id='0' die_id='1' cluster_id='0' core_id='0' siblings='2'/>
<cpu id='3' socket_id='0' die_id='1' core_id='1' siblings='3'/> <cpu id='3' socket_id='0' die_id='1' cluster_id='0' core_id='1' siblings='3'/>
<cpu id='4' socket_id='0' die_id='2' core_id='0' siblings='4'/> <cpu id='4' socket_id='0' die_id='2' cluster_id='0' core_id='0' siblings='4'/>
<cpu id='5' socket_id='0' die_id='2' core_id='1' siblings='5'/> <cpu id='5' socket_id='0' die_id='2' cluster_id='0' core_id='1' siblings='5'/>
<cpu id='6' socket_id='1' die_id='0' core_id='0' siblings='6'/> <cpu id='6' socket_id='1' die_id='0' cluster_id='0' core_id='0' siblings='6'/>
<cpu id='7' socket_id='1' die_id='0' core_id='1' siblings='7'/> <cpu id='7' socket_id='1' die_id='0' cluster_id='0' core_id='1' siblings='7'/>
<cpu id='8' socket_id='1' die_id='1' core_id='0' siblings='8'/> <cpu id='8' socket_id='1' die_id='1' cluster_id='0' core_id='0' siblings='8'/>
<cpu id='9' socket_id='1' die_id='1' core_id='1' siblings='9'/> <cpu id='9' socket_id='1' die_id='1' cluster_id='0' core_id='1' siblings='9'/>
<cpu id='10' socket_id='1' die_id='2' core_id='0' siblings='10'/> <cpu id='10' socket_id='1' die_id='2' cluster_id='0' core_id='0' siblings='10'/>
<cpu id='11' socket_id='1' die_id='2' core_id='1' siblings='11'/> <cpu id='11' socket_id='1' die_id='2' cluster_id='0' core_id='1' siblings='11'/>
</cpus> </cpus>
</cell> </cell>
</cells> </cells>

32
tests/vircaps2xmldata/vircaps-x86_64-basic.xml
View File

@ -14,10 +14,10 @@
<pages unit='KiB' size='2048'>4096</pages> <pages unit='KiB' size='2048'>4096</pages>
<pages unit='KiB' size='1048576'>6144</pages> <pages unit='KiB' size='1048576'>6144</pages>
<cpus num='4'> <cpus num='4'>
<cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/> <cpu id='0' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0'/>
<cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1'/> <cpu id='1' socket_id='0' die_id='0' cluster_id='0' core_id='1' siblings='1'/>
<cpu id='2' socket_id='0' die_id='0' core_id='2' siblings='2'/> <cpu id='2' socket_id='0' die_id='0' cluster_id='0' core_id='2' siblings='2'/>
<cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3'/> <cpu id='3' socket_id='0' die_id='0' cluster_id='0' core_id='3' siblings='3'/>
</cpus> </cpus>
</cell> </cell>
<cell id='1'> <cell id='1'>
@ -26,10 +26,10 @@
<pages unit='KiB' size='2048'>6144</pages> <pages unit='KiB' size='2048'>6144</pages>
<pages unit='KiB' size='1048576'>8192</pages> <pages unit='KiB' size='1048576'>8192</pages>
<cpus num='4'> <cpus num='4'>
<cpu id='4' socket_id='1' die_id='0' core_id='4' siblings='4'/> <cpu id='4' socket_id='1' die_id='0' cluster_id='0' core_id='4' siblings='4'/>
<cpu id='5' socket_id='1' die_id='0' core_id='5' siblings='5'/> <cpu id='5' socket_id='1' die_id='0' cluster_id='0' core_id='5' siblings='5'/>
<cpu id='6' socket_id='1' die_id='0' core_id='6' siblings='6'/> <cpu id='6' socket_id='1' die_id='0' cluster_id='0' core_id='6' siblings='6'/>
<cpu id='7' socket_id='1' die_id='0' core_id='7' siblings='7'/> <cpu id='7' socket_id='1' die_id='0' cluster_id='0' core_id='7' siblings='7'/>
</cpus> </cpus>
</cell> </cell>
<cell id='2'> <cell id='2'>
@ -38,10 +38,10 @@
<pages unit='KiB' size='2048'>8192</pages> <pages unit='KiB' size='2048'>8192</pages>
<pages unit='KiB' size='1048576'>10240</pages> <pages unit='KiB' size='1048576'>10240</pages>
<cpus num='4'> <cpus num='4'>
<cpu id='8' socket_id='2' die_id='0' core_id='8' siblings='8'/> <cpu id='8' socket_id='2' die_id='0' cluster_id='0' core_id='8' siblings='8'/>
<cpu id='9' socket_id='2' die_id='0' core_id='9' siblings='9'/> <cpu id='9' socket_id='2' die_id='0' cluster_id='0' core_id='9' siblings='9'/>
<cpu id='10' socket_id='2' die_id='0' core_id='10' siblings='10'/> <cpu id='10' socket_id='2' die_id='0' cluster_id='0' core_id='10' siblings='10'/>
<cpu id='11' socket_id='2' die_id='0' core_id='11' siblings='11'/> <cpu id='11' socket_id='2' die_id='0' cluster_id='0' core_id='11' siblings='11'/>
</cpus> </cpus>
</cell> </cell>
<cell id='3'> <cell id='3'>
@ -50,10 +50,10 @@
<pages unit='KiB' size='2048'>10240</pages> <pages unit='KiB' size='2048'>10240</pages>
<pages unit='KiB' size='1048576'>12288</pages> <pages unit='KiB' size='1048576'>12288</pages>
<cpus num='4'> <cpus num='4'>
<cpu id='12' socket_id='3' die_id='0' core_id='12' siblings='12'/> <cpu id='12' socket_id='3' die_id='0' cluster_id='0' core_id='12' siblings='12'/>
<cpu id='13' socket_id='3' die_id='0' core_id='13' siblings='13'/> <cpu id='13' socket_id='3' die_id='0' cluster_id='0' core_id='13' siblings='13'/>
<cpu id='14' socket_id='3' die_id='0' core_id='14' siblings='14'/> <cpu id='14' socket_id='3' die_id='0' cluster_id='0' core_id='14' siblings='14'/>
<cpu id='15' socket_id='3' die_id='0' core_id='15' siblings='15'/> <cpu id='15' socket_id='3' die_id='0' cluster_id='0' core_id='15' siblings='15'/>
</cpus> </cpus>
</cell> </cell>
</cells> </cells>

16
tests/vircaps2xmldata/vircaps-x86_64-caches.xml
View File

@ -17,14 +17,14 @@
<pages unit='KiB' size='2048'>4096</pages> <pages unit='KiB' size='2048'>4096</pages>
<pages unit='KiB' size='1048576'>6144</pages> <pages unit='KiB' size='1048576'>6144</pages>
<cpus num='8'> <cpus num='8'>
<cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0,4'/> <cpu id='0' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0,4'/>
<cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1,5'/> <cpu id='1' socket_id='0' die_id='0' cluster_id='0' core_id='1' siblings='1,5'/>
<cpu id='2' socket_id='0' die_id='0' core_id='2' siblings='2,6'/> <cpu id='2' socket_id='0' die_id='0' cluster_id='0' core_id='2' siblings='2,6'/>
<cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3,7'/> <cpu id='3' socket_id='0' die_id='0' cluster_id='0' core_id='3' siblings='3,7'/>
<cpu id='4' socket_id='0' die_id='0' core_id='0' siblings='0,4'/> <cpu id='4' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0,4'/>
<cpu id='5' socket_id='0' die_id='0' core_id='1' siblings='1,5'/> <cpu id='5' socket_id='0' die_id='0' cluster_id='0' core_id='1' siblings='1,5'/>
<cpu id='6' socket_id='0' die_id='0' core_id='2' siblings='2,6'/> <cpu id='6' socket_id='0' die_id='0' cluster_id='0' core_id='2' siblings='2,6'/>
<cpu id='7' socket_id='0' die_id='0' core_id='3' siblings='3,7'/> <cpu id='7' socket_id='0' die_id='0' cluster_id='0' core_id='3' siblings='3,7'/>
</cpus> </cpus>
</cell> </cell>
</cells> </cells>

48
tests/vircaps2xmldata/vircaps-x86_64-hmat.xml
View File

@ -25,30 +25,30 @@
<line value='16' unit='B'/> <line value='16' unit='B'/>
</cache> </cache>
<cpus num='24'> <cpus num='24'>
<cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/> <cpu id='0' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0'/>
<cpu id='1' socket_id='1' die_id='0' core_id='0' siblings='1'/> <cpu id='1' socket_id='1' die_id='0' cluster_id='0' core_id='0' siblings='1'/>
<cpu id='2' socket_id='2' die_id='0' core_id='0' siblings='2'/> <cpu id='2' socket_id='2' die_id='0' cluster_id='0' core_id='0' siblings='2'/>
<cpu id='3' socket_id='3' die_id='0' core_id='0' siblings='3'/> <cpu id='3' socket_id='3' die_id='0' cluster_id='0' core_id='0' siblings='3'/>
<cpu id='4' socket_id='4' die_id='0' core_id='0' siblings='4'/> <cpu id='4' socket_id='4' die_id='0' cluster_id='0' core_id='0' siblings='4'/>
<cpu id='5' socket_id='5' die_id='0' core_id='0' siblings='5'/> <cpu id='5' socket_id='5' die_id='0' cluster_id='0' core_id='0' siblings='5'/>
<cpu id='6' socket_id='6' die_id='0' core_id='0' siblings='6'/> <cpu id='6' socket_id='6' die_id='0' cluster_id='0' core_id='0' siblings='6'/>
<cpu id='7' socket_id='7' die_id='0' core_id='0' siblings='7'/> <cpu id='7' socket_id='7' die_id='0' cluster_id='0' core_id='0' siblings='7'/>
<cpu id='8' socket_id='8' die_id='0' core_id='0' siblings='8'/> <cpu id='8' socket_id='8' die_id='0' cluster_id='0' core_id='0' siblings='8'/>
<cpu id='9' socket_id='9' die_id='0' core_id='0' siblings='9'/> <cpu id='9' socket_id='9' die_id='0' cluster_id='0' core_id='0' siblings='9'/>
<cpu id='10' socket_id='10' die_id='0' core_id='0' siblings='10'/> <cpu id='10' socket_id='10' die_id='0' cluster_id='0' core_id='0' siblings='10'/>
<cpu id='11' socket_id='11' die_id='0' core_id='0' siblings='11'/> <cpu id='11' socket_id='11' die_id='0' cluster_id='0' core_id='0' siblings='11'/>
<cpu id='12' socket_id='12' die_id='0' core_id='0' siblings='12'/> <cpu id='12' socket_id='12' die_id='0' cluster_id='0' core_id='0' siblings='12'/>
<cpu id='13' socket_id='13' die_id='0' core_id='0' siblings='13'/> <cpu id='13' socket_id='13' die_id='0' cluster_id='0' core_id='0' siblings='13'/>
<cpu id='14' socket_id='14' die_id='0' core_id='0' siblings='14'/> <cpu id='14' socket_id='14' die_id='0' cluster_id='0' core_id='0' siblings='14'/>
<cpu id='15' socket_id='15' die_id='0' core_id='0' siblings='15'/> <cpu id='15' socket_id='15' die_id='0' cluster_id='0' core_id='0' siblings='15'/>
<cpu id='16' socket_id='16' die_id='0' core_id='0' siblings='16'/> <cpu id='16' socket_id='16' die_id='0' cluster_id='0' core_id='0' siblings='16'/>
<cpu id='17' socket_id='17' die_id='0' core_id='0' siblings='17'/> <cpu id='17' socket_id='17' die_id='0' cluster_id='0' core_id='0' siblings='17'/>
<cpu id='18' socket_id='18' die_id='0' core_id='0' siblings='18'/> <cpu id='18' socket_id='18' die_id='0' cluster_id='0' core_id='0' siblings='18'/>
<cpu id='19' socket_id='19' die_id='0' core_id='0' siblings='19'/> <cpu id='19' socket_id='19' die_id='0' cluster_id='0' core_id='0' siblings='19'/>
<cpu id='20' socket_id='20' die_id='0' core_id='0' siblings='20'/> <cpu id='20' socket_id='20' die_id='0' cluster_id='0' core_id='0' siblings='20'/>
<cpu id='21' socket_id='21' die_id='0' core_id='0' siblings='21'/> <cpu id='21' socket_id='21' die_id='0' cluster_id='0' core_id='0' siblings='21'/>
<cpu id='22' socket_id='22' die_id='0' core_id='0' siblings='22'/> <cpu id='22' socket_id='22' die_id='0' cluster_id='0' core_id='0' siblings='22'/>
<cpu id='23' socket_id='23' die_id='0' core_id='0' siblings='23'/> <cpu id='23' socket_id='23' die_id='0' cluster_id='0' core_id='0' siblings='23'/>
</cpus> </cpus>
</cell> </cell>
<cell id='1'> <cell id='1'>

24
tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml
View File

@ -17,12 +17,12 @@
<pages unit='KiB' size='2048'>4096</pages> <pages unit='KiB' size='2048'>4096</pages>
<pages unit='KiB' size='1048576'>6144</pages> <pages unit='KiB' size='1048576'>6144</pages>
<cpus num='6'> <cpus num='6'>
<cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/> <cpu id='0' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0'/>
<cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1'/> <cpu id='1' socket_id='0' die_id='0' cluster_id='0' core_id='1' siblings='1'/>
<cpu id='2' socket_id='0' die_id='0' core_id='2' siblings='2'/> <cpu id='2' socket_id='0' die_id='0' cluster_id='0' core_id='2' siblings='2'/>
<cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3'/> <cpu id='3' socket_id='0' die_id='0' cluster_id='0' core_id='3' siblings='3'/>
<cpu id='4' socket_id='0' die_id='0' core_id='4' siblings='4'/> <cpu id='4' socket_id='0' die_id='0' cluster_id='0' core_id='4' siblings='4'/>
<cpu id='5' socket_id='0' die_id='0' core_id='5' siblings='5'/> <cpu id='5' socket_id='0' die_id='0' cluster_id='0' core_id='5' siblings='5'/>
</cpus> </cpus>
</cell> </cell>
<cell id='1'> <cell id='1'>
@ -31,12 +31,12 @@
<pages unit='KiB' size='2048'>6144</pages> <pages unit='KiB' size='2048'>6144</pages>
<pages unit='KiB' size='1048576'>8192</pages> <pages unit='KiB' size='1048576'>8192</pages>
<cpus num='6'> <cpus num='6'>
<cpu id='6' socket_id='1' die_id='0' core_id='0' siblings='6'/> <cpu id='6' socket_id='1' die_id='0' cluster_id='0' core_id='0' siblings='6'/>
<cpu id='7' socket_id='1' die_id='0' core_id='1' siblings='7'/> <cpu id='7' socket_id='1' die_id='0' cluster_id='0' core_id='1' siblings='7'/>
<cpu id='8' socket_id='1' die_id='0' core_id='2' siblings='8'/> <cpu id='8' socket_id='1' die_id='0' cluster_id='0' core_id='2' siblings='8'/>
<cpu id='9' socket_id='1' die_id='0' core_id='3' siblings='9'/> <cpu id='9' socket_id='1' die_id='0' cluster_id='0' core_id='3' siblings='9'/>
<cpu id='10' socket_id='1' die_id='0' core_id='4' siblings='10'/> <cpu id='10' socket_id='1' die_id='0' cluster_id='0' core_id='4' siblings='10'/>
<cpu id='11' socket_id='1' die_id='0' core_id='5' siblings='11'/> <cpu id='11' socket_id='1' die_id='0' cluster_id='0' core_id='5' siblings='11'/>
</cpus> </cpus>
</cell> </cell>
</cells> </cells>

24
tests/vircaps2xmldata/vircaps-x86_64-resctrl-cmt.xml
View File

@ -17,12 +17,12 @@
<pages unit='KiB' size='2048'>4096</pages> <pages unit='KiB' size='2048'>4096</pages>
<pages unit='KiB' size='1048576'>6144</pages> <pages unit='KiB' size='1048576'>6144</pages>
<cpus num='6'> <cpus num='6'>
<cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/> <cpu id='0' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0'/>
<cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1'/> <cpu id='1' socket_id='0' die_id='0' cluster_id='0' core_id='1' siblings='1'/>
<cpu id='2' socket_id='0' die_id='0' core_id='2' siblings='2'/> <cpu id='2' socket_id='0' die_id='0' cluster_id='0' core_id='2' siblings='2'/>
<cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3'/> <cpu id='3' socket_id='0' die_id='0' cluster_id='0' core_id='3' siblings='3'/>
<cpu id='4' socket_id='0' die_id='0' core_id='4' siblings='4'/> <cpu id='4' socket_id='0' die_id='0' cluster_id='0' core_id='4' siblings='4'/>
<cpu id='5' socket_id='0' die_id='0' core_id='5' siblings='5'/> <cpu id='5' socket_id='0' die_id='0' cluster_id='0' core_id='5' siblings='5'/>
</cpus> </cpus>
</cell> </cell>
<cell id='1'> <cell id='1'>
@ -31,12 +31,12 @@
<pages unit='KiB' size='2048'>6144</pages> <pages unit='KiB' size='2048'>6144</pages>
<pages unit='KiB' size='1048576'>8192</pages> <pages unit='KiB' size='1048576'>8192</pages>
<cpus num='6'> <cpus num='6'>
<cpu id='6' socket_id='1' die_id='0' core_id='0' siblings='6'/> <cpu id='6' socket_id='1' die_id='0' cluster_id='0' core_id='0' siblings='6'/>
<cpu id='7' socket_id='1' die_id='0' core_id='1' siblings='7'/> <cpu id='7' socket_id='1' die_id='0' cluster_id='0' core_id='1' siblings='7'/>
<cpu id='8' socket_id='1' die_id='0' core_id='2' siblings='8'/> <cpu id='8' socket_id='1' die_id='0' cluster_id='0' core_id='2' siblings='8'/>
<cpu id='9' socket_id='1' die_id='0' core_id='3' siblings='9'/> <cpu id='9' socket_id='1' die_id='0' cluster_id='0' core_id='3' siblings='9'/>
<cpu id='10' socket_id='1' die_id='0' core_id='4' siblings='10'/> <cpu id='10' socket_id='1' die_id='0' cluster_id='0' core_id='4' siblings='10'/>
<cpu id='11' socket_id='1' die_id='0' core_id='5' siblings='11'/> <cpu id='11' socket_id='1' die_id='0' cluster_id='0' core_id='5' siblings='11'/>
</cpus> </cpus>
</cell> </cell>
</cells> </cells>

24
tests/vircaps2xmldata/vircaps-x86_64-resctrl-fake-feature.xml
View File

@ -17,12 +17,12 @@
<pages unit='KiB' size='2048'>4096</pages> <pages unit='KiB' size='2048'>4096</pages>
<pages unit='KiB' size='1048576'>6144</pages> <pages unit='KiB' size='1048576'>6144</pages>
<cpus num='6'> <cpus num='6'>
<cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/> <cpu id='0' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0'/>
<cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1'/> <cpu id='1' socket_id='0' die_id='0' cluster_id='0' core_id='1' siblings='1'/>
<cpu id='2' socket_id='0' die_id='0' core_id='2' siblings='2'/> <cpu id='2' socket_id='0' die_id='0' cluster_id='0' core_id='2' siblings='2'/>
<cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3'/> <cpu id='3' socket_id='0' die_id='0' cluster_id='0' core_id='3' siblings='3'/>
<cpu id='4' socket_id='0' die_id='0' core_id='4' siblings='4'/> <cpu id='4' socket_id='0' die_id='0' cluster_id='0' core_id='4' siblings='4'/>
<cpu id='5' socket_id='0' die_id='0' core_id='5' siblings='5'/> <cpu id='5' socket_id='0' die_id='0' cluster_id='0' core_id='5' siblings='5'/>
</cpus> </cpus>
</cell> </cell>
<cell id='1'> <cell id='1'>
@ -31,12 +31,12 @@
<pages unit='KiB' size='2048'>6144</pages> <pages unit='KiB' size='2048'>6144</pages>
<pages unit='KiB' size='1048576'>8192</pages> <pages unit='KiB' size='1048576'>8192</pages>
<cpus num='6'> <cpus num='6'>
<cpu id='6' socket_id='1' die_id='0' core_id='0' siblings='6'/> <cpu id='6' socket_id='1' die_id='0' cluster_id='0' core_id='0' siblings='6'/>
<cpu id='7' socket_id='1' die_id='0' core_id='1' siblings='7'/> <cpu id='7' socket_id='1' die_id='0' cluster_id='0' core_id='1' siblings='7'/>
<cpu id='8' socket_id='1' die_id='0' core_id='2' siblings='8'/> <cpu id='8' socket_id='1' die_id='0' cluster_id='0' core_id='2' siblings='8'/>
<cpu id='9' socket_id='1' die_id='0' core_id='3' siblings='9'/> <cpu id='9' socket_id='1' die_id='0' cluster_id='0' core_id='3' siblings='9'/>
<cpu id='10' socket_id='1' die_id='0' core_id='4' siblings='10'/> <cpu id='10' socket_id='1' die_id='0' cluster_id='0' core_id='4' siblings='10'/>
<cpu id='11' socket_id='1' die_id='0' core_id='5' siblings='11'/> <cpu id='11' socket_id='1' die_id='0' cluster_id='0' core_id='5' siblings='11'/>
</cpus> </cpus>
</cell> </cell>
</cells> </cells>

2
tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx-twocaches.xml
View File

@ -17,7 +17,7 @@
<pages unit='KiB' size='2048'>4096</pages> <pages unit='KiB' size='2048'>4096</pages>
<pages unit='KiB' size='1048576'>6144</pages> <pages unit='KiB' size='1048576'>6144</pages>
<cpus num='1'> <cpus num='1'>
<cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/> <cpu id='0' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0'/>
</cpus> </cpus>
</cell> </cell>
</cells> </cells>

2
tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx.xml
View File

@ -17,7 +17,7 @@
<pages unit='KiB' size='2048'>4096</pages> <pages unit='KiB' size='2048'>4096</pages>
<pages unit='KiB' size='1048576'>6144</pages> <pages unit='KiB' size='1048576'>6144</pages>
<cpus num='1'> <cpus num='1'>
<cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/> <cpu id='0' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0'/>
</cpus> </cpus>
</cell> </cell>
</cells> </cells>

24
tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml
View File

@ -17,12 +17,12 @@
<pages unit='KiB' size='2048'>4096</pages> <pages unit='KiB' size='2048'>4096</pages>
<pages unit='KiB' size='1048576'>6144</pages> <pages unit='KiB' size='1048576'>6144</pages>
<cpus num='6'> <cpus num='6'>
<cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/> <cpu id='0' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0'/>
<cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1'/> <cpu id='1' socket_id='0' die_id='0' cluster_id='0' core_id='1' siblings='1'/>
<cpu id='2' socket_id='0' die_id='0' core_id='2' siblings='2'/> <cpu id='2' socket_id='0' die_id='0' cluster_id='0' core_id='2' siblings='2'/>
<cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3'/> <cpu id='3' socket_id='0' die_id='0' cluster_id='0' core_id='3' siblings='3'/>
<cpu id='4' socket_id='0' die_id='0' core_id='4' siblings='4'/> <cpu id='4' socket_id='0' die_id='0' cluster_id='0' core_id='4' siblings='4'/>
<cpu id='5' socket_id='0' die_id='0' core_id='5' siblings='5'/> <cpu id='5' socket_id='0' die_id='0' cluster_id='0' core_id='5' siblings='5'/>
</cpus> </cpus>
</cell> </cell>
<cell id='1'> <cell id='1'>
@ -31,12 +31,12 @@
<pages unit='KiB' size='2048'>6144</pages> <pages unit='KiB' size='2048'>6144</pages>
<pages unit='KiB' size='1048576'>8192</pages> <pages unit='KiB' size='1048576'>8192</pages>
<cpus num='6'> <cpus num='6'>
<cpu id='6' socket_id='1' die_id='0' core_id='0' siblings='6'/> <cpu id='6' socket_id='1' die_id='0' cluster_id='0' core_id='0' siblings='6'/>
<cpu id='7' socket_id='1' die_id='0' core_id='1' siblings='7'/> <cpu id='7' socket_id='1' die_id='0' cluster_id='0' core_id='1' siblings='7'/>
<cpu id='8' socket_id='1' die_id='0' core_id='2' siblings='8'/> <cpu id='8' socket_id='1' die_id='0' cluster_id='0' core_id='2' siblings='8'/>
<cpu id='9' socket_id='1' die_id='0' core_id='3' siblings='9'/> <cpu id='9' socket_id='1' die_id='0' cluster_id='0' core_id='3' siblings='9'/>
<cpu id='10' socket_id='1' die_id='0' core_id='4' siblings='10'/> <cpu id='10' socket_id='1' die_id='0' cluster_id='0' core_id='4' siblings='10'/>
<cpu id='11' socket_id='1' die_id='0' core_id='5' siblings='11'/> <cpu id='11' socket_id='1' die_id='0' cluster_id='0' core_id='5' siblings='11'/>
</cpus> </cpus>
</cell> </cell>
</cells> </cells>