From 265eaafa0c4d1f19724d7017e89d4a60d0cd2aed Mon Sep 17 00:00:00 2001 From: Kamalesh Babulal Date: Thu, 10 Mar 2022 10:38:03 +0530 Subject: [PATCH] test-010: add support for newer cpu.pressure output Kernel commit 0e94682b73bf ("psi: introduce psi monitor"), adds more information to the cgroup V2 cpu.pressure file. This patch recognizes the additional information displayed while reading cpu.pressure file. Older format: ------------- cpu.pressure: some avg10=0.00 avg60=0.00 avg300=0.00 total=0 New format: ----------- some avg10=0.00 avg60=0.00 avg300=0.00 total=0 full avg10=0.00 avg60=0.00 avg300=0.00 total=0 Fixes: https://github.com/libcgroup/libcgroup/issues/105 Reported-by: Tom Hromatka Signed-off-by: Kamalesh Babulal Signed-off-by: Tom Hromatka --- .../010-cgget-g_flag_controller_and_cgroup.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/ftests/010-cgget-g_flag_controller_and_cgroup.py b/ftests/010-cgget-g_flag_controller_and_cgroup.py index a46481cc..cc138600 100755 --- a/ftests/010-cgget-g_flag_controller_and_cgroup.py +++ b/ftests/010-cgget-g_flag_controller_and_cgroup.py @@ -53,6 +53,21 @@ cpu.uclamp.min: 0.00 cpu.uclamp.max: max ''' +EXPECTED_OUT_V2_PSI = '''cpu.weight: 100 +cpu.stat: usage_usec 0 + user_usec 0 + system_usec 0 + nr_periods 0 + nr_throttled 0 + throttled_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.max: max 100000 +cpu.uclamp.min: 0.00 +cpu.uclamp.max: max +''' + def prereqs(config): result = consts.TEST_PASSED @@ -78,6 +93,8 @@ def test(config): expected_out = EXPECTED_OUT_V1 elif version == CgroupVersion.CGROUP_V2: expected_out = EXPECTED_OUT_V2 + if len(out.splitlines()) != len(expected_out.splitlines()): + expected_out = EXPECTED_OUT_V2_PSI if len(out.splitlines()) != len(expected_out.splitlines()): result = consts.TEST_FAILED -- 2.47.3