From: Kamalesh Babulal Date: Wed, 3 Apr 2024 10:13:27 +0000 (+0530) Subject: ftests/013: add pids controller format X-Git-Tag: v3.2.0~120 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c9cd5ec2b1d3bb8f02ff1edf393ccd7ce459622;p=thirdparty%2Flibcgroup.git ftests/013: add pids controller format Starting Linux Kernel version 6.1, the pids controller added an new interface file pids.peak. It was introduced by upstream commit 5251c6c436ed ("cgroup: add pids.peak interface for pids controller"). Append a new expected output with the interface 'pids.peak' to cgroup v1 and v2 valid output. ----------------------------------------------------------------- Test Results: Run Date: Apr 04 10:11: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 --- diff --git a/tests/ftests/013-cgget-multiple_g_flags.py b/tests/ftests/013-cgget-multiple_g_flags.py index ef9d21bb..0c70cd0c 100755 --- a/tests/ftests/013-cgget-multiple_g_flags.py +++ b/tests/ftests/013-cgget-multiple_g_flags.py @@ -61,9 +61,28 @@ EXPECTED_OUT_V1 = [ cpu.idle: 0 cpu.cfs_quota_us: -1 cpu.uclamp.min: 0.00 + cpu.uclamp.max: max''', + # with cfs_bandwidth, pids.peak with cpu.stat nr_busts, burst_time + '''013cgget: + pids.current: 0 + pids.events: max 0 + pids.max: max + pids.peak: 0 + cpu.cfs_burst_us: 0 + cpu.cfs_period_us: 100000 + cpu.stat: nr_periods 0 + nr_throttled 0 + throttled_time 0 + nr_bursts 0 + burst_time 0 + cpu.shares: 1024 + cpu.idle: 0 + cpu.cfs_quota_us: -1 + cpu.uclamp.min: 0.00 cpu.uclamp.max: max''' ] + EXPECTED_OUT_V2 = [ '''013cgget: pids.current: 0 @@ -163,6 +182,31 @@ EXPECTED_OUT_V2 = [ cpu.max.burst: 0 cpu.max: max 100000 cpu.uclamp.min: 0.00 + cpu.uclamp.max: max''', + # with PSI, cfs_bandwidth, pids.peak + # with cpu.stat nr_busts, burst_time, force_idle + '''013cgget: + pids.current: 0 + pids.events: max 0 + pids.max: max + pids.peak: 0 + 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''' ]