WIP: neonvm: apply code review fixes, rename constant name for sysfs …

…scaling

Signed-off-by: Misha Sakhnov <[email protected]>

neonvm-controller/cmd/main.go

@@ -139,7 +139,7 @@ func main() {
 			return nil
 		},
 	)
-	flag.StringVar(&defaultCpuScalingMode, "default-cpu-scaling-mode", vmv1.CpuScalingModeQMP, fmt.Sprintf("Default: CPU scaling: %s || %s", vmv1.CpuScalingModeQMP, vmv1.CpuScalingModeCpuSysfsState))
+	flag.StringVar(&defaultCpuScalingMode, "default-cpu-scaling-mode", vmv1.CpuScalingModeQMP, fmt.Sprintf("Default: CPU scaling: %s || %s", vmv1.CpuScalingModeQMP, vmv1.CpuScalingModeSysfs))
 	flag.BoolVar(&disableRunnerCgroup, "disable-runner-cgroup", false, "Disable creation of a cgroup in neonvm-runner for fractional CPU limiting")
 	flag.StringVar(&qemuDiskCacheSettings, "qemu-disk-cache-settings", "cache=none", "Set neonvm-runner's QEMU disk cache settings")
 	flag.Func("default-memory-provider", "Set default memory provider to use for new VMs", defaultMemoryProvider.FlagFunc)

neonvm-runner/cmd/main.go

@@ -891,7 +891,7 @@ func buildQEMUCmd(
 	minCPUs := vmSpec.Guest.CPUs.Min.RoundedUp()
 
 	switch cfg.cpuScalingMode {
-	case vmv1.CpuScalingModeCpuSysfsState:
+	case vmv1.CpuScalingModeSysfs:
 		qemuCmd = append(qemuCmd, "-smp", fmt.Sprintf(
 			// if we use sysfs based scaling we specify initial value for cpus qemu arg equal to max cpus
 			"cpus=%d,maxcpus=%d,sockets=1,cores=%d,threads=1",
@@ -998,7 +998,7 @@ func makeKernelCmdline(cfg *Config, vmSpec *vmv1.VirtualMachineSpec, vmStatus *v
 	if cfg.appendKernelCmdline != "" {
 		cmdlineParts = append(cmdlineParts, cfg.appendKernelCmdline)
 	}
-	if cfg.cpuScalingMode == vmv1.CpuScalingModeCpuSysfsState {
+	if cfg.cpuScalingMode == vmv1.CpuScalingModeSysfs {
 		// if we use sysfs based scaling we need to specify the start cpus as min CPUs to mark every CPU except 0 as offline
 		cmdlineParts = append(cmdlineParts, fmt.Sprintf("maxcpus=%d", vmSpec.Guest.CPUs.Min.RoundedUp()))
 	}
@@ -1049,7 +1049,7 @@ func runQEMU(
 
 	wg.Add(1)
 	go terminateQemuOnSigterm(ctx, logger, &wg)
-	if !cfg.skipCgroupManagement || cfg.cpuScalingMode == vmv1.CpuScalingModeCpuSysfsState {
+	if !cfg.skipCgroupManagement || cfg.cpuScalingMode == vmv1.CpuScalingModeSysfs {
 		var callbacks cpuServerCallbacks
 
 		lastValue := &atomic.Uint32{}
@@ -1060,7 +1060,7 @@ func runQEMU(
 				return lo.ToPtr(vmv1.MilliCPU(lastValue.Load())), nil
 			},
 			set: func(logger *zap.Logger, cpu vmv1.MilliCPU) error {
-				if cfg.cpuScalingMode == vmv1.CpuScalingModeCpuSysfsState {
+				if cfg.cpuScalingMode == vmv1.CpuScalingModeSysfs {
 					err := setNeonvmDaemonCPU(cpu)
 					if err != nil {
 						logger.Error("setting CPU through NeonVM Daemon failed", zap.Any("cpu", cpu), zap.Error(err))

neonvm/apis/neonvm/v1/virtualmachine_types.go

@@ -57,9 +57,9 @@ const (
 	// that the VM should use QMP to scale CPUs.
 	CpuScalingModeQMP string = "qmpScaling"
 
-	// CpuScalingModeCpuSysfsState is the value of the VirtualMachineSpec.CpuScalingMode field that
+	// CpuScalingModeSysfs is the value of the VirtualMachineSpec.CpuScalingMode field that
 	// indicates that the VM should use the CPU sysfs state interface to scale CPUs.
-	CpuScalingModeCpuSysfsState string = "sysfsScaling"
+	CpuScalingModeSysfs string = "sysfsScaling"
 )
 
 // VirtualMachineUsage provides information about a VM's current usage. This is the type of the

pkg/neonvm/controllers/vm_controller.go

@@ -565,7 +565,7 @@ func (r *VMReconciler) doReconcile(ctx context.Context, vm *vmv1.VirtualMachine)
 			}
 
 			switch *vm.Spec.CpuScalingMode {
-			case vmv1.CpuScalingModeCpuSysfsState:
+			case vmv1.CpuScalingModeSysfs:
 				log.Info("CPU scaling mode is set to CpuSysfsState, CPU usage check based on cgroups")
 				pluggedCPU = cgroupUsage.VCPUs.RoundedUp()
 			case vmv1.CpuScalingModeQMP:

pkg/neonvm/controllers/vm_controller_cpu_scaling.go

@@ -19,7 +19,7 @@ func (r *VMReconciler) handleCPUScaling(ctx context.Context, vm *vmv1.VirtualMac
 
 	log := log.FromContext(ctx)
 	useCpuSysfsStateScaling := false
-	if vm.Spec.CpuScalingMode != nil && *vm.Spec.CpuScalingMode == vmv1.CpuScalingModeCpuSysfsState {
+	if vm.Spec.CpuScalingMode != nil && *vm.Spec.CpuScalingMode == vmv1.CpuScalingModeSysfs {
 		useCpuSysfsStateScaling = true
 	}