From f28c705f632dbc02e07ef59f0765a73775dfa23b Mon Sep 17 00:00:00 2001 From: Kamalesh Babulal Date: Mon, 1 Apr 2024 15:49:42 +0530 Subject: [PATCH] ftests/013: add cpu controller format (v2) Starting Linux Kernel version 6.0, the cpu controller cpu.stat (v2) additionally displays force_idle statistics. It was introduced by upstream commit 1fcf54deb767 ("sched/core: add forced idle accounting for cgroups"). Append a new expected output with the field 'core_sched.force_idle_usec' to cgroup v2 valid output. ----------------------------------------------------------------- Test Results: Run Date: Apr 03 15:49:31 Passed: 1 test(s) Skipped: 0 test(s) Failed: 0 test(s) ----------------------------------------------------------------- Timing Results: Test Time (sec) -------------------------------------------- setup 0.00 013-cgget-multiple_g_flags.py 0.12 teardown 0.00 -------------------------------------------- Total Run Time 0.12 Signed-off-by: Kamalesh Babulal Signed-off-by: Tom Hromatka --- tests/ftests/013-cgget-multiple_g_flags.py | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/tests/ftests/013-cgget-multiple_g_flags.py b/tests/ftests/013-cgget-multiple_g_flags.py index da0d2697..ef9d21bb 100755 --- a/tests/ftests/013-cgget-multiple_g_flags.py +++ b/tests/ftests/013-cgget-multiple_g_flags.py @@ -140,6 +140,29 @@ EXPECTED_OUT_V2 = [ cpu.max.burst: 0 cpu.max: max 100000 cpu.uclamp.min: 0.00 + cpu.uclamp.max: max''', + # with PSI, cfs_bandwidth with cpu.stat nr_busts, burst_time, force_idle + '''013cgget: + pids.current: 0 + pids.events: max 0 + pids.max: max + cpu.weight: 100 + cpu.stat: usage_usec 0 + user_usec 0 + system_usec 0 + core_sched.force_idle_usec 0 + nr_periods 0 + nr_throttled 0 + throttled_usec 0 + nr_bursts 0 + burst_usec 0 + cpu.weight.nice: 0 + cpu.pressure: some avg10=0.00 avg60=0.00 avg300=0.00 total=0 + full avg10=0.00 avg60=0.00 avg300=0.00 total=0 + cpu.idle: 0 + cpu.max.burst: 0 + cpu.max: max 100000 + cpu.uclamp.min: 0.00 cpu.uclamp.max: max''' ] -- 2.47.2