WIP

Signed-off-by: Francesco Romani <[email protected]>

Author: ffromani

pkg/performanceprofile/controller/performanceprofile/components/components.go

@@ -43,6 +43,19 @@ type Options struct {
 type MachineConfigOptions struct {
 	PinningMode      *apiconfigv1.CPUPartitioningMode
 	MixedCPUsEnabled bool
+	LLCFileEnabled   bool
+}
+
+func (mco *MachineConfigOptions) Clone() *MachineConfigOptions {
+	ret := MachineConfigOptions{
+		MixedCPUsEnabled: mco.MixedCPUsEnabled,
+		LLCFileEnabled:   mco.LLCFileEnabled,
+	}
+	if mco.PinningMode != nil {
+		ret.PinningMode = new(apiconfigv1.CPUPartitioningMode)
+		*ret.PinningMode = *mco.PinningMode
+	}
+	return &ret
 }
 
 type KubeletConfigOptions struct {

pkg/performanceprofile/controller/performanceprofile/components/kubeletconfig/kubeletconfig.go

@@ -2,6 +2,7 @@ package kubeletconfig
 
 import (
 	"encoding/json"
+	"strconv"
 	"time"
 
 	corev1 "k8s.io/api/core/v1"
@@ -27,35 +28,29 @@ const (
 	// 4. Reserved CPUs
 	// 5. Memory manager policy
 	// Please avoid specifying them and use the relevant API to configure these parameters.
-	experimentalKubeletSnippetAnnotation         = "kubeletconfig.experimental"
-	cpuManagerPolicyStatic                       = "static"
-	cpuManagerPolicyOptionFullPCPUsOnly          = "full-pcpus-only"
-	memoryManagerPolicyStatic                    = "Static"
-	defaultKubeReservedMemory                    = "500Mi"
-	defaultSystemReservedMemory                  = "500Mi"
-	defaultHardEvictionThresholdMemory           = "100Mi"
-	defaultHardEvictionThresholdNodefs           = "10%"
-	defaultHardEvictionThresholdImagefs          = "15%"
-	defaultHardEvictionThresholdNodefsInodesFree = "5%"
-	evictionHardMemoryAvailable                  = "memory.available"
-	evictionHardNodefsAvaialble                  = "nodefs.available"
-	evictionHardImagefsAvailable                 = "imagefs.available"
-	evictionHardNodefsInodesFree                 = "nodefs.inodesFree"
+	experimentalKubeletSnippetAnnotation               = "kubeletconfig.experimental"
+	cpuManagerPolicyStatic                             = "static"
+	cpuManagerPolicyOptionFullPCPUsOnly                = "full-pcpus-only"
+	cpuManagerPolicyOptionPreferAlignCPUsByUncoreCache = "prefer-align-cpus-by-uncorecache"
+	memoryManagerPolicyStatic                          = "Static"
+	defaultKubeReservedMemory                          = "500Mi"
+	defaultSystemReservedMemory                        = "500Mi"
+	defaultHardEvictionThresholdMemory                 = "100Mi"
+	defaultHardEvictionThresholdNodefs                 = "10%"
+	defaultHardEvictionThresholdImagefs                = "15%"
+	defaultHardEvictionThresholdNodefsInodesFree       = "5%"
+	evictionHardMemoryAvailable                        = "memory.available"
+	evictionHardNodefsAvaialble                        = "nodefs.available"
+	evictionHardImagefsAvailable                       = "imagefs.available"
+	evictionHardNodefsInodesFree                       = "nodefs.inodesFree"
 )
 
 // New returns new KubeletConfig object for performance sensetive workflows
 func New(profile *performancev2.PerformanceProfile, opts *components.KubeletConfigOptions) (*machineconfigv1.KubeletConfig, error) {
 	name := components.GetComponentName(profile.Name, components.ComponentNamePrefix)
-	kubeletConfig := &kubeletconfigv1beta1.KubeletConfiguration{}
-	if v, ok := profile.Annotations[experimentalKubeletSnippetAnnotation]; ok {
-		if err := json.Unmarshal([]byte(v), kubeletConfig); err != nil {
-			return nil, err
-		}
-	}
-
-	kubeletConfig.TypeMeta = metav1.TypeMeta{
-		APIVersion: kubeletconfigv1beta1.SchemeGroupVersion.String(),
-		Kind:       "KubeletConfiguration",
+	kubeletConfig, err := NewKubeletConfigFromExperimentalAnnotation(profile)
+	if err != nil {
+		return nil, err
 	}
 
 	kubeletConfig.CPUManagerPolicy = cpuManagerPolicyStatic
@@ -193,3 +188,37 @@ func addStringToQuantity(q *resource.Quantity, value string) error {
 
 	return nil
 }
+
+func NewKubeletConfigFromExperimentalAnnotation(profile *performancev2.PerformanceProfile) (*kubeletconfigv1beta1.KubeletConfiguration, error) {
+	kubeletConfig := &kubeletconfigv1beta1.KubeletConfiguration{}
+	kubeletConfig.TypeMeta = metav1.TypeMeta{
+		APIVersion: kubeletconfigv1beta1.SchemeGroupVersion.String(),
+		Kind:       "KubeletConfiguration",
+	}
+
+	if v, ok := profile.Annotations[experimentalKubeletSnippetAnnotation]; ok {
+		if err := json.Unmarshal([]byte(v), kubeletConfig); err != nil {
+			return nil, err
+		}
+	}
+	return kubeletConfig, nil
+}
+
+func HasExperimentalOptionLLCEnabled(profile *performancev2.PerformanceProfile) bool {
+	if profile == nil {
+		return false
+	}
+	kubeletConfig, err := NewKubeletConfigFromExperimentalAnnotation(profile)
+	if err != nil {
+		return false
+	}
+	val, ok := kubeletConfig.CPUManagerPolicyOptions[cpuManagerPolicyOptionPreferAlignCPUsByUncoreCache]
+	if !ok {
+		return false
+	}
+	v, err := strconv.ParseBool(val)
+	if err != nil {
+		return false
+	}
+	return v
+}

pkg/performanceprofile/controller/performanceprofile/components/machineconfig/machineconfig.go

@@ -74,6 +74,9 @@ const (
 	ovsDynamicPinningTriggerHostFile = "/var/lib/ovn-ic/etc/enable_dynamic_cpu_affinity"
 
 	cpusetConfigure = "cpuset-configure"
+
+	// required until the LLC support code (KEP-4800) goes at least Beta
+	llcEnablementFile = "openshift-llc-alignment"
 )
 
 const (
@@ -392,6 +395,15 @@ func getIgnitionConfig(profile *performancev2.PerformanceProfile, opts *componen
 		}
 		addContent(ignitionConfig, content, filepath.Join(kubernetesConfDir, mixedCPUsConfig), ptr.To[int](0644))
 	}
+
+	// required until the LLC support code (KEP-4800) goes at least Beta
+	if opts.LLCFileEnabled {
+		// Note: the content of LLC (enablement) file does not matter. What matters is only the file presence.
+		// If the file is present, the feature is available and can be enabled via the PerformanceProfile object.\
+		// If the file is missing, the feature is forced off regardless of any PerformanceProfile object content.
+		addContent(ignitionConfig, []byte{}, filepath.Join(kubernetesConfDir, llcEnablementFile), ptr.To[int](0644))
+	}
+
 	return ignitionConfig, nil
 }
 

pkg/performanceprofile/controller/performanceprofile/components/manifestset/manifestset.go

@@ -53,7 +53,9 @@ func (ms *ManifestResultSet) ToManifestTable() ManifestTable {
 func GetNewComponents(profile *performancev2.PerformanceProfile, opts *components.Options) (*ManifestResultSet, error) {
 	machineConfigPoolSelector := profilecomponent.GetMachineConfigPoolSelector(profile, opts.ProfileMCP)
 
-	mc, err := machineconfig.New(profile, &opts.MachineConfig)
+	mcOpts := opts.MachineConfig.Clone()
+	mcOpts.LLCFileEnabled = kubeletconfig.HasExperimentalOptionLLCEnabled(profile)
+	mc, err := machineconfig.New(profile, mcOpts)
 	if err != nil {
 		return nil, err
 	}