linux: make sure uname, Backend and other global info attrs are added once

bgoglin · bgoglin · commit 2fc7c2397fc2 · 2023-07-19T16:19:26.000+02:00
Once and only once when some discovery phases may be disabled.

Signed-off-by: Brice Goglin &lt;Brice.Goglin@inria.fr&gt;
diff --git a/hwloc/topology-linux.c b/hwloc/topology-linux.c
@@ -63,6 +63,7 @@ struct hwloc_linux_backend_data_s {
   struct utsname utsname; /* fields contain \0 when unknown */
   int fallback_nbprocessors; /* only used in hwloc_linux_fallback_pu_level(), maybe be <= 0 (error) earlier */
   unsigned pagesize;
+  int need_global_infos;
 };
 
 
@@ -5768,16 +5769,6 @@ hwloc_linuxfs_look_cpu(struct hwloc_backend *backend, struct hwloc_disc_status *
 
   hwloc_alloc_root_sets(topology->levels[0][0]);
 
-  /*********************************
-   * Platform information for later
-   */
-  hwloc_gather_system_info(topology, data);
-
-  /**********************************
-   * Detect things in /proc/cmdline
-   */
-  hwloc_linuxfs_check_kernel_cmdline(data);
-
   /**********************
    * /proc/cpuinfo
    */
@@ -5862,22 +5853,11 @@ hwloc_linuxfs_look_cpu(struct hwloc_backend *backend, struct hwloc_disc_status *
   } else
     nbnodes = 0;
 
-  /**********************
-   * Misc
-   */
-
-  /* Gather DMI info */
-  hwloc__get_dmi_id_info(data, topology->levels[0][0]);
-
-  hwloc_obj_add_info(topology->levels[0][0], "Backend", "Linux");
   if (cpuset_name) {
     hwloc_obj_add_info(topology->levels[0][0], "LinuxCgroup", cpuset_name);
     free(cpuset_name);
   }
 
-  /* data->utsname was filled with real uname or \0, we can safely pass it */
-  hwloc_add_uname_info(topology, &data->utsname);
-
   hwloc_linux_free_cpuinfo(Lprocs, numprocs, global_infos, global_infos_count);
   return 0;
 }
@@ -7292,14 +7272,20 @@ hwloc_look_linuxfs(struct hwloc_backend *backend, struct hwloc_disc_status *dsta
    * or not (modified fsroot path).
    */
 
+  struct hwloc_linux_backend_data_s *data = HWLOC_BACKEND_PRIVATE_DATA(backend);
   struct hwloc_topology *topology = backend->topology;
 #ifdef HWLOC_HAVE_LINUXIO
   enum hwloc_type_filter_e pfilter, bfilter, ofilter, mfilter;
 #endif /* HWLOC_HAVE_LINUXIO */
 
+  if (data->need_global_infos) {
+    hwloc_gather_system_info(topology, data);
+    hwloc_linuxfs_check_kernel_cmdline(data);
+  }
+
   if (dstatus->phase == HWLOC_DISC_PHASE_CPU) {
     hwloc_linuxfs_look_cpu(backend, dstatus);
-    return 0;
+    goto out;
   }
 
 #ifdef HWLOC_HAVE_LINUXIO
@@ -7353,6 +7339,14 @@ hwloc_look_linuxfs(struct hwloc_backend *backend, struct hwloc_disc_status *dsta
   }
 #endif /* HWLOC_HAVE_LINUXIO */
 
+ out:
+  if (data->need_global_infos) {
+    hwloc__get_dmi_id_info(data, topology->levels[0][0]);
+    hwloc_obj_add_info(topology->levels[0][0], "Backend", "Linux");
+    /* data->utsname was filled with real uname or \0, we can safely pass it */
+    hwloc_add_uname_info(topology, &data->utsname);
+    data->need_global_infos = 0;
+  }
   return 0;
 }
 
