Merge pull request #954 from jlojosnegros/pao-ktimers-410

[release-4.10] OCPBUGS-4165: Add ktimer to PAO tuned profile
openshift-kni · Dec 1, 2022 · b471f8e · b471f8e
2 parents c364b68 + 9036fdc
commit b471f8e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/build/assets/tuned/openshift-node-performance b/build/assets/tuned/openshift-node-performance
@@ -44,6 +44,7 @@ banned_cpus=""
 runtime=0
 group.ksoftirqd=0:f:11:*:ksoftirqd.*
 group.rcuc=0:f:11:*:rcuc.*
+group.ktimers=0:f:11:*:ktimers.*
 sched_rt_runtime_us=-1
 sched_min_granularity_ns=10000000
 sched_migration_cost_ns=5000000

diff --git a/pkg/controller/performanceprofile/components/tuned/tuned_test.go b/pkg/controller/performanceprofile/components/tuned/tuned_test.go
@@ -56,6 +56,9 @@ var _ = Describe("Tuned", func() {
 
 			Expect(manifest).To(ContainSubstring(expectedMatchSelector))
 			Expect(manifest).To(ContainSubstring(fmt.Sprintf("isolated_cores=4-7")))
+			Expect(manifest).To(ContainSubstring("group.ksoftirqd=0:f:11:*:ksoftirqd.*"))
+			Expect(manifest).To(ContainSubstring("group.rcuc=0:f:11:*:rcuc.*"))
+			Expect(manifest).To(ContainSubstring("group.ktimers=0:f:11:*:ktimers.*"))
 			By("Populating CPU partitioning cmdline")
 			Expect(cmdlineCPUsPartitioning.MatchString(manifest)).To(BeTrue())
 			By("Populating realtime cmdline")

diff --git a/testdata/render-expected-output/manual_tuned.yaml b/testdata/render-expected-output/manual_tuned.yaml
@@ -23,7 +23,7 @@ spec:
       isolated_cores take a list of ranges; e.g. isolated_cores=2,4-7\n\nisolated_cores=1-3\n\n\nnot_isolated_cores_expanded=${f:cpulist_invert:${isolated_cores_expanded}}\n\n[cpu]\n#>
       latency-performance\n#> (override)\nforce_latency=cstate.id:1|3\ngovernor=performance\nenergy_perf_bias=performance\nmin_perf_pct=100\n\n[service]\nservice.stalld=start,enable\n\n[vm]\n#>
       network-latency\ntransparent_hugepages=never\n\n\n[irqbalance]\n#> Override
-      the value set by cpu-partitioning with an empty one\nbanned_cpus=\"\"\n\n\n[scheduler]\nruntime=0\ngroup.ksoftirqd=0:f:11:*:ksoftirqd.*\ngroup.rcuc=0:f:11:*:rcuc.*\nsched_rt_runtime_us=-1\nsched_min_granularity_ns=10000000\nsched_migration_cost_ns=5000000\nnuma_balancing=0\n\ndefault_irq_smp_affinity
+      the value set by cpu-partitioning with an empty one\nbanned_cpus=\"\"\n\n\n[scheduler]\nruntime=0\ngroup.ksoftirqd=0:f:11:*:ksoftirqd.*\ngroup.rcuc=0:f:11:*:rcuc.*\ngroup.ktimers=0:f:11:*:ktimers.*\nsched_rt_runtime_us=-1\nsched_min_granularity_ns=10000000\nsched_migration_cost_ns=5000000\nnuma_balancing=0\n\ndefault_irq_smp_affinity
       = ignore\n\n\n[sysctl]\n#> cpu-partitioning #realtime\nkernel.hung_task_timeout_secs
       = 600\n#> cpu-partitioning #realtime\nkernel.nmi_watchdog = 0\n#> realtime\nkernel.sched_rt_runtime_us
       = -1\n#> cpu-partitioning (= 1) #realtime (= 0)\nkernel.timer_migration = 0\n#>