test-010: add support for newer cpu.* output

With Ubuntu 5.17.4-051704-generic kernel, there are a few changes to the
the output of cgget -g cpu:<cgroup> provides for both cgroup V1 and V2:
cgroup V1:
----------
- new stat files cpu.cfs_burst_us. cpu.idle
- addition of nr_bursts, burst_time to cpu.stat file

cgroup V2:
----------
- new stat files cpu.idle, cpu.max.burst
- addition of nr_bursts, burst_time to cpu.stat file

adopt these changes while looking for expected out based on the cgroup
version.

Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>

diff --git a/ftests/010-cgget-g_flag_controller_and_cgroup.py b/ftests/010-cgget-g_flag_controller_and_cgroup.py
index e27e0a2a8ffa0504395573b2cc988dcbf3995c19..e8413e27f0793f20005a14e28de120a2404ac608 100755 (executable)
--- a/ftests/010-cgget-g_flag_controller_and_cgroup.py
+++ b/ftests/010-cgget-g_flag_controller_and_cgroup.py
@@ -26,6 +26,20 @@ cpu.uclamp.min: 0.00
 cpu.uclamp.max: max
 '''
 
+EXPECTED_OUT_V1_CFS_BANDWIDTH = '''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 = '''cpu.weight: 100
 cpu.stat: usage_usec 0
         user_usec 0
@@ -55,6 +69,25 @@ cpu.uclamp.min: 0.00
 cpu.uclamp.max: max
 '''
 
+EXPECTED_OUT_V2_PSI_CFS_BANDWIDTH = '''cpu.weight: 100
+cpu.stat: usage_usec 0
+        user_usec 0
+        system_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
+'''
+
 
 def prereqs(config):
     result = consts.TEST_PASSED
@@ -78,11 +111,18 @@ def test(config):
 
     if version == CgroupVersion.CGROUP_V1:
         expected_out = EXPECTED_OUT_V1
+
+        if len(out.splitlines()) != len(expected_out.splitlines()):
+            expected_out = EXPECTED_OUT_V1_CFS_BANDWIDTH
     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()):
+                expected_out = EXPECTED_OUT_V2_PSI_CFS_BANDWIDTH
+
     if len(out.splitlines()) != len(expected_out.splitlines()):
         result = consts.TEST_FAILED
         cause = (