nfd-topology-updater: Detect E/P cores and expose through attributes

Signed-off-by: Oleg Zhurakivskyy <[email protected]>

Author: ozhuraki

pkg/nfd-topology-updater/nfd-topology-updater.go

@@ -22,6 +22,7 @@ import (
 	"net/url"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"golang.org/x/net/context"
 
@@ -42,6 +43,7 @@ import (
 	"sigs.k8s.io/node-feature-discovery/pkg/resourcemonitor"
 	"sigs.k8s.io/node-feature-discovery/pkg/topologypolicy"
 	"sigs.k8s.io/node-feature-discovery/pkg/utils"
+	"sigs.k8s.io/node-feature-discovery/pkg/utils/hostpath"
 	"sigs.k8s.io/node-feature-discovery/pkg/utils/kubeconf"
 	"sigs.k8s.io/node-feature-discovery/pkg/version"
 	"sigs.k8s.io/yaml"
@@ -337,6 +339,38 @@ func (w *nfdTopologyUpdater) updateNodeResourceTopology(zoneInfo v1alpha2.ZoneLi
 	return nil
 }
 
+func getCPUCoreAttribute(coreKind string) (error, v1alpha2.AttributeInfo) {
+	cpu, err := os.ReadFile(hostpath.SysfsDir.Path("sys/devices/" + coreKind, "cpus"))
+	if os.IsNotExist(err) {
+		klog.ErrorS(err, "error reading cpu entry file", "coreKind", coreKind)
+		return err, v1alpha2.AttributeInfo{}
+	}
+
+	attr := v1alpha2.AttributeInfo{
+		Name:  coreKind,
+		Value: strings.TrimSpace(string(cpu)),
+	}
+
+	return nil, attr
+}
+
+// Dicsover E/P cores
+func discoverCpuCores() v1alpha2.AttributeList {
+	attrList := v1alpha2.AttributeList{}
+
+	err, attrAtom := getCPUCoreAttribute("cpu_atom")
+	if err == nil {
+		attrList = append(attrList, attrAtom)
+	}
+
+	err, attrCore := getCPUCoreAttribute("cpu_core")
+	if err == nil {
+		attrList = append(attrList, attrCore)
+	}
+
+	return attrList
+}
+
 func (w *nfdTopologyUpdater) updateNRTTopologyManagerInfo(nrt *v1alpha2.NodeResourceTopology) error {
 	policy, scope, err := w.detectTopologyPolicyAndScope()
 	if err != nil {
@@ -349,6 +383,9 @@ func (w *nfdTopologyUpdater) updateNRTTopologyManagerInfo(nrt *v1alpha2.NodeReso
 	updateAttributes(&nrt.Attributes, tmAttributes)
 	nrt.TopologyPolicies = deprecatedTopologyPolicies
 
+	attrList := discoverCpuCores()
+	updateAttributes(&nrt.Attributes, attrList)
+
 	return nil
 }