diff --git a/assets/performanceprofile/tuned/openshift-node-performance b/assets/performanceprofile/tuned/openshift-node-performance index 7be26ac11..2d6245626 100644 --- a/assets/performanceprofile/tuned/openshift-node-performance +++ b/assets/performanceprofile/tuned/openshift-node-performance @@ -148,6 +148,8 @@ initrd_add_dir= # overrides cpu-partitioning cmdline cmdline_cpu_part=+nohz=on rcu_nocbs=${isolated_cores} tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded} +cmdline_cpu_part_nohzfull=+nohz_full=${isolated_cores} +cmdline_cpu_tuning=+skew_tick=1 # No default value but will be composed conditionally based on platform cmdline_iommu= @@ -159,9 +161,8 @@ cmdline_isolation=+isolcpus=managed_irq,${isolated_cores} {{end}} {{if .RealTimeHint}} -cmdline_realtime_nohzfull=+nohz_full=${isolated_cores} cmdline_realtime_nosoftlookup=+nosoftlockup -cmdline_realtime_common=+skew_tick=1 rcutree.kthread_prio=11 +cmdline_realtime_common=+rcutree.kthread_prio=11 {{end}} {{if .HighPowerConsumption}} diff --git a/assets/performanceprofile/tuned/openshift-node-performance-intel-x86 b/assets/performanceprofile/tuned/openshift-node-performance-intel-x86 index 9148ddf2a..1964a0e2c 100644 --- a/assets/performanceprofile/tuned/openshift-node-performance-intel-x86 +++ b/assets/performanceprofile/tuned/openshift-node-performance-intel-x86 @@ -2,27 +2,6 @@ summary=Platform specific tuning for Intel x86 [bootloader] -# DO NOT REMOVE THIS BLOCK -# It makes sure the kernel arguments for Intel are applied -# in the order compatible with OCP 4.17 which is important -# for preventing an extra reboot during upgrade -cmdline_cpu_part= -cmdline_iommu_intel= -cmdline_isolation= -cmdline_realtime_nohzfull= -cmdline_realtime_intel= -cmdline_realtime_nosoftlookup= -cmdline_realtime_intel_nmi= -cmdline_realtime_common= -cmdline_power_performance= -cmdline_power_performance_intel= -cmdline_idle_poll= -cmdline_idle_poll_intel= -cmdline_hugepages= -cmdline_pstate= - -# Here comes the Intel specific tuning - cmdline_iommu_intel=intel_iommu=on iommu=pt {{if .RealTimeHint}} diff --git a/pkg/performanceprofile/controller/performanceprofile/components/tuned/tuned_test.go b/pkg/performanceprofile/controller/performanceprofile/components/tuned/tuned_test.go index a4cfe3181..cd7d3ddcf 100644 --- a/pkg/performanceprofile/controller/performanceprofile/components/tuned/tuned_test.go +++ b/pkg/performanceprofile/controller/performanceprofile/components/tuned/tuned_test.go @@ -35,9 +35,9 @@ var ( cmdlineIntelPstateAutomatic = "intel_pstate=${f:intel_recommended_pstate}" cmdlineIntelPstatePassive = "intel_pstate=passive" cmdlineMultipleHugePages = "+ default_hugepagesz=1G hugepagesz=1G hugepages=4 hugepagesz=2M hugepages=128" - cmdlineRealtimeNoHZFull = "+nohz_full=${isolated_cores}" + cmdlineCPUPartNohzfull = "+nohz_full=${isolated_cores}" cmdlineRealtimeNosoftlookup = "+nosoftlockup" - cmdlineRealtimeCommon = "+skew_tick=1 rcutree.kthread_prio=11" + cmdlineRealtimeCommon = "+rcutree.kthread_prio=11" cmdlineWithoutStaticIsolation = "+isolcpus=managed_irq,${isolated_cores}" cmdlineWithStaticIsolation = "+isolcpus=domain,managed_irq,${isolated_cores}" ) @@ -122,7 +122,7 @@ var _ = Describe("Tuned", func() { Expect(bootLoaderSection.Key("cmdline_isolation").String()).To(Equal(cmdlineWithoutStaticIsolation)) Expect(bootLoaderSection.Key("cmdline_hugepages").String()).To(Equal(cmdlineHugepages)) Expect(bootLoaderSection.Key("cmdline_additionalArg").String()).To(Equal(cmdlineAdditionalArgs)) - Expect(bootLoaderSection.Key("cmdline_realtime_nohzfull").String()).To(Equal(cmdlineRealtimeNoHZFull)) + Expect(bootLoaderSection.Key("cmdline_cpu_part_nohzfull").String()).To(Equal(cmdlineCPUPartNohzfull)) Expect(bootLoaderSection.Key("cmdline_realtime_nosoftlookup").String()).To(Equal(cmdlineRealtimeNosoftlookup)) Expect(bootLoaderSection.Key("cmdline_realtime_common").String()).To(Equal(cmdlineRealtimeCommon)) }) @@ -154,17 +154,16 @@ var _ = Describe("Tuned", func() { }) It("should have mandatory bootloader keys in tuned", func() { - tunedData := getTunedStructuredData(profile, components.ProfileNameIntelX86) + tunedData := getTunedStructuredData(profile, components.ProfileNamePerformance) bootloader, err := tunedData.GetSection("bootloader") Expect(err).ToNot(HaveOccurred()) Expect(bootloader.HasKey("cmdline_cpu_part")).To(BeTrue()) + Expect(bootloader.HasKey("cmdline_cpu_part_nohzfull")).To(BeTrue()) + Expect(bootloader.HasKey("cmdline_cpu_tuning")).To(BeTrue()) Expect(bootloader.HasKey("cmdline_isolation")).To(BeTrue()) - Expect(bootloader.HasKey("cmdline_realtime_nohzfull")).To(BeTrue()) Expect(bootloader.HasKey("cmdline_realtime_nosoftlookup")).To(BeTrue()) Expect(bootloader.HasKey("cmdline_realtime_common")).To(BeTrue()) - Expect(bootloader.HasKey("cmdline_idle_poll")).To(BeTrue()) Expect(bootloader.HasKey("cmdline_hugepages")).To(BeTrue()) - Expect(bootloader.HasKey("cmdline_pstate")).To(BeTrue()) }) }) @@ -187,7 +186,7 @@ var _ = Describe("Tuned", func() { bootLoaderSection, err := tunedData.GetSection("bootloader") Expect(err).ToNot(HaveOccurred()) - Expect(bootLoaderSection.Key("cmdline_realtime_nohzfull").String()).ToNot(Equal(cmdlineRealtimeNoHZFull)) + Expect(bootLoaderSection.Key("cmdline_cpu_part_nohzfull").String()).To(Equal(cmdlineCPUPartNohzfull)) Expect(bootLoaderSection.Key("cmdline_realtime_nosoftlookup").String()).ToNot(Equal(cmdlineRealtimeNosoftlookup)) Expect(bootLoaderSection.Key("cmdline_realtime_common").String()).ToNot(Equal(cmdlineRealtimeCommon)) }) @@ -206,7 +205,7 @@ var _ = Describe("Tuned", func() { Expect(sysctl.Key("kernel.sched_rt_runtime_us").String()).To(Equal("-1")) bootLoader, err := tunedData.GetSection("bootloader") Expect(err).ToNot(HaveOccurred()) - Expect(bootLoader.Key("cmdline_realtime_nohzfull").String()).To(Equal(cmdlineRealtimeNoHZFull)) + Expect(bootLoader.Key("cmdline_cpu_part_nohzfull").String()).To(Equal(cmdlineCPUPartNohzfull)) Expect(bootLoader.Key("cmdline_realtime_nosoftlookup").String()).To(Equal(cmdlineRealtimeNosoftlookup)) Expect(bootLoader.Key("cmdline_realtime_common").String()).To(Equal(cmdlineRealtimeCommon)) }) diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-master_tuned.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-master_tuned.yaml index 7fa180b50..5d13ff185 100644 --- a/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-master_tuned.yaml +++ b/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-master_tuned.yaml @@ -58,9 +58,9 @@ spec: names are important for Intel and are referenced in openshift-node-performance-intel-x86\n\n# set empty values to disable RHEL initrd setting in cpu-partitioning\ninitrd_remove_dir=\ninitrd_dst_img=\ninitrd_add_dir=\n\n# overrides cpu-partitioning cmdline\ncmdline_cpu_part=+nohz=on rcu_nocbs=${isolated_cores} - tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded}\n\n# - No default value but will be composed conditionally based on platform\ncmdline_iommu=\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime_nohzfull=+nohz_full=${isolated_cores}\ncmdline_realtime_nosoftlookup=+nosoftlockup\ncmdline_realtime_common=+skew_tick=1 - rcutree.kthread_prio=11\n\n\n\n\n\n\n \n\n\n\n[rtentsk]\n\n\n" + tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded}\ncmdline_cpu_part_nohzfull=+nohz_full=${isolated_cores}\ncmdline_cpu_tuning=+skew_tick=1\n\n# + No default value but will be composed conditionally based on platform\ncmdline_iommu=\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime_nosoftlookup=+nosoftlockup\ncmdline_realtime_common=+rcutree.kthread_prio=11\n\n\n\n\n\n\n + \n\n\n\n[rtentsk]\n\n\n" name: openshift-node-performance-openshift-bootstrap-master - data: "[main]\nsummary=Real time profile to override unsupported settings\n\n[sysctl]\n#Real time kernel doesn't support the following kernel parameters.\n#The openshift-node-performance @@ -100,27 +100,6 @@ spec: summary=Platform specific tuning for Intel x86 [bootloader] - # DO NOT REMOVE THIS BLOCK - # It makes sure the kernel arguments for Intel are applied - # in the order compatible with OCP 4.17 which is important - # for preventing an extra reboot during upgrade - cmdline_cpu_part= - cmdline_iommu_intel= - cmdline_isolation= - cmdline_realtime_nohzfull= - cmdline_realtime_intel= - cmdline_realtime_nosoftlookup= - cmdline_realtime_intel_nmi= - cmdline_realtime_common= - cmdline_power_performance= - cmdline_power_performance_intel= - cmdline_idle_poll= - cmdline_idle_poll_intel= - cmdline_hugepages= - cmdline_pstate= - - # Here comes the Intel specific tuning - cmdline_iommu_intel=intel_iommu=on iommu=pt diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-worker_tuned.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-worker_tuned.yaml index eb07fc87b..173f49344 100644 --- a/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-worker_tuned.yaml +++ b/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-worker_tuned.yaml @@ -58,9 +58,9 @@ spec: names are important for Intel and are referenced in openshift-node-performance-intel-x86\n\n# set empty values to disable RHEL initrd setting in cpu-partitioning\ninitrd_remove_dir=\ninitrd_dst_img=\ninitrd_add_dir=\n\n# overrides cpu-partitioning cmdline\ncmdline_cpu_part=+nohz=on rcu_nocbs=${isolated_cores} - tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded}\n\n# - No default value but will be composed conditionally based on platform\ncmdline_iommu=\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime_nohzfull=+nohz_full=${isolated_cores}\ncmdline_realtime_nosoftlookup=+nosoftlockup\ncmdline_realtime_common=+skew_tick=1 - rcutree.kthread_prio=11\n\n\n\n\n\n\n \n\n\n\n[rtentsk]\n\n\n" + tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded}\ncmdline_cpu_part_nohzfull=+nohz_full=${isolated_cores}\ncmdline_cpu_tuning=+skew_tick=1\n\n# + No default value but will be composed conditionally based on platform\ncmdline_iommu=\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime_nosoftlookup=+nosoftlockup\ncmdline_realtime_common=+rcutree.kthread_prio=11\n\n\n\n\n\n\n + \n\n\n\n[rtentsk]\n\n\n" name: openshift-node-performance-openshift-bootstrap-worker - data: "[main]\nsummary=Real time profile to override unsupported settings\n\n[sysctl]\n#Real time kernel doesn't support the following kernel parameters.\n#The openshift-node-performance @@ -100,27 +100,6 @@ spec: summary=Platform specific tuning for Intel x86 [bootloader] - # DO NOT REMOVE THIS BLOCK - # It makes sure the kernel arguments for Intel are applied - # in the order compatible with OCP 4.17 which is important - # for preventing an extra reboot during upgrade - cmdline_cpu_part= - cmdline_iommu_intel= - cmdline_isolation= - cmdline_realtime_nohzfull= - cmdline_realtime_intel= - cmdline_realtime_nosoftlookup= - cmdline_realtime_intel_nmi= - cmdline_realtime_common= - cmdline_power_performance= - cmdline_power_performance_intel= - cmdline_idle_poll= - cmdline_idle_poll_intel= - cmdline_hugepages= - cmdline_pstate= - - # Here comes the Intel specific tuning - cmdline_iommu_intel=intel_iommu=on iommu=pt diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-master_tuned.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-master_tuned.yaml index 7fa180b50..5d13ff185 100644 --- a/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-master_tuned.yaml +++ b/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-master_tuned.yaml @@ -58,9 +58,9 @@ spec: names are important for Intel and are referenced in openshift-node-performance-intel-x86\n\n# set empty values to disable RHEL initrd setting in cpu-partitioning\ninitrd_remove_dir=\ninitrd_dst_img=\ninitrd_add_dir=\n\n# overrides cpu-partitioning cmdline\ncmdline_cpu_part=+nohz=on rcu_nocbs=${isolated_cores} - tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded}\n\n# - No default value but will be composed conditionally based on platform\ncmdline_iommu=\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime_nohzfull=+nohz_full=${isolated_cores}\ncmdline_realtime_nosoftlookup=+nosoftlockup\ncmdline_realtime_common=+skew_tick=1 - rcutree.kthread_prio=11\n\n\n\n\n\n\n \n\n\n\n[rtentsk]\n\n\n" + tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded}\ncmdline_cpu_part_nohzfull=+nohz_full=${isolated_cores}\ncmdline_cpu_tuning=+skew_tick=1\n\n# + No default value but will be composed conditionally based on platform\ncmdline_iommu=\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime_nosoftlookup=+nosoftlockup\ncmdline_realtime_common=+rcutree.kthread_prio=11\n\n\n\n\n\n\n + \n\n\n\n[rtentsk]\n\n\n" name: openshift-node-performance-openshift-bootstrap-master - data: "[main]\nsummary=Real time profile to override unsupported settings\n\n[sysctl]\n#Real time kernel doesn't support the following kernel parameters.\n#The openshift-node-performance @@ -100,27 +100,6 @@ spec: summary=Platform specific tuning for Intel x86 [bootloader] - # DO NOT REMOVE THIS BLOCK - # It makes sure the kernel arguments for Intel are applied - # in the order compatible with OCP 4.17 which is important - # for preventing an extra reboot during upgrade - cmdline_cpu_part= - cmdline_iommu_intel= - cmdline_isolation= - cmdline_realtime_nohzfull= - cmdline_realtime_intel= - cmdline_realtime_nosoftlookup= - cmdline_realtime_intel_nmi= - cmdline_realtime_common= - cmdline_power_performance= - cmdline_power_performance_intel= - cmdline_idle_poll= - cmdline_idle_poll_intel= - cmdline_hugepages= - cmdline_pstate= - - # Here comes the Intel specific tuning - cmdline_iommu_intel=intel_iommu=on iommu=pt diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-worker_tuned.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-worker_tuned.yaml index eb07fc87b..173f49344 100644 --- a/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-worker_tuned.yaml +++ b/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-worker_tuned.yaml @@ -58,9 +58,9 @@ spec: names are important for Intel and are referenced in openshift-node-performance-intel-x86\n\n# set empty values to disable RHEL initrd setting in cpu-partitioning\ninitrd_remove_dir=\ninitrd_dst_img=\ninitrd_add_dir=\n\n# overrides cpu-partitioning cmdline\ncmdline_cpu_part=+nohz=on rcu_nocbs=${isolated_cores} - tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded}\n\n# - No default value but will be composed conditionally based on platform\ncmdline_iommu=\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime_nohzfull=+nohz_full=${isolated_cores}\ncmdline_realtime_nosoftlookup=+nosoftlockup\ncmdline_realtime_common=+skew_tick=1 - rcutree.kthread_prio=11\n\n\n\n\n\n\n \n\n\n\n[rtentsk]\n\n\n" + tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded}\ncmdline_cpu_part_nohzfull=+nohz_full=${isolated_cores}\ncmdline_cpu_tuning=+skew_tick=1\n\n# + No default value but will be composed conditionally based on platform\ncmdline_iommu=\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime_nosoftlookup=+nosoftlockup\ncmdline_realtime_common=+rcutree.kthread_prio=11\n\n\n\n\n\n\n + \n\n\n\n[rtentsk]\n\n\n" name: openshift-node-performance-openshift-bootstrap-worker - data: "[main]\nsummary=Real time profile to override unsupported settings\n\n[sysctl]\n#Real time kernel doesn't support the following kernel parameters.\n#The openshift-node-performance @@ -100,27 +100,6 @@ spec: summary=Platform specific tuning for Intel x86 [bootloader] - # DO NOT REMOVE THIS BLOCK - # It makes sure the kernel arguments for Intel are applied - # in the order compatible with OCP 4.17 which is important - # for preventing an extra reboot during upgrade - cmdline_cpu_part= - cmdline_iommu_intel= - cmdline_isolation= - cmdline_realtime_nohzfull= - cmdline_realtime_intel= - cmdline_realtime_nosoftlookup= - cmdline_realtime_intel_nmi= - cmdline_realtime_common= - cmdline_power_performance= - cmdline_power_performance_intel= - cmdline_idle_poll= - cmdline_idle_poll_intel= - cmdline_hugepages= - cmdline_pstate= - - # Here comes the Intel specific tuning - cmdline_iommu_intel=intel_iommu=on iommu=pt diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/default/arm/manual_tuned.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/default/arm/manual_tuned.yaml index bd26fdcd2..22c065a23 100644 --- a/test/e2e/performanceprofile/testdata/render-expected-output/default/arm/manual_tuned.yaml +++ b/test/e2e/performanceprofile/testdata/render-expected-output/default/arm/manual_tuned.yaml @@ -56,10 +56,9 @@ spec: names are important for Intel and are referenced in openshift-node-performance-intel-x86\n\n# set empty values to disable RHEL initrd setting in cpu-partitioning\ninitrd_remove_dir=\ninitrd_dst_img=\ninitrd_add_dir=\n\n# overrides cpu-partitioning cmdline\ncmdline_cpu_part=+nohz=on rcu_nocbs=${isolated_cores} - tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded}\n\n# - No default value but will be composed conditionally based on platform\ncmdline_iommu=\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime_nohzfull=+nohz_full=${isolated_cores}\ncmdline_realtime_nosoftlookup=+nosoftlockup\ncmdline_realtime_common=+skew_tick=1 - rcutree.kthread_prio=11\n\n\n\n\n\n\n\ncmdline_hugepages=+ default_hugepagesz=32M - \ hugepagesz=512M hugepages=1 \n\n\n\n[rtentsk]\n\n\n" + tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded}\ncmdline_cpu_part_nohzfull=+nohz_full=${isolated_cores}\ncmdline_cpu_tuning=+skew_tick=1\n\n# + No default value but will be composed conditionally based on platform\ncmdline_iommu=\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime_nosoftlookup=+nosoftlockup\ncmdline_realtime_common=+rcutree.kthread_prio=11\n\n\n\n\n\n\n\ncmdline_hugepages=+ + default_hugepagesz=32M hugepagesz=512M hugepages=1 \n\n\n\n[rtentsk]\n\n\n" name: openshift-node-performance-manual - data: "[main]\nsummary=Real time profile to override unsupported settings\n\n[sysctl]\n#Real time kernel doesn't support the following kernel parameters.\n#The openshift-node-performance @@ -99,27 +98,6 @@ spec: summary=Platform specific tuning for Intel x86 [bootloader] - # DO NOT REMOVE THIS BLOCK - # It makes sure the kernel arguments for Intel are applied - # in the order compatible with OCP 4.17 which is important - # for preventing an extra reboot during upgrade - cmdline_cpu_part= - cmdline_iommu_intel= - cmdline_isolation= - cmdline_realtime_nohzfull= - cmdline_realtime_intel= - cmdline_realtime_nosoftlookup= - cmdline_realtime_intel_nmi= - cmdline_realtime_common= - cmdline_power_performance= - cmdline_power_performance_intel= - cmdline_idle_poll= - cmdline_idle_poll_intel= - cmdline_hugepages= - cmdline_pstate= - - # Here comes the Intel specific tuning - cmdline_iommu_intel=intel_iommu=on iommu=pt diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/default/cpuFrequency/manual_tuned.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/default/cpuFrequency/manual_tuned.yaml index 78680f62f..23d29ffba 100644 --- a/test/e2e/performanceprofile/testdata/render-expected-output/default/cpuFrequency/manual_tuned.yaml +++ b/test/e2e/performanceprofile/testdata/render-expected-output/default/cpuFrequency/manual_tuned.yaml @@ -56,11 +56,10 @@ spec: names are important for Intel and are referenced in openshift-node-performance-intel-x86\n\n# set empty values to disable RHEL initrd setting in cpu-partitioning\ninitrd_remove_dir=\ninitrd_dst_img=\ninitrd_add_dir=\n\n# overrides cpu-partitioning cmdline\ncmdline_cpu_part=+nohz=on rcu_nocbs=${isolated_cores} - tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded}\n\n# - No default value but will be composed conditionally based on platform\ncmdline_iommu=\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime_nohzfull=+nohz_full=${isolated_cores}\ncmdline_realtime_nosoftlookup=+nosoftlockup\ncmdline_realtime_common=+skew_tick=1 - rcutree.kthread_prio=11\n\n\n\n\n\n\n\ncmdline_hugepages=+ default_hugepagesz=1G - \ hugepagesz=2M hugepages=128 \n\n\n\n[rtentsk]\n\n\n[sysfs]\n# sets provided - frequencies to isolated and reserved cpus\n\n/sys/devices/system/cpu/cpufreq/policy2/scaling_max_freq=2500000\n/sys/devices/system/cpu/cpufreq/policy3/scaling_max_freq=2500000\n/sys/devices/system/cpu/cpufreq/policy0/scaling_max_freq=2800000\n/sys/devices/system/cpu/cpufreq/policy1/scaling_max_freq=2800000\n" + tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded}\ncmdline_cpu_part_nohzfull=+nohz_full=${isolated_cores}\ncmdline_cpu_tuning=+skew_tick=1\n\n# + No default value but will be composed conditionally based on platform\ncmdline_iommu=\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime_nosoftlookup=+nosoftlockup\ncmdline_realtime_common=+rcutree.kthread_prio=11\n\n\n\n\n\n\n\ncmdline_hugepages=+ + default_hugepagesz=1G hugepagesz=2M hugepages=128 \n\n\n\n[rtentsk]\n\n\n[sysfs]\n# + sets provided frequencies to isolated and reserved cpus\n\n/sys/devices/system/cpu/cpufreq/policy2/scaling_max_freq=2500000\n/sys/devices/system/cpu/cpufreq/policy3/scaling_max_freq=2500000\n/sys/devices/system/cpu/cpufreq/policy0/scaling_max_freq=2800000\n/sys/devices/system/cpu/cpufreq/policy1/scaling_max_freq=2800000\n" name: openshift-node-performance-manual - data: "[main]\nsummary=Real time profile to override unsupported settings\n\n[sysctl]\n#Real time kernel doesn't support the following kernel parameters.\n#The openshift-node-performance @@ -100,27 +99,6 @@ spec: summary=Platform specific tuning for Intel x86 [bootloader] - # DO NOT REMOVE THIS BLOCK - # It makes sure the kernel arguments for Intel are applied - # in the order compatible with OCP 4.17 which is important - # for preventing an extra reboot during upgrade - cmdline_cpu_part= - cmdline_iommu_intel= - cmdline_isolation= - cmdline_realtime_nohzfull= - cmdline_realtime_intel= - cmdline_realtime_nosoftlookup= - cmdline_realtime_intel_nmi= - cmdline_realtime_common= - cmdline_power_performance= - cmdline_power_performance_intel= - cmdline_idle_poll= - cmdline_idle_poll_intel= - cmdline_hugepages= - cmdline_pstate= - - # Here comes the Intel specific tuning - cmdline_iommu_intel=intel_iommu=on iommu=pt diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_tuned.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_tuned.yaml index 7741e45c6..04721fb2e 100644 --- a/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_tuned.yaml +++ b/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_tuned.yaml @@ -58,10 +58,9 @@ spec: names are important for Intel and are referenced in openshift-node-performance-intel-x86\n\n# set empty values to disable RHEL initrd setting in cpu-partitioning\ninitrd_remove_dir=\ninitrd_dst_img=\ninitrd_add_dir=\n\n# overrides cpu-partitioning cmdline\ncmdline_cpu_part=+nohz=on rcu_nocbs=${isolated_cores} - tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded}\n\n# - No default value but will be composed conditionally based on platform\ncmdline_iommu=\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime_nohzfull=+nohz_full=${isolated_cores}\ncmdline_realtime_nosoftlookup=+nosoftlockup\ncmdline_realtime_common=+skew_tick=1 - rcutree.kthread_prio=11\n\n\n\n\n\n\n\ncmdline_hugepages=+ default_hugepagesz=1G - \ hugepagesz=2M hugepages=128 \n\n\n\n[rtentsk]\n\n\n" + tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded}\ncmdline_cpu_part_nohzfull=+nohz_full=${isolated_cores}\ncmdline_cpu_tuning=+skew_tick=1\n\n# + No default value but will be composed conditionally based on platform\ncmdline_iommu=\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime_nosoftlookup=+nosoftlockup\ncmdline_realtime_common=+rcutree.kthread_prio=11\n\n\n\n\n\n\n\ncmdline_hugepages=+ + default_hugepagesz=1G hugepagesz=2M hugepages=128 \n\n\n\n[rtentsk]\n\n\n" name: openshift-node-performance-manual - data: "[main]\nsummary=Real time profile to override unsupported settings\n\n[sysctl]\n#Real time kernel doesn't support the following kernel parameters.\n#The openshift-node-performance @@ -101,27 +100,6 @@ spec: summary=Platform specific tuning for Intel x86 [bootloader] - # DO NOT REMOVE THIS BLOCK - # It makes sure the kernel arguments for Intel are applied - # in the order compatible with OCP 4.17 which is important - # for preventing an extra reboot during upgrade - cmdline_cpu_part= - cmdline_iommu_intel= - cmdline_isolation= - cmdline_realtime_nohzfull= - cmdline_realtime_intel= - cmdline_realtime_nosoftlookup= - cmdline_realtime_intel_nmi= - cmdline_realtime_common= - cmdline_power_performance= - cmdline_power_performance_intel= - cmdline_idle_poll= - cmdline_idle_poll_intel= - cmdline_hugepages= - cmdline_pstate= - - # Here comes the Intel specific tuning - cmdline_iommu_intel=intel_iommu=on iommu=pt diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/default/pp-norps/manual_tuned.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/default/pp-norps/manual_tuned.yaml index 7741e45c6..04721fb2e 100644 --- a/test/e2e/performanceprofile/testdata/render-expected-output/default/pp-norps/manual_tuned.yaml +++ b/test/e2e/performanceprofile/testdata/render-expected-output/default/pp-norps/manual_tuned.yaml @@ -58,10 +58,9 @@ spec: names are important for Intel and are referenced in openshift-node-performance-intel-x86\n\n# set empty values to disable RHEL initrd setting in cpu-partitioning\ninitrd_remove_dir=\ninitrd_dst_img=\ninitrd_add_dir=\n\n# overrides cpu-partitioning cmdline\ncmdline_cpu_part=+nohz=on rcu_nocbs=${isolated_cores} - tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded}\n\n# - No default value but will be composed conditionally based on platform\ncmdline_iommu=\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime_nohzfull=+nohz_full=${isolated_cores}\ncmdline_realtime_nosoftlookup=+nosoftlockup\ncmdline_realtime_common=+skew_tick=1 - rcutree.kthread_prio=11\n\n\n\n\n\n\n\ncmdline_hugepages=+ default_hugepagesz=1G - \ hugepagesz=2M hugepages=128 \n\n\n\n[rtentsk]\n\n\n" + tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded}\ncmdline_cpu_part_nohzfull=+nohz_full=${isolated_cores}\ncmdline_cpu_tuning=+skew_tick=1\n\n# + No default value but will be composed conditionally based on platform\ncmdline_iommu=\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime_nosoftlookup=+nosoftlockup\ncmdline_realtime_common=+rcutree.kthread_prio=11\n\n\n\n\n\n\n\ncmdline_hugepages=+ + default_hugepagesz=1G hugepagesz=2M hugepages=128 \n\n\n\n[rtentsk]\n\n\n" name: openshift-node-performance-manual - data: "[main]\nsummary=Real time profile to override unsupported settings\n\n[sysctl]\n#Real time kernel doesn't support the following kernel parameters.\n#The openshift-node-performance @@ -101,27 +100,6 @@ spec: summary=Platform specific tuning for Intel x86 [bootloader] - # DO NOT REMOVE THIS BLOCK - # It makes sure the kernel arguments for Intel are applied - # in the order compatible with OCP 4.17 which is important - # for preventing an extra reboot during upgrade - cmdline_cpu_part= - cmdline_iommu_intel= - cmdline_isolation= - cmdline_realtime_nohzfull= - cmdline_realtime_intel= - cmdline_realtime_nosoftlookup= - cmdline_realtime_intel_nmi= - cmdline_realtime_common= - cmdline_power_performance= - cmdline_power_performance_intel= - cmdline_idle_poll= - cmdline_idle_poll_intel= - cmdline_hugepages= - cmdline_pstate= - - # Here comes the Intel specific tuning - cmdline_iommu_intel=intel_iommu=on iommu=pt diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/no-ref/manual_tuned.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/no-ref/manual_tuned.yaml index 7df45b1a5..e07495486 100644 --- a/test/e2e/performanceprofile/testdata/render-expected-output/no-ref/manual_tuned.yaml +++ b/test/e2e/performanceprofile/testdata/render-expected-output/no-ref/manual_tuned.yaml @@ -56,10 +56,9 @@ spec: names are important for Intel and are referenced in openshift-node-performance-intel-x86\n\n# set empty values to disable RHEL initrd setting in cpu-partitioning\ninitrd_remove_dir=\ninitrd_dst_img=\ninitrd_add_dir=\n\n# overrides cpu-partitioning cmdline\ncmdline_cpu_part=+nohz=on rcu_nocbs=${isolated_cores} - tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded}\n\n# - No default value but will be composed conditionally based on platform\ncmdline_iommu=\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime_nohzfull=+nohz_full=${isolated_cores}\ncmdline_realtime_nosoftlookup=+nosoftlockup\ncmdline_realtime_common=+skew_tick=1 - rcutree.kthread_prio=11\n\n\n\n\n\n\n\ncmdline_hugepages=+ default_hugepagesz=1G - \ hugepagesz=2M hugepages=128 \n\n\n\n[rtentsk]\n\n\n" + tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded}\ncmdline_cpu_part_nohzfull=+nohz_full=${isolated_cores}\ncmdline_cpu_tuning=+skew_tick=1\n\n# + No default value but will be composed conditionally based on platform\ncmdline_iommu=\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime_nosoftlookup=+nosoftlockup\ncmdline_realtime_common=+rcutree.kthread_prio=11\n\n\n\n\n\n\n\ncmdline_hugepages=+ + default_hugepagesz=1G hugepagesz=2M hugepages=128 \n\n\n\n[rtentsk]\n\n\n" name: openshift-node-performance-manual - data: "[main]\nsummary=Real time profile to override unsupported settings\n\n[sysctl]\n#Real time kernel doesn't support the following kernel parameters.\n#The openshift-node-performance @@ -99,27 +98,6 @@ spec: summary=Platform specific tuning for Intel x86 [bootloader] - # DO NOT REMOVE THIS BLOCK - # It makes sure the kernel arguments for Intel are applied - # in the order compatible with OCP 4.17 which is important - # for preventing an extra reboot during upgrade - cmdline_cpu_part= - cmdline_iommu_intel= - cmdline_isolation= - cmdline_realtime_nohzfull= - cmdline_realtime_intel= - cmdline_realtime_nosoftlookup= - cmdline_realtime_intel_nmi= - cmdline_realtime_common= - cmdline_power_performance= - cmdline_power_performance_intel= - cmdline_idle_poll= - cmdline_idle_poll_intel= - cmdline_hugepages= - cmdline_pstate= - - # Here comes the Intel specific tuning - cmdline_iommu_intel=intel_iommu=on iommu=pt