@@ -7405,6 +7399,7 @@ hwloc_linux_component_instantiate(struct hwloc_topology *topology,
   data->is_knl = 0;
   data->is_amd_with_CU = 0;
   data->is_fake_numa_uniform = 0;
+  data->need_global_infos = 1;
   data->is_real_fsroot = 1;
   data->root_path = NULL;
   fsroot_path = getenv("HWLOC_FSROOT");
diff --git a/tests/hwloc/linux/128arm-2pa2n8cluster4co.console b/tests/hwloc/linux/128arm-2pa2n8cluster4co.console
@@ -1,4 +1,4 @@
-Machine (P#0 total=503GiB DMIProductName="XA320 V2 " DMIProductVersion="To be filled by O.E.M." DMIProductSerial=2102312MEA10K9000003 DMIProductUUID=76cfcdd4-c8a7-9486-e911-c1d00a756a75 DMIBoardVendor=Huawei DMIBoardName=BC82HPNBB DMIBoardVersion=V200R002C00 DMIBoardSerial=026MGF10K8000012 DMIBoardAssetTag="To be filled by O.E.M." DMIChassisVendor=Huawei DMIChassisType=17 DMIChassisVersion="To be filled by O.E.M." DMIChassisSerial="To be filled by O.E.M." DMIChassisAssetTag="To be filled by O.E.M." DMIBIOSVendor="Huawei Corp." DMIBIOSVersion=0.86 DMIBIOSDate=07/19/2019 DMISysVendor=Huawei Backend=Linux LinuxCgroup=/ OSName=Linux OSRelease=5.15.0-rc1-00005-g4c1b4a4d90b6-dirty OSVersion="#313 SMP PREEMPT Sun Nov 7 14:18:05 EST 2021" HostName=ubuntu Architecture=aarch64)
+Machine (P#0 total=503GiB LinuxCgroup=/ DMIProductName="XA320 V2 " DMIProductVersion="To be filled by O.E.M." DMIProductSerial=2102312MEA10K9000003 DMIProductUUID=76cfcdd4-c8a7-9486-e911-c1d00a756a75 DMIBoardVendor=Huawei DMIBoardName=BC82HPNBB DMIBoardVersion=V200R002C00 DMIBoardSerial=026MGF10K8000012 DMIBoardAssetTag="To be filled by O.E.M." DMIChassisVendor=Huawei DMIChassisType=17 DMIChassisVersion="To be filled by O.E.M." DMIChassisSerial="To be filled by O.E.M." DMIChassisAssetTag="To be filled by O.E.M." DMIBIOSVendor="Huawei Corp." DMIBIOSVersion=0.86 DMIBIOSDate=07/19/2019 DMISysVendor=Huawei Backend=Linux OSName=Linux OSRelease=5.15.0-rc1-00005-g4c1b4a4d90b6-dirty OSVersion="#313 SMP PREEMPT Sun Nov 7 14:18:05 EST 2021" HostName=ubuntu Architecture=aarch64)
   Package L#0 (P#36 total=252GiB)
     L3Cache L#0 (total=126GiB size=32MiB linesize=128 ways=128)
       NUMANode L#0 (P#0 local=126GiB total=126GiB)
diff --git a/tests/hwloc/linux/16amd64-4n4c-cgroup-distance-merge.console b/tests/hwloc/linux/16amd64-4n4c-cgroup-distance-merge.console
@@ -1,4 +1,4 @@
-Machine (P#0 total=16GiB DMIProductName=H8QM8 DMIProductVersion=1234567890 DMIBoardVendor=Supermicro DMIBoardName=H8QM8 DMIBoardVersion=1234567890 DMIBoardAssetTag="To Be Filled By O.E.M." DMIChassisVendor="To Be Filled By O.E.M." DMIChassisType=3 DMIChassisVersion="To Be Filled By O.E.M." DMIChassisAssetTag="To Be Filled By O.E.M." DMIBIOSVendor="American Megatrends Inc." DMIBIOSVersion="080014 " DMIBIOSDate=12/20/2008 DMISysVendor=Supermicro Backend=Linux LinuxCgroup=/prout)
+Machine (P#0 total=16GiB LinuxCgroup=/prout DMIProductName=H8QM8 DMIProductVersion=1234567890 DMIBoardVendor=Supermicro DMIBoardName=H8QM8 DMIBoardVersion=1234567890 DMIBoardAssetTag="To Be Filled By O.E.M." DMIChassisVendor="To Be Filled By O.E.M." DMIChassisType=3 DMIChassisVersion="To Be Filled By O.E.M." DMIChassisAssetTag="To Be Filled By O.E.M." DMIBIOSVendor="American Megatrends Inc." DMIBIOSVersion="080014 " DMIBIOSDate=12/20/2008 DMISysVendor=Supermicro Backend=Linux)
   Package L#0 (P#0 CPUModel="Quad-Core AMD Opteron(tm) Processor 8347 HE")
     L3Cache L#0 (size=2048KiB linesize=64 ways=32)
       PU L#0 (P#0)
diff --git a/tests/hwloc/linux/16amd64-8n2c-cpusets-disallowed.console b/tests/hwloc/linux/16amd64-8n2c-cpusets-disallowed.console
@@ -1,4 +1,4 @@
-Machine (P#0 total=64GiB DMIBoardVendor="TYAN Computer Corp" DMIBoardName="S4881 " DMIBoardVersion=S4881 DMIBoardAssetTag= Backend=Linux LinuxCgroup=/dummy)
+Machine (P#0 total=64GiB LinuxCgroup=/dummy DMIBoardVendor="TYAN Computer Corp" DMIBoardName="S4881 " DMIBoardVersion=S4881 DMIBoardAssetTag= Backend=Linux)
   Package L#0 (P#0 total=8190MiB CPUModel="Dual Core AMD Opteron(tm) Processor 865")
     NUMANode L#0 (P#0 local=8190MiB total=8190MiB) (disallowed)
     L2Cache L#0 (size=1024KiB linesize=64 ways=16)
diff --git a/tests/hwloc/linux/16amd64-8n2c-cpusets-xml.xml b/tests/hwloc/linux/16amd64-8n2c-cpusets-xml.xml
@@ -2,12 +2,12 @@
 <!DOCTYPE topology SYSTEM "hwloc2.dtd">
 <topology version="3.0">
   <object type="Machine" os_index="0" cpuset="0x0000f06f" complete_cpuset="0x0000ffff" allowed_cpuset="0x0000f06f" nodeset="0x0000001e" complete_nodeset="0x000000ff" allowed_nodeset="0x0000001e">
+    <info name="LinuxCgroup" value="/dummy"/>
     <info name="DMIBoardVendor" value="TYAN Computer Corp"/>
     <info name="DMIBoardName" value="S4881 "/>
     <info name="DMIBoardVersion" value="S4881"/>
     <info name="DMIBoardAssetTag" value=""/>
     <info name="Backend" value="Linux"/>
-    <info name="LinuxCgroup" value="/dummy"/>
     <object type="Package" os_index="0" cpuset="0x00000003" complete_cpuset="0x00000003" nodeset="0x0" complete_nodeset="0x00000001">
       <info name="CPUModel" value="Dual Core AMD Opteron(tm) Processor 865"/>
       <object type="L2Cache" cpuset="0x00000001" complete_cpuset="0x00000001" nodeset="0x0" complete_nodeset="0x00000001" cache_size="1048576" depth="2" cache_linesize="64" cache_associativity="16" cache_type="0">
diff --git a/tests/hwloc/linux/16amd64-8n2c-cpusets.console b/tests/hwloc/linux/16amd64-8n2c-cpusets.console
@@ -1,4 +1,4 @@
-Machine (P#0 total=32GiB DMIBoardVendor="TYAN Computer Corp" DMIBoardName="S4881 " DMIBoardVersion=S4881 DMIBoardAssetTag= Backend=Linux LinuxCgroup=/dummy)
+Machine (P#0 total=32GiB LinuxCgroup=/dummy DMIBoardVendor="TYAN Computer Corp" DMIBoardName="S4881 " DMIBoardVersion=S4881 DMIBoardAssetTag= Backend=Linux)
   Package L#0 (P#0 CPUModel="Dual Core AMD Opteron(tm) Processor 865")
     L2Cache L#0 (size=1024KiB linesize=64 ways=16)
       L1dCache L#0 (size=64KiB linesize=64 ways=2)
diff --git a/tests/hwloc/linux/16em64t-4s2ca2c-cpusetreorder-merge.console b/tests/hwloc/linux/16em64t-4s2ca2c-cpusetreorder-merge.console
@@ -1,4 +1,4 @@
-Machine (P#0 total=16GiB Backend=Linux LinuxCgroup=/prout)
+Machine (P#0 total=16GiB LinuxCgroup=/prout Backend=Linux)
   NUMANode L#0 (P#0 local=16GiB total=16GiB)
   Package L#0 (P#0 CPUModel="Intel(R) Xeon(TM) CPU 2.60GHz")
     L2Cache L#0 (size=1024KiB linesize=64 ways=8)
diff --git a/tests/hwloc/linux/16em64t-4s2ca2c-cpusetreorder.console b/tests/hwloc/linux/16em64t-4s2ca2c-cpusetreorder.console
@@ -1,4 +1,4 @@
-Machine (P#0 total=16GiB Backend=Linux LinuxCgroup=/prout)
+Machine (P#0 total=16GiB LinuxCgroup=/prout Backend=Linux)
   NUMANode L#0 (P#0 local=16GiB total=16GiB)
   Package L#0 (P#0 CPUModel="Intel(R) Xeon(TM) CPU 2.60GHz")
     L3Cache L#0 (size=4096KiB linesize=64 ways=16)
diff --git a/tests/hwloc/linux/2pa-pcidomain32bits.console b/tests/hwloc/linux/2pa-pcidomain32bits.console
@@ -1,4 +1,4 @@
-Machine (P#0 total=2004MiB DMIProductName="CloudStack KVM Hypervisor" DMIProductVersion="RHEL 7.0.0 PC (i440FX + PIIX, 1996)" DMIChassisVendor=Bochs DMIChassisType=1 DMIChassisVersion= DMIChassisAssetTag= DMIBIOSVendor=Seabios DMIBIOSVersion=0.5.1 DMIBIOSDate=01/01/2011 DMISysVendor="Apache Software Foundation" Backend=Linux LinuxCgroup=/ OSName=Linux OSRelease=4.9.0-3-amd64 OSVersion="#1 SMP Debian 4.9.30-2+deb9u2 (2017-06-26)" HostName=hwloc-debian9amd64 Architecture=x86_64)
+Machine (P#0 total=2004MiB LinuxCgroup=/ DMIProductName="CloudStack KVM Hypervisor" DMIProductVersion="RHEL 7.0.0 PC (i440FX + PIIX, 1996)" DMIChassisVendor=Bochs DMIChassisType=1 DMIChassisVersion= DMIChassisAssetTag= DMIBIOSVendor=Seabios DMIBIOSVersion=0.5.1 DMIBIOSDate=01/01/2011 DMISysVendor="Apache Software Foundation" Backend=Linux OSName=Linux OSRelease=4.9.0-3-amd64 OSVersion="#1 SMP Debian 4.9.30-2+deb9u2 (2017-06-26)" HostName=hwloc-debian9amd64 Architecture=x86_64)
   NUMANode L#0 (P#0 local=2004MiB total=2004MiB)
   Package L#0 (P#0 CPUVendor=GenuineIntel CPUFamilyNumber=6 CPUModelNumber=94 CPUModel="Intel Core Processor (Skylake, IBRS)" CPUStepping=3)
     L2Cache L#0 (size=4096KiB linesize=64 ways=16)
diff --git a/tests/hwloc/linux/32amd64-4s2n4c-cgroup2.xml b/tests/hwloc/linux/32amd64-4s2n4c-cgroup2.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE topology SYSTEM "hwloc2.dtd">
 <topology version="3.0">
   <object type="Machine" os_index="0" cpuset="0x0000003f" complete_cpuset="0xffffffff" allowed_cpuset="0x0000003f" nodeset="0x0000003f" complete_nodeset="0x000000ff" allowed_nodeset="0x0000003f">
+    <info name="LinuxCgroup" value="/uid_2008/job_15389/step_0"/>
     <info name="DMIProductName" value="H8QG6"/>
     <info name="DMIProductVersion" value="1234567890"/>
     <info name="DMIBoardVendor" value="Supermicro"/>
@@ -17,7 +18,6 @@
     <info name="DMIBIOSDate" value="07/26/2011"/>
     <info name="DMISysVendor" value="Supermicro"/>
     <info name="Backend" value="Linux"/>
-    <info name="LinuxCgroup" value="/uid_2008/job_15389/step_0"/>
     <object type="Package" os_index="0" cpuset="0x0000003f" complete_cpuset="0x000000ff" nodeset="0x00000003" complete_nodeset="0x00000003">
       <info name="CPUModel" value="AMD Opteron(tm) Processor 6134"/>
       <object type="L3Cache" cpuset="0x0000000f" complete_cpuset="0x0000000f" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="5240832" depth="3" cache_linesize="64" cache_associativity="48" cache_type="0">
diff --git a/tests/hwloc/linux/32intel64-2p8co2t+8ve.console b/tests/hwloc/linux/32intel64-2p8co2t+8ve.console
@@ -1,4 +1,4 @@
-Machine (P#0 total=93GiB DMIProductName=SYS-4029GP-TRT2-1-NE010 DMIProductVersion=123456789 DMIBoardVendor=Supermicro DMIBoardName=X11DPG-OT-CPU DMIBoardVersion=1.00 DMIBoardAssetTag="Default string" DMIChassisVendor=Supermicro DMIChassisType=1 DMIChassisVersion=123456789 DMIChassisAssetTag="Default string" DMIBIOSVendor="American Megatrends Inc." DMIBIOSVersion=2.0b DMIBIOSDate=02/13/2018 DMISysVendor=Supermicro Backend=Linux LinuxCgroup=/ OSName=Linux OSRelease=3.10.0-1160.15.2.el7.x86_64 OSVersion="#1 SMP Wed Feb 3 15:06:38 UTC 2021" HostName=ve Architecture=x86_64)
+Machine (P#0 total=93GiB LinuxCgroup=/ DMIProductName=SYS-4029GP-TRT2-1-NE010 DMIProductVersion=123456789 DMIBoardVendor=Supermicro DMIBoardName=X11DPG-OT-CPU DMIBoardVersion=1.00 DMIBoardAssetTag="Default string" DMIChassisVendor=Supermicro DMIChassisType=1 DMIChassisVersion=123456789 DMIChassisAssetTag="Default string" DMIBIOSVendor="American Megatrends Inc." DMIBIOSVersion=2.0b DMIBIOSDate=02/13/2018 DMISysVendor=Supermicro Backend=Linux OSName=Linux OSRelease=3.10.0-1160.15.2.el7.x86_64 OSVersion="#1 SMP Wed Feb 3 15:06:38 UTC 2021" HostName=ve Architecture=x86_64)
   Package L#0 (P#0 total=46GiB CPUVendor=GenuineIntel CPUFamilyNumber=6 CPUModelNumber=85 CPUModel="Intel(R) Xeon(R) Silver 4108 CPU @ 1.80GHz" CPUStepping=4)
     NUMANode L#0 (P#0 local=46GiB total=46GiB)
     L3Cache L#0 (P#0 size=11MiB linesize=64 ways=11)
diff --git a/tests/hwloc/linux/40intel64-2g2n4c+pcilocality.xml b/tests/hwloc/linux/40intel64-2g2n4c+pcilocality.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE topology SYSTEM "hwloc2.dtd">
 <topology version="3.0">
   <object type="Machine" os_index="0" cpuset="0x000000ff,0xffffffff" complete_cpuset="0x000000ff,0xffffffff" allowed_cpuset="0x000000ff,0xffffffff" nodeset="0x0000000f" complete_nodeset="0x0000000f" allowed_nodeset="0x0000000f">
+    <info name="LinuxCgroup" value="/torque/513099.master.cm.cluster"/>
     <info name="DMIProductName" value="PowerEdge R910"/>
     <info name="DMIProductVersion" value=""/>
     <info name="DMIBoardVendor" value="Dell Inc."/>
@@ -17,7 +18,6 @@
     <info name="DMIBIOSDate" value="10/26/2011"/>
     <info name="DMISysVendor" value="Dell Inc."/>
     <info name="Backend" value="Linux"/>
-    <info name="LinuxCgroup" value="/torque/513099.master.cm.cluster"/>
     <object type="Group" cpuset="0x00000055,0x55555555" complete_cpuset="0x00000055,0x55555555" nodeset="0x00000005" complete_nodeset="0x00000005" kind="1000" subkind="0">
       <object type="Package" os_index="0" cpuset="0x00000011,0x11111111" complete_cpuset="0x00000011,0x11111111" nodeset="0x00000001" complete_nodeset="0x00000001">
         <info name="CPUModel" value="Intel(R) Xeon(R) CPU E7- 4870  @ 2.40GHz"/>
diff --git a/tests/hwloc/linux/40intel64-4n10c+pci-conflicts.console b/tests/hwloc/linux/40intel64-4n10c+pci-conflicts.console
@@ -1,4 +1,4 @@
-Machine (P#0 total=512GiB Backend=Linux LinuxCgroup=/torque/513099.master.cm.cluster)
+Machine (P#0 total=512GiB LinuxCgroup=/torque/513099.master.cm.cluster Backend=Linux)
   Package L#0 (P#0 total=128GiB CPUModel="Intel(R) Xeon(R) CPU E7- 4870  @ 2.40GHz")
     NUMANode L#0 (P#0 local=128GiB total=128GiB)
     L3Cache L#0 (size=30MiB linesize=64 ways=24)
diff --git a/tests/hwloc/linux/4fake-4gr1nu1pu.console b/tests/hwloc/linux/4fake-4gr1nu1pu.console
@@ -1,4 +1,4 @@
-Machine (P#0 total=2048MiB Backend=Linux LinuxCgroup=/dummy)
+Machine (P#0 total=2048MiB LinuxCgroup=/dummy Backend=Linux)
   Package L#0 (P#0 total=2048MiB)
     Group0 L#0 (total=1024MiB)
       NUMANode L#0 (P#0 local=1024MiB total=1024MiB)
diff --git a/tests/hwloc/linux/8em64t-2s2ca2c-buggynuma.console b/tests/hwloc/linux/8em64t-2s2ca2c-buggynuma.console
@@ -1,4 +1,4 @@
-Machine (P#0 total=2048MiB DMIProductName=AltixXE320 DMIProductVersion=AltixXE DMIBoardVendor=SM DMIBoardName=X7DWT-INF DMIBoardVersion=1.01 DMIBoardAssetTag= DMIChassisVendor=SGI.COM DMIChassisType=1 DMIChassisVersion=013-5556-002 DMIChassisAssetTag=" " DMIBIOSVendor="Phoenix Technologies LTD" DMIBIOSVersion=.0b DMIBIOSDate=03/24/2008 DMISysVendor=SGI.COM Backend=Linux LinuxCgroup=/)
+Machine (P#0 total=2048MiB LinuxCgroup=/ DMIProductName=AltixXE320 DMIProductVersion=AltixXE DMIBoardVendor=SM DMIBoardName=X7DWT-INF DMIBoardVersion=1.01 DMIBoardAssetTag= DMIChassisVendor=SGI.COM DMIChassisType=1 DMIChassisVersion=013-5556-002 DMIChassisAssetTag=" " DMIBIOSVendor="Phoenix Technologies LTD" DMIBIOSVersion=.0b DMIBIOSDate=03/24/2008 DMISysVendor=SGI.COM Backend=Linux)
   NUMANode L#0 (P#0 local=2048MiB total=2048MiB)
   Package L#0 (P#0 CPUModel="Intel(R) Xeon(R) CPU           E5472  @ 3.00GHz")
     L2Cache L#0 (size=6144KiB linesize=64 ways=24)
diff --git a/tests/hwloc/linux/fakecpuid1f-64intel64-2p4d2n2c2t.console b/tests/hwloc/linux/fakecpuid1f-64intel64-2p4d2n2c2t.console
@@ -1,4 +1,4 @@
-Machine (P#0 total=3931MiB DMIProductName="Standard PC (i440FX + PIIX, 1996)" DMIProductVersion=pc-i440fx-3.1 DMIChassisVendor=QEMU DMIChassisType=1 DMIChassisVersion=pc-i440fx-3.1 DMIChassisAssetTag= DMIBIOSVendor=SeaBIOS DMIBIOSVersion=1.12.0-1 DMIBIOSDate=04/01/2014 DMISysVendor=QEMU Backend=Linux LinuxCgroup=/ OSName=Linux OSRelease=5.0.0-rc7 OSVersion="#1 SMP Tue Feb 26 08:48:46 CET 2019" HostName=debian Architecture=x86_64)
+Machine (P#0 total=3931MiB LinuxCgroup=/ DMIProductName="Standard PC (i440FX + PIIX, 1996)" DMIProductVersion=pc-i440fx-3.1 DMIChassisVendor=QEMU DMIChassisType=1 DMIChassisVersion=pc-i440fx-3.1 DMIChassisAssetTag= DMIBIOSVendor=SeaBIOS DMIBIOSVersion=1.12.0-1 DMIBIOSDate=04/01/2014 DMISysVendor=QEMU Backend=Linux OSName=Linux OSRelease=5.0.0-rc7 OSVersion="#1 SMP Tue Feb 26 08:48:46 CET 2019" HostName=debian Architecture=x86_64)
   Package L#0 (P#0 total=1005MiB CPUVendor=GenuineIntel CPUFamilyNumber=6 CPUModelNumber=6 CPUModel="QEMU Virtual CPU version 2.5+" CPUStepping=3)
     Die L#0 (P#0 total=502MiB)
       L3Cache L#0 (P#0 total=502MiB size=16MiB linesize=64 ways=16)
diff --git a/tests/hwloc/linux/fakeheteromemtiers.console b/tests/hwloc/linux/fakeheteromemtiers.console
@@ -1,4 +1,4 @@
-Machine (P#0 total=6090MiB DMIProductName="Standard PC (i440FX + PIIX, 1996)" DMIProductVersion=pc-i440fx-7.0 DMIProductSerial= DMIChassisVendor=QEMU DMIChassisType=1 DMIChassisVersion=pc-i440fx-7.0 DMIChassisSerial= DMIChassisAssetTag= DMIBIOSVendor="EFI Development Kit II / OVMF" DMIBIOSVersion=0.0.0 DMIBIOSDate=02/06/2015 DMISysVendor=QEMU Backend=Linux LinuxCgroup=/ OSName=Linux OSRelease=5.18.0-rc4 OSVersion="#1 SMP PREEMPT_DYNAMIC Tue Apr 26 11:49:51 CEST 2022" HostName=efi Architecture=x86_64)
+Machine (P#0 total=6090MiB LinuxCgroup=/ DMIProductName="Standard PC (i440FX + PIIX, 1996)" DMIProductVersion=pc-i440fx-7.0 DMIProductSerial= DMIChassisVendor=QEMU DMIChassisType=1 DMIChassisVersion=pc-i440fx-7.0 DMIChassisSerial= DMIChassisAssetTag= DMIBIOSVendor="EFI Development Kit II / OVMF" DMIBIOSVersion=0.0.0 DMIBIOSDate=02/06/2015 DMISysVendor=QEMU Backend=Linux OSName=Linux OSRelease=5.18.0-rc4 OSVersion="#1 SMP PREEMPT_DYNAMIC Tue Apr 26 11:49:51 CEST 2022" HostName=efi Architecture=x86_64)
   Package L#0 (P#0 total=6090MiB CPUVendor=GenuineIntel CPUFamilyNumber=15 CPUModelNumber=107 CPUModel="QEMU Virtual CPU version 2.5+" CPUStepping=1)
     L3Cache L#0 (P#0 total=6090MiB size=16MiB linesize=64 ways=16)
       Group0 L#0 (total=3319MiB)
diff --git a/tests/hwloc/linux/fakememinitiators-1np2c+1npp+gi.console b/tests/hwloc/linux/fakememinitiators-1np2c+1npp+gi.console
@@ -1,4 +1,4 @@
-Machine (P#0 total=1861GiB Backend=Linux LinuxCgroup=/)
+Machine (P#0 total=1861GiB LinuxCgroup=/ Backend=Linux)
   Package L#0 (P#0 total=929GiB CPUModel="Intel(R) Xeon(R) Gold 6230 CPU @ 2.10GHz")
     NUMANode(NVM) L#2 (P#7 local=742GiB total=742GiB DAXDevice=dax0.0 DAXType=NVM DAXParent=LNXSYSTM:00/LNXSYBUS:00/ACPI0012:00/ndbus0/region0/dax0.1)
     Group0 L#0 (total=93GiB)
diff --git a/tests/hwloc/linux/nvidiagpunumanodes-kept.console b/tests/hwloc/linux/nvidiagpunumanodes-kept.console
@@ -1,4 +1,4 @@
-Machine (P#0 total=342GiB PlatformName=PowerNV PlatformModel="PowerNV 8335-GTW" Backend=Linux LinuxCgroup=/jjh OSName=Linux OSRelease=4.14.0-49.el7a.bz1553205.page_fault_hang.ppc64le OSVersion="#1 SMP Fri Mar 30 12:06:11 CDT 2018" HostName=c685f8n02 Architecture=ppc64le)
+Machine (P#0 total=342GiB PlatformName=PowerNV PlatformModel="PowerNV 8335-GTW" LinuxCgroup=/jjh Backend=Linux OSName=Linux OSRelease=4.14.0-49.el7a.bz1553205.page_fault_hang.ppc64le OSVersion="#1 SMP Fri Mar 30 12:06:11 CDT 2018" HostName=c685f8n02 Architecture=ppc64le)
   Package L#0 (P#0 total=169GiB CPUModel="POWER9, altivec supported" CPURevision="2.1 (pvr 004e 1201)")
     NUMANode L#0 (P#0 local=124GiB total=124GiB)
     NUMANode(GPUMemory) L#1 (P#253 local=15GiB total=15GiB PCIBusID=0006:00:00.0)
diff --git a/tests/hwloc/linux/nvidiagpunumanodes.console b/tests/hwloc/linux/nvidiagpunumanodes.console
@@ -1,4 +1,4 @@
-Machine (P#0 total=252GiB PlatformName=PowerNV PlatformModel="PowerNV 8335-GTW" Backend=Linux LinuxCgroup=/jjh OSName=Linux OSRelease=4.14.0-49.el7a.bz1553205.page_fault_hang.ppc64le OSVersion="#1 SMP Fri Mar 30 12:06:11 CDT 2018" HostName=c685f8n02 Architecture=ppc64le)
+Machine (P#0 total=252GiB PlatformName=PowerNV PlatformModel="PowerNV 8335-GTW" LinuxCgroup=/jjh Backend=Linux OSName=Linux OSRelease=4.14.0-49.el7a.bz1553205.page_fault_hang.ppc64le OSVersion="#1 SMP Fri Mar 30 12:06:11 CDT 2018" HostName=c685f8n02 Architecture=ppc64le)
   Package L#0 (P#0 total=124GiB CPUModel="POWER9, altivec supported" CPURevision="2.1 (pvr 004e 1201)")
     NUMANode L#0 (P#0 local=124GiB total=124GiB)
     L3Cache L#0 (size=10MiB linesize=0)
diff --git a/tests/hwloc/linux/offline-cpu0-node0.console b/tests/hwloc/linux/offline-cpu0-node0.console
diff --git a/tests/hwloc/x86+linux/5intel64-hybrid-lakefield.console b/tests/hwloc/x86+linux/5intel64-hybrid-lakefield.console

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-Machine (P#0 total=503GiB DMIProductName="XA320 V2 " DMIProductVersion="To be filled by O.E.M." DMIProductSerial=2102312MEA10K9000003 DMIProductUUID=76cfcdd4-c8a7-9486-e911-c1d00a756a75 DMIBoardVendor=Huawei DMIBoardName=BC82HPNBB DMIBoardVersion=V200R002C00 DMIBoardSerial=026MGF10K8000012 DMIBoardAssetTag="To be filled by O.E.M." DMIChassisVendor=Huawei DMIChassisType=17 DMIChassisVersion="To be filled by O.E.M." DMIChassisSerial="To be filled by O.E.M." DMIChassisAssetTag="To be filled by O.E.M." DMIBIOSVendor="Huawei Corp." DMIBIOSVersion=0.86 DMIBIOSDate=07/19/2019 DMISysVendor=Huawei Backend=Linux LinuxCgroup=/ OSName=Linux OSRelease=5.15.0-rc1-00005-g4c1b4a4d90b6-dirty OSVersion="#313 SMP PREEMPT Sun Nov 7 14:18:05 EST 2021" HostName=ubuntu Architecture=aarch64)
	`1`	+Machine (P#0 total=503GiB LinuxCgroup=/ DMIProductName="XA320 V2 " DMIProductVersion="To be filled by O.E.M." DMIProductSerial=2102312MEA10K9000003 DMIProductUUID=76cfcdd4-c8a7-9486-e911-c1d00a756a75 DMIBoardVendor=Huawei DMIBoardName=BC82HPNBB DMIBoardVersion=V200R002C00 DMIBoardSerial=026MGF10K8000012 DMIBoardAssetTag="To be filled by O.E.M." DMIChassisVendor=Huawei DMIChassisType=17 DMIChassisVersion="To be filled by O.E.M." DMIChassisSerial="To be filled by O.E.M." DMIChassisAssetTag="To be filled by O.E.M." DMIBIOSVendor="Huawei Corp." DMIBIOSVersion=0.86 DMIBIOSDate=07/19/2019 DMISysVendor=Huawei Backend=Linux OSName=Linux OSRelease=5.15.0-rc1-00005-g4c1b4a4d90b6-dirty OSVersion="#313 SMP PREEMPT Sun Nov 7 14:18:05 EST 2021" HostName=ubuntu Architecture=aarch64)
`2`	`2`	`Package L#0 (P#36 total=252GiB)`
`3`	`3`	`L3Cache L#0 (total=126GiB size=32MiB linesize=128 ways=128)`
`4`	`4`	`NUMANode L#0 (P#0 local=126GiB total=126GiB)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Machine (P#0 total=16GiB DMIProductName=H8QM8 DMIProductVersion=1234567890 DMIBoardVendor=Supermicro DMIBoardName=H8QM8 DMIBoardVersion=1234567890 DMIBoardAssetTag="To Be Filled By O.E.M." DMIChassisVendor="To Be Filled By O.E.M." DMIChassisType=3 DMIChassisVersion="To Be Filled By O.E.M." DMIChassisAssetTag="To Be Filled By O.E.M." DMIBIOSVendor="American Megatrends Inc." DMIBIOSVersion="080014 " DMIBIOSDate=12/20/2008 DMISysVendor=Supermicro Backend=Linux LinuxCgroup=/prout)`
	`1`	`+Machine (P#0 total=16GiB LinuxCgroup=/prout DMIProductName=H8QM8 DMIProductVersion=1234567890 DMIBoardVendor=Supermicro DMIBoardName=H8QM8 DMIBoardVersion=1234567890 DMIBoardAssetTag="To Be Filled By O.E.M." DMIChassisVendor="To Be Filled By O.E.M." DMIChassisType=3 DMIChassisVersion="To Be Filled By O.E.M." DMIChassisAssetTag="To Be Filled By O.E.M." DMIBIOSVendor="American Megatrends Inc." DMIBIOSVersion="080014 " DMIBIOSDate=12/20/2008 DMISysVendor=Supermicro Backend=Linux)`
`2`	`2`	`Package L#0 (P#0 CPUModel="Quad-Core AMD Opteron(tm) Processor 8347 HE")`
`3`	`3`	`L3Cache L#0 (size=2048KiB linesize=64 ways=32)`
`4`	`4`	`PU L#0 (P#0)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Machine (P#0 total=64GiB DMIBoardVendor="TYAN Computer Corp" DMIBoardName="S4881 " DMIBoardVersion=S4881 DMIBoardAssetTag= Backend=Linux LinuxCgroup=/dummy)`
	`1`	`+Machine (P#0 total=64GiB LinuxCgroup=/dummy DMIBoardVendor="TYAN Computer Corp" DMIBoardName="S4881 " DMIBoardVersion=S4881 DMIBoardAssetTag= Backend=Linux)`
`2`	`2`	`Package L#0 (P#0 total=8190MiB CPUModel="Dual Core AMD Opteron(tm) Processor 865")`
`3`	`3`	`NUMANode L#0 (P#0 local=8190MiB total=8190MiB) (disallowed)`
`4`	`4`	`L2Cache L#0 (size=1024KiB linesize=64 ways=16)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Machine (P#0 total=32GiB DMIBoardVendor="TYAN Computer Corp" DMIBoardName="S4881 " DMIBoardVersion=S4881 DMIBoardAssetTag= Backend=Linux LinuxCgroup=/dummy)`
	`1`	`+Machine (P#0 total=32GiB LinuxCgroup=/dummy DMIBoardVendor="TYAN Computer Corp" DMIBoardName="S4881 " DMIBoardVersion=S4881 DMIBoardAssetTag= Backend=Linux)`
`2`	`2`	`Package L#0 (P#0 CPUModel="Dual Core AMD Opteron(tm) Processor 865")`
`3`	`3`	`L2Cache L#0 (size=1024KiB linesize=64 ways=16)`
`4`	`4`	`L1dCache L#0 (size=64KiB linesize=64 ways=2)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Machine (P#0 total=16GiB Backend=Linux LinuxCgroup=/prout)`
	`1`	`+Machine (P#0 total=16GiB LinuxCgroup=/prout Backend=Linux)`
`2`	`2`	`NUMANode L#0 (P#0 local=16GiB total=16GiB)`
`3`	`3`	`Package L#0 (P#0 CPUModel="Intel(R) Xeon(TM) CPU 2.60GHz")`
`4`	`4`	`L2Cache L#0 (size=1024KiB linesize=64 ways=8)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Machine (P#0 total=2004MiB DMIProductName="CloudStack KVM Hypervisor" DMIProductVersion="RHEL 7.0.0 PC (i440FX + PIIX, 1996)" DMIChassisVendor=Bochs DMIChassisType=1 DMIChassisVersion= DMIChassisAssetTag= DMIBIOSVendor=Seabios DMIBIOSVersion=0.5.1 DMIBIOSDate=01/01/2011 DMISysVendor="Apache Software Foundation" Backend=Linux LinuxCgroup=/ OSName=Linux OSRelease=4.9.0-3-amd64 OSVersion="#1 SMP Debian 4.9.30-2+deb9u2 (2017-06-26)" HostName=hwloc-debian9amd64 Architecture=x86_64)`
	`1`	`+Machine (P#0 total=2004MiB LinuxCgroup=/ DMIProductName="CloudStack KVM Hypervisor" DMIProductVersion="RHEL 7.0.0 PC (i440FX + PIIX, 1996)" DMIChassisVendor=Bochs DMIChassisType=1 DMIChassisVersion= DMIChassisAssetTag= DMIBIOSVendor=Seabios DMIBIOSVersion=0.5.1 DMIBIOSDate=01/01/2011 DMISysVendor="Apache Software Foundation" Backend=Linux OSName=Linux OSRelease=4.9.0-3-amd64 OSVersion="#1 SMP Debian 4.9.30-2+deb9u2 (2017-06-26)" HostName=hwloc-debian9amd64 Architecture=x86_64)`
`2`	`2`	`NUMANode L#0 (P#0 local=2004MiB total=2004MiB)`
`3`	`3`	`Package L#0 (P#0 CPUVendor=GenuineIntel CPUFamilyNumber=6 CPUModelNumber=94 CPUModel="Intel Core Processor (Skylake, IBRS)" CPUStepping=3)`
`4`	`4`	`L2Cache L#0 (size=4096KiB linesize=64 ways=16)`