core: AND allowed sets with normal sets in the allow(LOCAL) case

bgoglin · ndenoyelle · commit 150506a5566d · 2019-10-22T07:02:49.000-05:00
In some (old?) corner cases, Linux cpusets may return offline PUs
in the allowed sets of cpusets/cgroups.

Signed-off-by: Brice Goglin &lt;Brice.Goglin@inria.fr&gt;
diff --git a/hwloc/topology.c b/hwloc/topology.c
@@ -4242,6 +4242,9 @@ hwloc_topology_allow(struct hwloc_topology *topology,
       goto error;
     }
     topology->binding_hooks.get_allowed_resources(topology);
+    /* make sure the backend returned something sane (Linux cpusets may return offline PUs in some cases) */
+    hwloc_bitmap_and(topology->allowed_cpuset, topology->allowed_cpuset, hwloc_get_root_obj(topology)->cpuset);
+    hwloc_bitmap_and(topology->allowed_nodeset, topology->allowed_nodeset, hwloc_get_root_obj(topology)->nodeset);
     break;
   }
   case HWLOC_ALLOW_FLAG_CUSTOM: {

Original file line number	Diff line number	Diff line change
`@@ -4242,6 +4242,9 @@ hwloc_topology_allow(struct hwloc_topology *topology,`
`4242`	`4242`	`goto error;`
`4243`	`4243`	`}`
`4244`	`4244`	`topology->binding_hooks.get_allowed_resources(topology);`
	`4245`	`+ /* make sure the backend returned something sane (Linux cpusets may return offline PUs in some cases) */`
	`4246`	`+ hwloc_bitmap_and(topology->allowed_cpuset, topology->allowed_cpuset, hwloc_get_root_obj(topology)->cpuset);`
	`4247`	`+ hwloc_bitmap_and(topology->allowed_nodeset, topology->allowed_nodeset, hwloc_get_root_obj(topology)->nodeset);`
`4245`	`4248`	`break;`
`4246`	`4249`	`}`
`4247`	`4250`	`case HWLOC_ALLOW_FLAG_CUSTOM: {`