[PATCH] controllers/cpuacct: Dynamically adjust cpuacct_task execution time
Wake Liu via ltp <[email protected]>
| Newsgroups | gmane.linux.ltp |
|---|---|
| Message-ID | <[email protected]> |
The test helper cpuacct_task currently runs for 10ms (virtual time) before exiting. On some systems (e.g. fast virtual machines or under heavy load), this short duration can lead to 0 usage being recorded in cpuacct.usage cgroup file due to timing resolution or scheduling delay, especially when running small configurations like cpuacct_1_1. However, unconditionally increasing the duration for all runs (e.g. to 100ms) would cause large stress tests like cpuacct_100_100 (which runs 10,000 tasks) to timeout on systems with few CPUs. Resolve this by: 1. Modifying cpuacct_task to accept an optional duration argument. 2. Modifying cpuacct.sh to calculate the duration dynamically based on nbprocess, ensuring each subgroup gets at least 100ms of aggregate CPU time, while clamping the per-process duration to a minimum of 10ms to avoid timeouts in large stress tests. 3. Validating nsubgroup and nprocess arguments in cpuacct.sh setup() to ensure they are positive integers, avoiding division by zero or fatal arithmetic errors in shell. Signed-off-by: Wake Liu <[email protected]> --- .../kernel/controllers/cpuacct/cpuacct.sh | 17 +++++++++++++++- .../kernel/controllers/cpuacct/cpuacct_task.c | 20 ++++++++++++++++--- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/testcases/kernel/controllers/cpuacct/cpuacct.sh b/testcases/kernel/controllers/cpuacct/cpuacct.sh index 97a395cd5..deb103a30 100755 --- a/testcases/kernel/controllers/cpuacct/cpuacct.sh +++ b/testcases/kernel/controllers/cpuacct/cpuacct.sh @@ -84,6 +84,16 @@ check_limits() setup() { + case "$max" in + ""|*[!0-9]*) tst_brk TBROK "nsubgroup must be a positive integer" ;; + *) [ "$max" -gt 0 ] || tst_brk TBROK "nsubgroup must be a positive integer" ;; + esac + + case "$nbprocess" in + ""|*[!0-9]*) tst_brk TBROK "nprocess must be a positive integer" ;; + *) [ "$nbprocess" -gt 0 ] || tst_brk TBROK "nprocess must be a positive integer" ;; + esac + if ! grep -q -w cpuacct /proc/cgroups; then tst_brk TCONF "cpuacct not supported on this system" fi @@ -139,10 +149,15 @@ do_test() { tst_res TINFO "Creating $max subgroups each with $nbprocess processes" + local duration=$((100000 / nbprocess)) + if [ "$duration" -lt 10000 ]; then + duration=10000 + fi + # create and attach process to subgroups for i in `seq 1 $max`; do for j in `seq 1 $nbprocess`; do - cpuacct_task $testpath/subgroup_$i/tasks & + cpuacct_task "$testpath/subgroup_$i/tasks" "$duration" & echo $! >> task_pids done done diff --git a/testcases/kernel/controllers/cpuacct/cpuacct_task.c b/testcases/kernel/controllers/cpuacct/cpuacct_task.c index 677d6d401..caeecf064 100644 --- a/testcases/kernel/controllers/cpuacct/cpuacct_task.c +++ b/testcases/kernel/controllers/cpuacct/cpuacct_task.c @@ -38,12 +38,21 @@ int main(int argc, char **argv) { FILE *f; struct sigaction sa; + int duration_us = 10000; - if (argc != 2) { - fprintf(stderr, "Usage: %s /cgroup/.../tasks\n", argv[0]); + if (argc < 2 || argc > 3) { + fprintf(stderr, "Usage: %s /cgroup/.../tasks [duration_us]\n", argv[0]); return 1; } + if (argc == 3) { + duration_us = atoi(argv[2]); + if (duration_us <= 0) { + fprintf(stderr, "Invalid duration: %s\n", argv[2]); + return 1; + } + } + f = fopen(argv[1], "a"); if (!f) { perror("fopen failed"); @@ -62,7 +71,12 @@ int main(int argc, char **argv) return 1; } - struct itimerval it = {.it_value = {.tv_sec = 0, .tv_usec = 10000}}; + struct itimerval it = { + .it_value = { + .tv_sec = duration_us / 1000000, + .tv_usec = duration_us % 1000000 + } + }; setitimer(ITIMER_VIRTUAL, &it, NULL); for (;;); -- 2.55.0.654.g21b8a5bc05-goog -- Mailing list info: https://lists.linux.it/listinfo/ltp