hostcpu: add support for reporting die_id in NUMA topology

Update the host CPU code to report the die_id in the NUMA topology
capabilities. On systems with multiple dies, this fixes the bug
where CPU cores can't be distinguished:

 <cpus num='12'>
   <cpu id='0' socket_id='0' core_id='0' siblings='0'/>
   <cpu id='1' socket_id='0' core_id='1' siblings='1'/>
   <cpu id='2' socket_id='0' core_id='0' siblings='2'/>
   <cpu id='3' socket_id='0' core_id='1' siblings='3'/>
 </cpus>

Notice how core_id is repeated within the scope of the same socket_id.

It now reports

 <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'/>
 </cpus>

So core_id is now unique within a (socket_id, die_id) pair.

Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng
index 91ee5231169de244ffedd59a21edccae3d5e1a66..031c55bf20415d298c11561df85bfea83560cb37 100644 (file)
--- a/docs/schemas/capability.rng
+++ b/docs/schemas/capability.rng
@@ -265,6 +265,9 @@
         <attribute name='socket_id'>
           <ref name='unsignedInt'/>
         </attribute>
+        <attribute name='die_id'>
+          <ref name='unsignedInt'/>
+        </attribute>
         <attribute name='core_id'>
           <ref name='unsignedInt'/>
         </attribute>

diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index bf1d9936ed7d237ffde9ea51a3d56b08947569a4..4bbc79334ec05d70d12b1e4ba370d21f918e29e5 100644 (file)
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -874,8 +874,9 @@ virCapabilitiesHostNUMAFormat(virCapsHostNUMAPtr caps,
                     return -1;
 
                 virBufferAsprintf(buf,
-                                  " socket_id='%d' core_id='%d' siblings='%s'",
+                                  " socket_id='%d' die_id='%d' core_id='%d' siblings='%s'",
                                   cell->cpus[j].socket_id,
+                                  cell->cpus[j].die_id,
                                   cell->cpus[j].core_id,
                                   siblings);
                 VIR_FREE(siblings);
@@ -1463,6 +1464,7 @@ virCapabilitiesFillCPUInfo(int cpu_id G_GNUC_UNUSED,
     cpu->id = cpu_id;
 
     if (virHostCPUGetSocket(cpu_id, &cpu->socket_id) < 0 ||
+        virHostCPUGetDie(cpu_id, &cpu->die_id) < 0 ||
         virHostCPUGetCore(cpu_id, &cpu->core_id) < 0)
         return -1;
 
@@ -1591,6 +1593,7 @@ virCapabilitiesHostNUMAInitFake(virCapsHostNUMAPtr caps)
                         goto error;
                     if (tmp) {
                         cpus[cid].id = id;
+                        cpus[cid].die_id = 0;
                         cpus[cid].socket_id = s;
                         cpus[cid].core_id = c;
                         if (!(cpus[cid].siblings = virBitmapNew(ncpus)))

diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h
index 4a49e94aa54855e2c258f153aae3292d5747efe0..75f29666c9109a88ac0ac6d5ff1aad2b6d43a66e 100644 (file)
--- a/src/conf/capabilities.h
+++ b/src/conf/capabilities.h
@@ -88,6 +88,7 @@ struct _virCapsGuest {
 struct _virCapsHostNUMACellCPU {
     unsigned int id;
     unsigned int socket_id;
+    unsigned int die_id;
     unsigned int core_id;
     virBitmapPtr siblings;
 };

diff --git a/src/libvirt_linux.syms b/src/libvirt_linux.syms
index 5fa2c790efc1e8419a96b92c3c32e0882b21d14d..55649ae39cecbc407b428ce8afd049deadbb6e2c 100644 (file)
--- a/src/libvirt_linux.syms
+++ b/src/libvirt_linux.syms
@@ -4,6 +4,7 @@
 
 # util/virhostcpu.h
 virHostCPUGetCore;
+virHostCPUGetDie;
 virHostCPUGetInfoPopulateLinux;
 virHostCPUGetSiblingsList;
 virHostCPUGetSocket;

diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
index 7f14340f49cca79b2d419b70b9e69428157bef58..0ed2c9e9b4b5ee22da1f9db68d4c26769ccd3c05 100644 (file)
--- a/src/util/virhostcpu.c
+++ b/src/util/virhostcpu.c
@@ -218,6 +218,22 @@ virHostCPUGetSocket(unsigned int cpu, unsigned int *socket)
     return 0;
 }
 
+int
+virHostCPUGetDie(unsigned int cpu, unsigned int *die)
+{
+    int ret = virFileReadValueUint(die,
+                                   "%s/cpu/cpu%u/topology/die_id",
+                                   SYSFS_SYSTEM_PATH, cpu);
+
+    /* If the file is not there, it's 0 */
+    if (ret == -2)
+        *die = 0;
+    else if (ret < 0)
+        return -1;
+
+    return 0;
+}
+
 int
 virHostCPUGetCore(unsigned int cpu, unsigned int *core)
 {

diff --git a/src/util/virhostcpu.h b/src/util/virhostcpu.h
index d95d380d4a2baf296d7ee68ee8ca4e7779c8a3ea..9be2e51a38715889313ded311cced66197b26433 100644 (file)
--- a/src/util/virhostcpu.h
+++ b/src/util/virhostcpu.h
@@ -65,6 +65,7 @@ int virHostCPUStatsAssign(virNodeCPUStatsPtr param,
 
 #ifdef __linux__
 int virHostCPUGetSocket(unsigned int cpu, unsigned int *socket);
+int virHostCPUGetDie(unsigned int cpu, unsigned int *die);
 int virHostCPUGetCore(unsigned int cpu, unsigned int *core);
 
 virBitmapPtr virHostCPUGetSiblingsList(unsigned int cpu);

diff --git a/tests/vircaps2xmldata/vircaps-aarch64-basic.xml b/tests/vircaps2xmldata/vircaps-aarch64-basic.xml
index 50466f9162aefd6926796f8f7912759999a01feb..0a04052c4094c0d7b882578caceb44d4ea663fba 100644 (file)
--- a/tests/vircaps2xmldata/vircaps-aarch64-basic.xml
+++ b/tests/vircaps2xmldata/vircaps-aarch64-basic.xml
@@ -16,10 +16,10 @@
           <pages unit='KiB' size='2048'>4096</pages>
           <pages unit='KiB' size='1048576'>6144</pages>
           <cpus num='4'>
-            <cpu id='0' socket_id='0' core_id='0' siblings='0'/>
-            <cpu id='1' socket_id='0' core_id='1' siblings='1'/>
-            <cpu id='2' socket_id='0' core_id='2' siblings='2'/>
-            <cpu id='3' socket_id='0' core_id='3' siblings='3'/>
+            <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='0' core_id='2' siblings='2'/>
+            <cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3'/>
           </cpus>
         </cell>
         <cell id='1'>
@@ -28,10 +28,10 @@
           <pages unit='KiB' size='2048'>6144</pages>
           <pages unit='KiB' size='1048576'>8192</pages>
           <cpus num='4'>
-            <cpu id='4' socket_id='1' core_id='4' siblings='4'/>
-            <cpu id='5' socket_id='1' core_id='5' siblings='5'/>
-            <cpu id='6' socket_id='1' core_id='6' siblings='6'/>
-            <cpu id='7' socket_id='1' core_id='7' siblings='7'/>
+            <cpu id='4' socket_id='1' die_id='0' core_id='4' siblings='4'/>
+            <cpu id='5' socket_id='1' die_id='0' core_id='5' siblings='5'/>
+            <cpu id='6' socket_id='1' die_id='0' core_id='6' siblings='6'/>
+            <cpu id='7' socket_id='1' die_id='0' core_id='7' siblings='7'/>
           </cpus>
         </cell>
         <cell id='2'>
@@ -40,10 +40,10 @@
           <pages unit='KiB' size='2048'>8192</pages>
           <pages unit='KiB' size='1048576'>10240</pages>
           <cpus num='4'>
-            <cpu id='8' socket_id='2' core_id='8' siblings='8'/>
-            <cpu id='9' socket_id='2' core_id='9' siblings='9'/>
-            <cpu id='10' socket_id='2' core_id='10' siblings='10'/>
-            <cpu id='11' socket_id='2' core_id='11' siblings='11'/>
+            <cpu id='8' socket_id='2' die_id='0' core_id='8' siblings='8'/>
+            <cpu id='9' socket_id='2' die_id='0' core_id='9' siblings='9'/>
+            <cpu id='10' socket_id='2' die_id='0' core_id='10' siblings='10'/>
+            <cpu id='11' socket_id='2' die_id='0' core_id='11' siblings='11'/>
           </cpus>
         </cell>
         <cell id='3'>
@@ -52,10 +52,10 @@
           <pages unit='KiB' size='2048'>10240</pages>
           <pages unit='KiB' size='1048576'>12288</pages>
           <cpus num='4'>
-            <cpu id='12' socket_id='3' core_id='12' siblings='12'/>
-            <cpu id='13' socket_id='3' core_id='13' siblings='13'/>
-            <cpu id='14' socket_id='3' core_id='14' siblings='14'/>
-            <cpu id='15' socket_id='3' core_id='15' siblings='15'/>
+            <cpu id='12' socket_id='3' die_id='0' core_id='12' siblings='12'/>
+            <cpu id='13' socket_id='3' die_id='0' core_id='13' siblings='13'/>
+            <cpu id='14' socket_id='3' die_id='0' core_id='14' siblings='14'/>
+            <cpu id='15' socket_id='3' die_id='0' core_id='15' siblings='15'/>
           </cpus>
         </cell>
       </cells>

diff --git a/tests/vircaps2xmldata/vircaps-x86_64-basic.xml b/tests/vircaps2xmldata/vircaps-x86_64-basic.xml
index e7be6def3ebbea14162de1643c9afe166013bbba..4da09f889c10fbf7b424254764921fdeffdddbba 100644 (file)
--- a/tests/vircaps2xmldata/vircaps-x86_64-basic.xml
+++ b/tests/vircaps2xmldata/vircaps-x86_64-basic.xml
@@ -14,10 +14,10 @@
           <pages unit='KiB' size='2048'>4096</pages>
           <pages unit='KiB' size='1048576'>6144</pages>
           <cpus num='4'>
-            <cpu id='0' socket_id='0' core_id='0' siblings='0'/>
-            <cpu id='1' socket_id='0' core_id='1' siblings='1'/>
-            <cpu id='2' socket_id='0' core_id='2' siblings='2'/>
-            <cpu id='3' socket_id='0' core_id='3' siblings='3'/>
+            <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='0' core_id='2' siblings='2'/>
+            <cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3'/>
           </cpus>
         </cell>
         <cell id='1'>
@@ -26,10 +26,10 @@
           <pages unit='KiB' size='2048'>6144</pages>
           <pages unit='KiB' size='1048576'>8192</pages>
           <cpus num='4'>
-            <cpu id='4' socket_id='1' core_id='4' siblings='4'/>
-            <cpu id='5' socket_id='1' core_id='5' siblings='5'/>
-            <cpu id='6' socket_id='1' core_id='6' siblings='6'/>
-            <cpu id='7' socket_id='1' core_id='7' siblings='7'/>
+            <cpu id='4' socket_id='1' die_id='0' core_id='4' siblings='4'/>
+            <cpu id='5' socket_id='1' die_id='0' core_id='5' siblings='5'/>
+            <cpu id='6' socket_id='1' die_id='0' core_id='6' siblings='6'/>
+            <cpu id='7' socket_id='1' die_id='0' core_id='7' siblings='7'/>
           </cpus>
         </cell>
         <cell id='2'>
@@ -38,10 +38,10 @@
           <pages unit='KiB' size='2048'>8192</pages>
           <pages unit='KiB' size='1048576'>10240</pages>
           <cpus num='4'>
-            <cpu id='8' socket_id='2' core_id='8' siblings='8'/>
-            <cpu id='9' socket_id='2' core_id='9' siblings='9'/>
-            <cpu id='10' socket_id='2' core_id='10' siblings='10'/>
-            <cpu id='11' socket_id='2' core_id='11' siblings='11'/>
+            <cpu id='8' socket_id='2' die_id='0' core_id='8' siblings='8'/>
+            <cpu id='9' socket_id='2' die_id='0' core_id='9' siblings='9'/>
+            <cpu id='10' socket_id='2' die_id='0' core_id='10' siblings='10'/>
+            <cpu id='11' socket_id='2' die_id='0' core_id='11' siblings='11'/>
           </cpus>
         </cell>
         <cell id='3'>
@@ -50,10 +50,10 @@
           <pages unit='KiB' size='2048'>10240</pages>
           <pages unit='KiB' size='1048576'>12288</pages>
           <cpus num='4'>
-            <cpu id='12' socket_id='3' core_id='12' siblings='12'/>
-            <cpu id='13' socket_id='3' core_id='13' siblings='13'/>
-            <cpu id='14' socket_id='3' core_id='14' siblings='14'/>
-            <cpu id='15' socket_id='3' core_id='15' siblings='15'/>
+            <cpu id='12' socket_id='3' die_id='0' core_id='12' siblings='12'/>
+            <cpu id='13' socket_id='3' die_id='0' core_id='13' siblings='13'/>
+            <cpu id='14' socket_id='3' die_id='0' core_id='14' siblings='14'/>
+            <cpu id='15' socket_id='3' die_id='0' core_id='15' siblings='15'/>
           </cpus>
         </cell>
       </cells>

diff --git a/tests/vircaps2xmldata/vircaps-x86_64-caches.xml b/tests/vircaps2xmldata/vircaps-x86_64-caches.xml
index ca671a1640b1b913d2fe811065ffd00ffd09d107..28f00c0a90fff4ec8df9bfd97906645a1ed25ecd 100644 (file)
--- a/tests/vircaps2xmldata/vircaps-x86_64-caches.xml
+++ b/tests/vircaps2xmldata/vircaps-x86_64-caches.xml
@@ -17,14 +17,14 @@
           <pages unit='KiB' size='2048'>4096</pages>
           <pages unit='KiB' size='1048576'>6144</pages>
           <cpus num='8'>
-            <cpu id='0' socket_id='0' core_id='0' siblings='0,4'/>
-            <cpu id='1' socket_id='0' core_id='1' siblings='1,5'/>
-            <cpu id='2' socket_id='0' core_id='2' siblings='2,6'/>
-            <cpu id='3' socket_id='0' core_id='3' siblings='3,7'/>
-            <cpu id='4' socket_id='0' core_id='0' siblings='0,4'/>
-            <cpu id='5' socket_id='0' core_id='1' siblings='1,5'/>
-            <cpu id='6' socket_id='0' core_id='2' siblings='2,6'/>
-            <cpu id='7' socket_id='0' core_id='3' siblings='3,7'/>
+            <cpu id='0' socket_id='0' die_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='2' socket_id='0' die_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='4' socket_id='0' die_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='6' socket_id='0' die_id='0' core_id='2' siblings='2,6'/>
+            <cpu id='7' socket_id='0' die_id='0' core_id='3' siblings='3,7'/>
           </cpus>
         </cell>
       </cells>

diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml
index 1d3df318c5b3a3d4212180b6de58d18b3633ec4e..ee26fe94649c92658628a0413f6e5bd625364290 100644 (file)
--- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml
+++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml
@@ -17,12 +17,12 @@
           <pages unit='KiB' size='2048'>4096</pages>
           <pages unit='KiB' size='1048576'>6144</pages>
           <cpus num='6'>
-            <cpu id='0' socket_id='0' core_id='0' siblings='0'/>
-            <cpu id='1' socket_id='0' core_id='1' siblings='1'/>
-            <cpu id='2' socket_id='0' core_id='2' siblings='2'/>
-            <cpu id='3' socket_id='0' core_id='3' siblings='3'/>
-            <cpu id='4' socket_id='0' core_id='4' siblings='4'/>
-            <cpu id='5' socket_id='0' core_id='5' siblings='5'/>
+            <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='0' core_id='2' siblings='2'/>
+            <cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3'/>
+            <cpu id='4' socket_id='0' die_id='0' core_id='4' siblings='4'/>
+            <cpu id='5' socket_id='0' die_id='0' core_id='5' siblings='5'/>
           </cpus>
         </cell>
         <cell id='1'>
@@ -31,12 +31,12 @@
           <pages unit='KiB' size='2048'>6144</pages>
           <pages unit='KiB' size='1048576'>8192</pages>
           <cpus num='6'>
-            <cpu id='6' socket_id='1' core_id='0' siblings='6'/>
-            <cpu id='7' socket_id='1' core_id='1' siblings='7'/>
-            <cpu id='8' socket_id='1' core_id='2' siblings='8'/>
-            <cpu id='9' socket_id='1' core_id='3' siblings='9'/>
-            <cpu id='10' socket_id='1' core_id='4' siblings='10'/>
-            <cpu id='11' socket_id='1' core_id='5' siblings='11'/>
+            <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='0' core_id='2' siblings='8'/>
+            <cpu id='9' socket_id='1' die_id='0' core_id='3' siblings='9'/>
+            <cpu id='10' socket_id='1' die_id='0' core_id='4' siblings='10'/>
+            <cpu id='11' socket_id='1' die_id='0' core_id='5' siblings='11'/>
           </cpus>
         </cell>
       </cells>

diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cmt.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cmt.xml
index 6a8cd0e9094dcab30567f574e5586156010417c2..acdd97ec5802ac2570c51609f038ad7ebd78f888 100644 (file)
--- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cmt.xml
+++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cmt.xml
@@ -17,12 +17,12 @@
           <pages unit='KiB' size='2048'>4096</pages>
           <pages unit='KiB' size='1048576'>6144</pages>
           <cpus num='6'>
-            <cpu id='0' socket_id='0' core_id='0' siblings='0'/>
-            <cpu id='1' socket_id='0' core_id='1' siblings='1'/>
-            <cpu id='2' socket_id='0' core_id='2' siblings='2'/>
-            <cpu id='3' socket_id='0' core_id='3' siblings='3'/>
-            <cpu id='4' socket_id='0' core_id='4' siblings='4'/>
-            <cpu id='5' socket_id='0' core_id='5' siblings='5'/>
+            <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='0' core_id='2' siblings='2'/>
+            <cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3'/>
+            <cpu id='4' socket_id='0' die_id='0' core_id='4' siblings='4'/>
+            <cpu id='5' socket_id='0' die_id='0' core_id='5' siblings='5'/>
           </cpus>
         </cell>
         <cell id='1'>
@@ -31,12 +31,12 @@
           <pages unit='KiB' size='2048'>6144</pages>
           <pages unit='KiB' size='1048576'>8192</pages>
           <cpus num='6'>
-            <cpu id='6' socket_id='1' core_id='0' siblings='6'/>
-            <cpu id='7' socket_id='1' core_id='1' siblings='7'/>
-            <cpu id='8' socket_id='1' core_id='2' siblings='8'/>
-            <cpu id='9' socket_id='1' core_id='3' siblings='9'/>
-            <cpu id='10' socket_id='1' core_id='4' siblings='10'/>
-            <cpu id='11' socket_id='1' core_id='5' siblings='11'/>
+            <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='0' core_id='2' siblings='8'/>
+            <cpu id='9' socket_id='1' die_id='0' core_id='3' siblings='9'/>
+            <cpu id='10' socket_id='1' die_id='0' core_id='4' siblings='10'/>
+            <cpu id='11' socket_id='1' die_id='0' core_id='5' siblings='11'/>
           </cpus>
         </cell>
       </cells>

diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-fake-feature.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-fake-feature.xml
index 4e46ead6166dec3b2ceaf923b307544178626402..5f3678e0726b9a007564b96fd2b550261d05409f 100644 (file)
--- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-fake-feature.xml
+++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-fake-feature.xml
@@ -17,12 +17,12 @@
           <pages unit='KiB' size='2048'>4096</pages>
           <pages unit='KiB' size='1048576'>6144</pages>
           <cpus num='6'>
-            <cpu id='0' socket_id='0' core_id='0' siblings='0'/>
-            <cpu id='1' socket_id='0' core_id='1' siblings='1'/>
-            <cpu id='2' socket_id='0' core_id='2' siblings='2'/>
-            <cpu id='3' socket_id='0' core_id='3' siblings='3'/>
-            <cpu id='4' socket_id='0' core_id='4' siblings='4'/>
-            <cpu id='5' socket_id='0' core_id='5' siblings='5'/>
+            <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='0' core_id='2' siblings='2'/>
+            <cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3'/>
+            <cpu id='4' socket_id='0' die_id='0' core_id='4' siblings='4'/>
+            <cpu id='5' socket_id='0' die_id='0' core_id='5' siblings='5'/>
           </cpus>
         </cell>
         <cell id='1'>
@@ -31,12 +31,12 @@
           <pages unit='KiB' size='2048'>6144</pages>
           <pages unit='KiB' size='1048576'>8192</pages>
           <cpus num='6'>
-            <cpu id='6' socket_id='1' core_id='0' siblings='6'/>
-            <cpu id='7' socket_id='1' core_id='1' siblings='7'/>
-            <cpu id='8' socket_id='1' core_id='2' siblings='8'/>
-            <cpu id='9' socket_id='1' core_id='3' siblings='9'/>
-            <cpu id='10' socket_id='1' core_id='4' siblings='10'/>
-            <cpu id='11' socket_id='1' core_id='5' siblings='11'/>
+            <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='0' core_id='2' siblings='8'/>
+            <cpu id='9' socket_id='1' die_id='0' core_id='3' siblings='9'/>
+            <cpu id='10' socket_id='1' die_id='0' core_id='4' siblings='10'/>
+            <cpu id='11' socket_id='1' die_id='0' core_id='5' siblings='11'/>
           </cpus>
         </cell>
       </cells>

diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx-twocaches.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx-twocaches.xml
index 44c1042afe3a31a750886a60fead88692a4302fb..6769bd0591a216aa5ce756419a53090a848a280b 100644 (file)
--- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx-twocaches.xml
+++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx-twocaches.xml
@@ -17,7 +17,7 @@
           <pages unit='KiB' size='2048'>4096</pages>
           <pages unit='KiB' size='1048576'>6144</pages>
           <cpus num='1'>
-            <cpu id='0' socket_id='0' core_id='0' siblings='0'/>
+            <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/>
           </cpus>
         </cell>
       </cells>

diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx.xml
index 8382a26c7a4c4e2be5a298f71e60ccc617407200..bc524809056915144c1da5d1b9c499d27b5ac567 100644 (file)
--- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx.xml
+++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx.xml
@@ -17,7 +17,7 @@
           <pages unit='KiB' size='2048'>4096</pages>
           <pages unit='KiB' size='1048576'>6144</pages>
           <cpus num='1'>
-            <cpu id='0' socket_id='0' core_id='0' siblings='0'/>
+            <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/>
           </cpus>
         </cell>
       </cells>

diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml
index a27b3e247e35c18a99122ec3664c036de1a8b588..c386edd4b0ca17f65201b4216dc92dea47b45138 100644 (file)
--- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml
+++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml
@@ -17,12 +17,12 @@
           <pages unit='KiB' size='2048'>4096</pages>
           <pages unit='KiB' size='1048576'>6144</pages>
           <cpus num='6'>
-            <cpu id='0' socket_id='0' core_id='0' siblings='0'/>
-            <cpu id='1' socket_id='0' core_id='1' siblings='1'/>
-            <cpu id='2' socket_id='0' core_id='2' siblings='2'/>
-            <cpu id='3' socket_id='0' core_id='3' siblings='3'/>
-            <cpu id='4' socket_id='0' core_id='4' siblings='4'/>
-            <cpu id='5' socket_id='0' core_id='5' siblings='5'/>
+            <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='0' core_id='2' siblings='2'/>
+            <cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3'/>
+            <cpu id='4' socket_id='0' die_id='0' core_id='4' siblings='4'/>
+            <cpu id='5' socket_id='0' die_id='0' core_id='5' siblings='5'/>
           </cpus>
         </cell>
         <cell id='1'>
@@ -31,12 +31,12 @@
           <pages unit='KiB' size='2048'>6144</pages>
           <pages unit='KiB' size='1048576'>8192</pages>
           <cpus num='6'>
-            <cpu id='6' socket_id='1' core_id='0' siblings='6'/>
-            <cpu id='7' socket_id='1' core_id='1' siblings='7'/>
-            <cpu id='8' socket_id='1' core_id='2' siblings='8'/>
-            <cpu id='9' socket_id='1' core_id='3' siblings='9'/>
-            <cpu id='10' socket_id='1' core_id='4' siblings='10'/>
-            <cpu id='11' socket_id='1' core_id='5' siblings='11'/>
+            <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='0' core_id='2' siblings='8'/>
+            <cpu id='9' socket_id='1' die_id='0' core_id='3' siblings='9'/>
+            <cpu id='10' socket_id='1' die_id='0' core_id='4' siblings='10'/>
+            <cpu id='11' socket_id='1' die_id='0' core_id='5' siblings='11'/>
           </cpus>
         </cell>
       </cells>