cpuallocator: don't blindly assume non-empty cpuset.

Signed-off-by: Krisztian Litkey <[email protected]>
containers · Jun 20, 2024 · 4364132 · 4364132
1 parent 307a338
commit 4364132
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/pkg/cpuallocator/allocator.go b/pkg/cpuallocator/allocator.go
@@ -947,14 +947,15 @@ func (c *topologyCache) discoverCPUClusters(sys sysfs.System) {
 		clusters := []*cpuCluster{}
 		for _, die := range pkg.DieIDs() {
 			for _, cl := range pkg.LogicalDieClusterIDs(id) {
-				cpus := pkg.LogicalDieClusterCPUSet(die, cl)
-				clusters = append(clusters, &cpuCluster{
-					pkg:     id,
-					die:     die,
-					cluster: cl,
-					cpus:    cpus,
-					kind:    sys.CPU(cpus.List()[0]).CoreKind(),
-				})
+				if cpus := pkg.LogicalDieClusterCPUSet(die, cl); cpus.Size() > 0 {
+					clusters = append(clusters, &cpuCluster{
+						pkg:     id,
+						die:     die,
+						cluster: cl,
+						cpus:    cpus,
+						kind:    sys.CPU(cpus.List()[0]).CoreKind(),
+					})
+				}
 			}
 		}
 		if len(clusters) > 1 {