osdev: BXI is now Network instead of OpenFabrics

Signed-off-by: Brice Goglin <[email protected]>

Author: bgoglin

NEWS

@@ -33,6 +33,7 @@ Version 3.0.0
   + The OS device "type" attribute is now a bitmask.
     - "Block" OS devices are now "Storage" (for actual Block devices)
       or "Memory" (for Linux DAX and CXL devices, etc).
+    - BXI interfaces are now "Network" instead of "OpenFabrics".
   + The "Backend" info attribute of OS devices is now in the topology
     root object together with other backends.
   + The array and count of info attributes are now embedded in the new

doc/hwloc.doxy

@@ -1660,12 +1660,12 @@ components when I/O discovery is enabled and supported.
  <ul>
  <li><em>eth0</em>, <em>wlan0</em>, <em>ib0</em> (Linux component)</li>
  <li><em>hsn0</em> with "Slingshot" subtype for HPE Cray HSNs (Linux component).</li>
+ <li><em>bxi0</em> with "BXI" subtype for Atos/Bull BXI HCAs (Linux component).</li>
  </ul>
 </li>
 <li>OpenFabrics (InfiniBand, Omni-Path, usNIC, etc) HCAs (::HWLOC_OBJ_OSDEV_OPENFABRICS)
  <ul>
  <li><em>mlx5_0</em>, <em>hfi1_0</em>, <em>qib0</em>, <em>usnic_0</em> (Linux component)</li>
- <li><em>bxi0</em> with "BXI" subtype for Atos/Bull BXI HCAs (Linux component) even if those are not really OpenFabrics.</li>
  </ul>
 </li>
 <li>GPUs (::HWLOC_OBJ_OSDEV_GPU)
@@ -1935,8 +1935,7 @@ subtype <tt>Cluster</tt>, <tt>Module</tt>, <tt>Tile</tt>, <tt>Compute Unit</tt>,
 <ul>
 <li>Co-processor: subtype <tt>OpenCL</tt>, <tt>LevelZero</tt>, <tt>CUDA</tt>, or <tt>VectorEngine</tt>.</li>
 <li>GPU: subtype <tt>RSMI</tt> (AMD GPU) or <tt>NVML</tt> (NVIDIA GPU).</li>
-<li>OpenFabrics: subtype <tt>BXI</tt> (Bull/Atos BXI HCA).</li>
-<li>Network: subtype <tt>Slingshot</tt> (HPE Cray Slingshot Cassini HSN).</li>
+<li>Network: subtype <tt>Slingshot</tt> (HPE Cray Slingshot Cassini HSN) or <tt>BXI</tt> (Bull/Atos BXI HCA).</li>
 <li>Storage: subtype <tt>Disk</tt>, <tt>Tape</tt>, or <tt>Removable Media Device</tt>.</li>
 <li>Memory: <tt>NVM</tt> (non-volatile memory), <tt>SPM</tt> (specific-purpose memory), <tt>CXLMem</tt> (CXL volatile ou persistent memory).</li>
 </ul>

hwloc/topology-linux.c

@@ -6615,7 +6615,7 @@ hwloc_linuxfs_lookup_bxi_class(struct hwloc_backend *backend, unsigned osdev_fla
     if (!parent)
       continue;
 
-    obj = hwloc_linux_add_os_device(backend, parent, HWLOC_OBJ_OSDEV_OPENFABRICS, dirent->d_name);
+    obj = hwloc_linux_add_os_device(backend, parent, HWLOC_OBJ_OSDEV_NETWORK, dirent->d_name);
 
     hwloc_linuxfs_bxi_class_fillinfos(root_fd, obj, path);
   }

hwloc/topology-xml.c

@@ -860,7 +860,10 @@ hwloc__xml_import_object(hwloc_topology_t topology,
       obj->attr->osdev.type = HWLOC_OBJ_OSDEV_NETWORK;
       break;
     case 3: /* v2 OFED */
+      /* BXI which became NET only */
       obj->attr->osdev.type = HWLOC_OBJ_OSDEV_OPENFABRICS;
+      if (obj->subtype && !strcmp(obj->subtype, "BXI"))
+        obj->attr->osdev.type = HWLOC_OBJ_OSDEV_NETWORK;
       break;
     case 4: /* v2 DMA */
       obj->attr->osdev.type = HWLOC_OBJ_OSDEV_DMA;
@@ -2247,7 +2250,10 @@ hwloc__xml_export_object_contents (hwloc__xml_export_state_t state, hwloc_topolo
       } else if (obj->attr->osdev.type == HWLOC_OBJ_OSDEV_OPENFABRICS) {
         state->new_prop(state, "osdev_type", "3"); /* v2 OFED */
       } else if (obj->attr->osdev.type == HWLOC_OBJ_OSDEV_NETWORK) {
-        state->new_prop(state, "osdev_type", "2"); /* v2 Net */
+        if (obj->subtype && !strcmp(obj->subtype, "BXI"))
+          state->new_prop(state, "osdev_type", "3"); /* v2 OFED */
+        else
+          state->new_prop(state, "osdev_type", "2"); /* v2 Net */
       } else if (obj->attr->osdev.type == HWLOC_OBJ_OSDEV_DMA) {
         state->new_prop(state, "osdev_type", "4"); /* v2 DMA */
       } else if (obj->attr->osdev.type == HWLOC_OBJ_OSDEV_COPROC) {

include/hwloc.h

@@ -380,7 +380,8 @@ enum hwloc_obj_osdev_type_e {
                                             * \hideinitializer
                                             */
   HWLOC_OBJ_OSDEV_NETWORK = (1ULL<<4),     /**< \brief Operating system network device.
-                                            * For instance the "eth0" interface on Linux.
+                                            * For instance the "eth0" interface,
+                                            * "bxi0" Atos/Bull BXI HCA.
                                             * \hideinitializer
                                             */
   HWLOC_OBJ_OSDEV_OPENFABRICS = (1ULL<<5), /**< \brief Operating system OpenFabrics device.